From 8c60c6b6e1a8c5c9cd4b4b12bf9796c889a2eadd Mon Sep 17 00:00:00 2001
From: jpbruyere <jp.bruyere@hotmail.com>
Date: Mon, 25 Jan 2016 14:26:47 +0100
Subject: [PATCH] resolve in scroller mouse handling bug, check if parent is
 scroller if mouse is in unscrolled bounds, saved and restrored when bubbling
 mouse mouve

---
 Tests/GOLIBTest_Listbox.cs          | 16 +++++++++--
 Tests/Interfaces/test_Listbox.goml  | 41 ++++++++++++++++-------------
 Tests/Tests.csproj                  |  4 +--
 src/GraphicObjects/GraphicObject.cs | 10 ++++++-
 src/GraphicObjects/Scroller.cs      |  8 ++++++
 5 files changed, 56 insertions(+), 23 deletions(-)

diff --git a/Tests/GOLIBTest_Listbox.cs b/Tests/GOLIBTest_Listbox.cs
index b3cda6c5..1d6b2f38 100644
--- a/Tests/GOLIBTest_Listbox.cs
+++ b/Tests/GOLIBTest_Listbox.cs
@@ -71,6 +71,13 @@ namespace test
 				"string 3"
 			});	*/
 
+		public String Hover {
+			get { return hoverWidget == null ? "None" : hoverWidget.ToString(); }
+		}
+		Point mPos;
+		public string MousePos {
+			get { return mPos.ToString(); }
+		}
 		protected override void OnLoad (EventArgs e)
 		{
 			base.OnLoad (e);
@@ -81,8 +88,12 @@ namespace test
 
 //			TestList [1].Field = "test string";
 //			ValueChanged.Raise(this, new ValueChangeEventArgs ("TestList", TestList));
-
-
+		}
+		protected override void OnMouseMove (MouseMoveEventArgs e)
+		{			
+			base.OnMouseMove (e);
+			ValueChanged.Raise (this, new ValueChangeEventArgs ("Hover", Hover));
+			ValueChanged.Raise (this, new ValueChangeEventArgs ("MousePos", e.Position.ToString()));
 		}
 
 		protected override void OnUpdateFrame (FrameEventArgs e)
@@ -94,6 +105,7 @@ namespace test
 			TestList.Add ("newly added list item");
 			ValueChanged.Raise(this, new ValueChangeEventArgs ("TestList", TestList));
 		}
