From a62c8eefd46f2ff1892a5d9f20edec59ba2f8e9c Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sun, 13 May 2018 17:00:45 +0300
Subject: [PATCH 1/2] Fixed: Filtered user landmarks became visible when
 landmark was edited/removed.

--HG--
branch : develop
---
 code/ryzom/client/src/interface_v3/group_map.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/ryzom/client/src/interface_v3/group_map.cpp b/code/ryzom/client/src/interface_v3/group_map.cpp
index a841beb44..37a0a8a57 100644
--- a/code/ryzom/client/src/interface_v3/group_map.cpp
+++ b/code/ryzom/client/src/interface_v3/group_map.cpp
@@ -2574,6 +2574,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();
 

From ebbb270bc1b3ca6624d82496e4d6125e6b71bd49 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sun, 13 May 2018 17:00:45 +0300
Subject: [PATCH 2/2] Fixed: Use target_stepy to calculate dy for scrolling

--HG--
branch : develop
---
 code/nel/src/gui/ctrl_scroll.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

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;