diff --git a/code/nel/src/gui/ctrl_scroll.cpp b/code/nel/src/gui/ctrl_scroll.cpp index 50e7c6aa1..acdaa15f5 100644 --- a/code/nel/src/gui/ctrl_scroll.cpp +++ b/code/nel/src/gui/ctrl_scroll.cpp @@ -1226,6 +1226,12 @@ namespace NLGUI if(hReal <= maxHReal) return; + if (_TargetStepY > 1) + { + sint sign = (0 < dy) - (dy < 0); + dy = sign * max(1, (dy / _TargetStepY)) * _TargetStepY; + } + // compute the new ofsY. sint32 ofsY= _Target->getOfsY(); ofsY+= dy; diff --git a/code/ryzom/client/src/interface_v3/group_map.cpp b/code/ryzom/client/src/interface_v3/group_map.cpp index 1bd850168..f34d1b0d7 100644 --- a/code/ryzom/client/src/interface_v3/group_map.cpp +++ b/code/ryzom/client/src/interface_v3/group_map.cpp @@ -2617,6 +2617,10 @@ void CGroupMap::updateUserLandMarks() worldToMap(mapPos, _CurContinent->UserLandMarks[k].Pos); addLandMark(_UserLM, mapPos, _CurContinent->UserLandMarks[k].Title, getUserLandMarkOptions(k)); + + // hide landmark if not matching filter + if (!filterLandmark(_CurContinent->UserLandMarks[k].Title)) + _UserLM.back()->setActive(false); } invalidateCoords();