+
 		[STAThread]
 		static void Main ()
 		{
diff --git a/Tests/Interfaces/test_Listbox.goml b/Tests/Interfaces/test_Listbox.goml
index b77ffcec..342f2909 100755
--- a/Tests/Interfaces/test_Listbox.goml
+++ b/Tests/Interfaces/test_Listbox.goml
@@ -1,20 +1,25 @@
 <?xml version="1.0"?>
 <!--<ListBox Data="{TestList}" Focusable="true"/>-->
-<ListBox Data="{TestList}" Background="0,5;0,5;0,5;0,5"
-			 HorizontalAlignment="Center" Width="-1" Height="150" Margin="5">
-	<Template>
-		<Border BorderWidth="1" MinimumSize="20;20" Height="{../TemplatedHeight}" Width="{../TemplatedWidth}">
-			<HorizontalStack Margin="1" Height="{../../TemplatedHeight}" Width="{../../TemplatedWidth}">
-				<Scroller Name="scroller1" Height="{../../../TemplatedHeight}" Width="{../../../TemplatedWidth}" 
-						Margin="2" VerticalScrolling="true" ScrollY="{../scrollbar1.Scroll}">
-					<VerticalStack Width="{../../../../TemplatedWidth}" Height="-1" 
-						Name="List" Margin="0" VerticalAlignment="Top" />
-				</Scroller>
-				<Scrollbar Name="scrollbar1" Scroll="{../scroller1.ScrollY}" 
-					MaximumScroll="{../scroller1.MaximumScroll}" Orientation="Vertical" 
-					Width="10" Height="{../../../TemplatedHeight}" />
-			</HorizontalStack>
-		</Border>
-	</Template>
-</ListBox>
-
+<VerticalStack Fit="true">
+	<Label Text="{MousePos}" Width="-1" Background="DarkGreen"/>
+	<Label Text="{Hover}" Width="-1" Background="DarkGreen"/>
+	<Button Text="button 1" Width="150"/>
+	<ListBox Data="{TestList}" Background="0,5;0,5;0,5;0,5"
+				 HorizontalAlignment="Center" Width="-1" Height="150" Margin="5">
+		<Template>
+			<Border BorderWidth="1" MinimumSize="20;20" Height="{../TemplatedHeight}" Width="{../TemplatedWidth}">
+				<HorizontalStack Margin="1" Height="{../../TemplatedHeight}" Width="{../../TemplatedWidth}">
+					<Scroller Name="scroller1" Height="{../../../TemplatedHeight}" Width="{../../../TemplatedWidth}" 
+							Margin="2" VerticalScrolling="true" ScrollY="{../scrollbar1.Scroll}">
+						<VerticalStack Width="{../../../../TemplatedWidth}" Height="-1" 
+							Name="List" Margin="0" VerticalAlignment="Top" />
+					</Scroller>
+					<Scrollbar Name="scrollbar1" Scroll="{../scroller1.ScrollY}" 
+						MaximumScroll="{../scroller1.MaximumScroll}" Orientation="Vertical" 
+						Width="10" Height="{../../../TemplatedHeight}" />
+				</HorizontalStack>
+			</Border>
+		</Template>
+	</ListBox>
+	<Button Text="button 1" Width="0"/>
+</VerticalStack>
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index 14c98c01..4b4b8d34 100644
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -8,12 +8,12 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>Tests</RootNamespace>
     <AssemblyName>Tests</AssemblyName>
-    <StartupObject>test.GOLIBTests</StartupObject>
+    <StartupObject>test.GOLIBTest_Listbox</StartupObject>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <OutputPath>..\bin\$(configuration)</OutputPath>
     <IntermediateOutputPath>obj\$(configuration)</IntermediateOutputPath>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SynchReleaseVersion>false</SynchReleaseVersion>
+    <ReleaseVersion>0.2</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <OutputPath>..\bin\Debug</OutputPath>
diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs
index b5884d5e..e03a9d4f 100644
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/GraphicObject.cs
@@ -770,7 +770,15 @@ namespace go
 		#region Mouse handling
 		public virtual bool MouseIsIn(Point m)
 		{
-			return Visible ? ScreenCoordinates(Slot).ContainsOrIsEqual (m) : false; 
+			if (!Visible) 
+				return false;
+			if (ScreenCoordinates (Slot).ContainsOrIsEqual (m)) {
+				Scroller scr = Parent as Scroller;
+				if (scr == null)
+					return true;
+				return scr.MouseIsIn (scr.savedMousePos);
+			}
+			return false; 
 		}
 		public virtual void checkHoverWidget(MouseMoveEventArgs e)
 		{
diff --git a/src/GraphicObjects/Scroller.cs b/src/GraphicObjects/Scroller.cs
index 29c3b506..2f21870a 100644
--- a/src/GraphicObjects/Scroller.cs
+++ b/src/GraphicObjects/Scroller.cs
@@ -154,6 +154,7 @@ namespace go
 		#endregion
 
 		#region Mouse handling
+		internal Point savedMousePos;
 		public override bool MouseIsIn (Point m)
 		{			
 //			Debug.WriteLine ("Mouse in scroller: {0} scr coord:{1} mouse:{2}",
@@ -164,6 +165,7 @@ namespace go
 		}
 		public override void checkHoverWidget (MouseMoveEventArgs e)
 		{
+			savedMousePos = e.Position;
 			Point m = e.Position - new Point ((int)ScrollX, (int)ScrollY);
 			base.checkHoverWidget (new MouseMoveEventArgs(m.X,m.Y,e.XDelta,e.YDelta));
 		}
@@ -181,6 +183,12 @@ namespace go
             if (HorizontalScrolling )
 				ScrollX -= e.Delta * ScrollSpeed;
         }
+		public override void onMouseMove (object sender, MouseMoveEventArgs e)
+		{
+			savedMousePos.X += e.XDelta;
+			savedMousePos.Y += e.YDelta;
+			base.onMouseMove (sender, new MouseMoveEventArgs(savedMousePos.X,savedMousePos.Y,e.XDelta,e.YDelta));
+		}
 		#endregion
 
 		public override Rectangle ContextCoordinates (Rectangle r)
-- 
2.47.3