From 6306b8746bde40af1fb5938a1c92b12dd1175ea4 Mon Sep 17 00:00:00 2001
From: jpbruyere <jp.bruyere@hotmail.com>
Date: Thu, 24 Dec 2015 13:37:55 +0100
Subject: [PATCH] Removed Sizing coherence check in RegisterForLayouting, check
 occuring during template load causing erratic sizing debug

---
 GOLib.csproj                           |  2 +-
 Templates/Scrollbar.goml               |  6 ++--
 Tests/GOLIBTests.cs                    |  5 +--
 Tests/Interfaces/testScrollbar.goml    |  2 +-
 Tests/Interfaces/testWindow2.goml      | 45 ++++++++------------------
 Tests/Interfaces/testWindow3.goml      |  4 +--
 Tests/Interfaces/test_Listbox.goml     |  2 +-
 src/GraphicObjects/GraphicObject.cs    | 15 +++++----
 src/GraphicObjects/ListBox.cs          |  2 +-
 src/GraphicObjects/Scrollbar.cs        |  5 +++
 src/GraphicObjects/Scroller.cs         |  6 ++--
 src/GraphicObjects/TemplatedControl.cs |  4 +--
 12 files changed, 43 insertions(+), 55 deletions(-)

diff --git a/GOLib.csproj b/GOLib.csproj
index 35bd69dc..647e8782 100644
--- a/GOLib.csproj
+++ b/GOLib.csproj
@@ -46,7 +46,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>TRACE;DEBUG;__linux__;DEBUG_LOAD_TIME;DEBUG_LAYOUTING</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;__linux__;DEBUG_LOAD_TIME0;DEBUG_LAYOUTING;DEBUG_BINDING</DefineConstants>
   </PropertyGroup>
   <!--  <PropertyGroup Condition=" '$(Platform)' == 'Linux_x86' ">
     <DefineConstants>__linux__</DefineConstants>
diff --git a/Templates/Scrollbar.goml b/Templates/Scrollbar.goml
index 08d33a95..f8d7c5ba 100755
--- a/Templates/Scrollbar.goml
+++ b/Templates/Scrollbar.goml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
-<Border BorderWidth="1" BorderColor="LightGray">
-	<GenericStack Orientation="{../../Orientation}" Width="0" Height="0">
+<Border BorderWidth="1" BorderColor="LightGray" Width="{../TemplatedWidth}" Height="{../TemplatedHeight}">
+	<GenericStack Orientation="{../../Orientation}" Width="{../../TemplatedWidth}" Height="{../../TemplatedHeight}">
 		<Button Width="12" Height="12" MouseClick="../../../onScrollBack">
 			<Image Margin="1" Path="#go.Images.Icons.updown.svg" SvgSub="up"/>
 		</Button>
 		<Slider Name="Slider" Value="{../../../Scroll}" Maximum="{../../../MaximumScroll}" 
-			Width="{../../../Width}" Height="{../../../Height}" Orientation="{../../../Orientation}"
+			Width="{../../../TemplatedWidth}" Height="{../../../TemplatedHeight}" Orientation="{../../../Orientation}"
 			ValueChanged="../../../onSliderValueChange"/>
 		<Button Width="12" Height="12" MouseClick="../../../onScrollForth">
 			<Image Margin="1" Path="#go.Images.Icons.updown.svg" SvgSub="down"/>
diff --git a/Tests/GOLIBTests.cs b/Tests/GOLIBTests.cs
index 794811cb..36bec18d 100644
--- a/Tests/GOLIBTests.cs
+++ b/Tests/GOLIBTests.cs
@@ -36,6 +36,7 @@ namespace test
 		int frameCpt = 0;
 		int idx = 0;
 		string[] testFiles = {
+//			"testCombobox.goml",
 			"testWindow3.goml",
 			"testExpandable.goml",
 			"testPopper.goml",
@@ -46,7 +47,6 @@ namespace test
 			"testWindow.goml",
 			"testWindow2.goml",
 //			"testSpinner.goml",
-//			"test_Listbox.goml",
 			"test4.goml",
 			"testRadioButton2.goml",
 			"testContainer.goml",
@@ -57,7 +57,8 @@ namespace test
 			"testMsgBox.goml",
 			"testGrid.goml",
 			"testMeter.goml",
-//			"testCombobox.goml",
+			"testScrollbar.goml",
+			"test_Listbox.goml",
 		};
 
 		#region FPS
diff --git a/Tests/Interfaces/testScrollbar.goml b/Tests/Interfaces/testScrollbar.goml
index aa70255d..b0390f10 100755
--- a/Tests/Interfaces/testScrollbar.goml
+++ b/Tests/Interfaces/testScrollbar.goml
@@ -2,5 +2,5 @@
 <Group Name="TopContainer" Width="400" Height="400"
 	Focusable="True" Background="Gray">
 
-	<Scrollbar Orientation="Vertical" Width="16"></Scrollbar>
+	<Scrollbar Height="0" Orientation="Vertical" Width="16"/>
 </Group>
\ No newline at end of file
diff --git a/Tests/Interfaces/testWindow2.goml b/Tests/Interfaces/testWindow2.goml
index b336a9dc..999c68e4 100755
--- a/Tests/Interfaces/testWindow2.goml
+++ b/Tests/Interfaces/testWindow2.goml
@@ -1,45 +1,26 @@
 <?xml version="1.0"?>
-<!--<Group>-->
 <Window Name="window1" Left="10" Top="10" Title="Test window" Width="200" Height="200" Background="0,5;0,5;0,5;0,8" 
 	Focusable="True"  CornerRadius="20" MinimumSize="100;100" MaximumSize="500;500">
 	<Template>
-		<Border BorderWidth="1" BorderColor="White" Margin="0" CornerRadius="20">
-			<VerticalStack Margin="0">
-				<Border BorderWidth="1" BorderColor="White"  Height="-1" Background="0,1;0,5;1,0;0,5">
-					<HorizontalStack Name="hs" Margin="1" Spacing="1" Height="-1" Focusable="false" >
-						<GraphicObject Width="5" Height="0"/>
-						<Image Name="Image" Margin="1" Width="12" Height="12" Path="#go.Images.Icons.tetra.png"/>
-						<Label Foreground="White" Width="0" Name="Title" Margin="1" TextAlignment="Center" />
-						<Border CornerRadius="6" BorderWidth="1" Margin="0" BorderColor="Transparent"  Height="12" Width="12"
+		<Border BorderWidth="1" BorderColor="White" CornerRadius="20" Height="{../TemplatedHeight}" Width="{../TemplatedWidth}">
+			<VerticalStack Height="{../../TemplatedHeight}" Width="{../../TemplatedWidth}">
+				<Border BorderWidth="1" BorderColor="White" Width="{../../../TemplatedWidth}" Height="-1" 
+						Background="0,1;0,5;1,0;0,5">
+					<HorizontalStack Name="hs" Margin="1" Spacing="1" Width="{../../../../TemplatedWidth}" Height="-1" >
+						<GraphicObject Width="5"/>
+						<Image Margin="1" Width="12" Height="12" Path="{../../../../../Icon}"/>
+						<Label Foreground="White" Width="{../../../../../TemplatedWidth}" Margin="1" TextAlignment="Center" Text="{../../../../../Title}" />
+						<Border CornerRadius="6" BorderWidth="1" BorderColor="Transparent"  Height="12" Width="12"
 							MouseEnter="{BorderColor=White}" MouseLeave="{BorderColor=Transparent}">
 							<Image Focusable="true" Name="Image" Margin="0" Width="0" Height="0" Path="#go.Images.Icons.exit2.svg"
-								 MouseClick="butQuitPress"/>
+								 MouseClick="../../../../../../butQuitPress"/>
 						</Border>
-						<GraphicObject Width="5" Height="0"/>
+						<GraphicObject Width="5"/>
 					</HorizontalStack>
 				</Border>
-				<Container Name="Content" Margin="0" Width="0" Height="0"/>
+				<Container Name="Content" Height="{../../../../TemplatedHeight}" Width="{../../../../TemplatedWidth}" Background="0,5;0,5;0,5;0,5"/>
 			</VerticalStack>
 		</Border>
 	</Template>
-	<VerticalStack Name="contentVSStack" Margin="10" Spacing="10">
-		<Slider Name="slider" Height="10" Width="0"/>
-
-		<HorizontalStack Width="-1" Height="-1" Margin="0" Background="Red">
-			<Checkbox Height="-1" Width="100"/>
-			<Checkbox Height="-1" Width="100"/>
-		</HorizontalStack>
-		<GroupBox Title="test"  Height="-1" Width="-1" Margin="5">
-			<VerticalStack  Height="-1" Width="-1">
-				<RadioButton  Caption="Radio 1"/>
-				<RadioButton  Caption="Radio 2" IsChecked="true"/>
-				<RadioButton  Caption="Radio 3"/>
-			</VerticalStack>
-		</GroupBox>
-<!--		<Checkbox Height="-1" Width="-1" Background="Red" Margin="0" VerticalAlignment="Center" HorizontalAlignment="Right"/>-->
-	</VerticalStack>
+	<GraphicObject Height="50" Width="50" Background="Green"/>
 </Window>
-<!--</Group>-->
-<!--		<Label Text="{fps}"  Background="DarkRed"/>
-		<Label Text="{fpsMin}"  />
-		<Label Text="{fpsMax}"  />-->
\ No newline at end of file
diff --git a/Tests/Interfaces/testWindow3.goml b/Tests/Interfaces/testWindow3.goml
index 13495b1b..0c846b15 100755
--- a/Tests/Interfaces/testWindow3.goml
+++ b/Tests/Interfaces/testWindow3.goml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
-<!--<Group>-->
 <Window Name="window1" Left="10" Top="10" Title="Test window" Width="200" Height="200" Background="0,5;0,5;0,5;0,8" 
 	Focusable="True"  CornerRadius="20" MinimumSize="100;100" MaximumSize="500;500">
 	<Template>
 		<Container Margin="20" Name="Content" Height="{../TemplatedHeight}" Width="{../TemplatedWidth}" Background="0,5;0,5;0,5;0,5"/>
 	</Template>
 	<Group Background="Green">
-		<GraphicObject Height="50" Width="50" Background="Red" Margin="5"/>	
+<!--		<GraphicObject Height="50" Width="50" Background="Red" Margin="5"/>-->
+		<Scrollbar Orientation="Vertical" Height="0" Width="10" Background="Blue" Margin="0" HorizontalAlignment="Right"/>
 	</Group>
 </Window>
diff --git a/Tests/Interfaces/test_Listbox.goml b/Tests/Interfaces/test_Listbox.goml
index 33380cb9..b77ffcec 100755
--- a/Tests/Interfaces/test_Listbox.goml
+++ b/Tests/Interfaces/test_Listbox.goml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--<ListBox Data="{TestList}" Focusable="true"/>-->
 <ListBox Data="{TestList}" Background="0,5;0,5;0,5;0,5"
-			 HorizontalAlignment="Left" Width="0" Height="0" Margin="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}">
diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs
index 4c68236d..5f919e64 100644
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/GraphicObject.cs
@@ -503,8 +503,8 @@ namespace go
 
 					//force sizing to fit if parent is sizing on children and 
 					//this object has stretched size
-					if (Parent.getBounds ().Width < 0 && Width == 0)
-						Width = -1;
+//					if (Parent.getBounds ().Width < 0 && Width == 0)
+//						Width = -1;
 				
 					if (Bounds.Width == 0) //stretch in parent
 						Interface.LayoutingQueue.EnqueueAfterParentSizing (LayoutingType.Width, this);
@@ -517,8 +517,8 @@ namespace go
 				if ((layoutType & (int)LayoutingType.Height) > 0) {
 
 					//force sizing to fit if parent is sizing on children
-					if (Parent.getBounds ().Height < 0 && Height == 0)
-						Height = -1;
+//					if (Parent.getBounds ().Height < 0 && Height == 0)
+//						Height = -1;
 
 					if (Bounds.Height == 0) //stretch in parent
 						Interface.LayoutingQueue.EnqueueAfterParentSizing (LayoutingType.Height, this);
@@ -594,7 +594,7 @@ namespace go
 		/// <summary> Update layout component, this is where the computation of alignement
 		/// and size take place </summary>
 		public virtual void UpdateLayout (LayoutingType layoutType)
-		{			
+		{		
 			switch (layoutType) {
 			case LayoutingType.X:
 				if (Bounds.X == 0) {
@@ -646,7 +646,7 @@ namespace go
 
 				LastSlots.Y = Slot.Y;
 				break;
-			case LayoutingType.Width:				
+			case LayoutingType.Width:
 				if (Width > 0)
 					Slot.Width = Width;
 				else if (Width < 0)
@@ -848,6 +848,9 @@ namespace go
 		#region Binding
 		public virtual void ResolveBindings()
 		{
+			#if DEBUG_BINDING
+			Debug.WriteLine ("ResolveBinding => " + this.ToString ());
+			#endif
 			List<Binding> resolved = new List<Binding> ();
 			foreach (Binding b in Bindings) {
 				if (!string.IsNullOrEmpty (b.DynMethodId))
diff --git a/src/GraphicObjects/ListBox.cs b/src/GraphicObjects/ListBox.cs
index 1778e340..ee9fb49d 100644
--- a/src/GraphicObjects/ListBox.cs
+++ b/src/GraphicObjects/ListBox.cs
@@ -70,7 +70,7 @@ namespace go
 		public object SelectedItem{
 			get { return data == null ? null : data[_selectedIndex]; }
 		}
-		[XmlAttributeAttribute][DefaultValue(null)]
+		[XmlAttributeAttribute]//[DefaultValue(null)]
 		public IList Data {
 			get {
 				return data;
diff --git a/src/GraphicObjects/Scrollbar.cs b/src/GraphicObjects/Scrollbar.cs
index cb9e2aa8..8e3b2db5 100644
--- a/src/GraphicObjects/Scrollbar.cs
+++ b/src/GraphicObjects/Scrollbar.cs
@@ -90,5 +90,10 @@ namespace go
 			Scroll = Convert.ToDouble(e.NewValue);
 		}
 
+		public override void OnLayoutChanges (LayoutingType layoutType)
+		{
+			OpenTKGameWindow.currentWindow.CursorVisible = true;
+			base.OnLayoutChanges (layoutType);
+		}
 	}
 }
diff --git a/src/GraphicObjects/Scroller.cs b/src/GraphicObjects/Scroller.cs
index 3f78b598..29c3b506 100644
--- a/src/GraphicObjects/Scroller.cs
+++ b/src/GraphicObjects/Scroller.cs
@@ -156,9 +156,9 @@ namespace go
 		#region Mouse handling
 		public override bool MouseIsIn (Point m)
 		{			
-			Debug.WriteLine ("Mouse in scroller: {0} scr coord:{1} mouse:{2}",
-				base.ScreenCoordinates (Slot).ContainsOrIsEqual (m),
-				base.ScreenCoordinates (Slot), m);
+//			Debug.WriteLine ("Mouse in scroller: {0} scr coord:{1} mouse:{2}",
+//				base.ScreenCoordinates (Slot).ContainsOrIsEqual (m),
+//				base.ScreenCoordinates (Slot), m);
 
 			return Visible ? base.ScreenCoordinates(Slot).ContainsOrIsEqual (m) : false; 
 		}
diff --git a/src/GraphicObjects/TemplatedControl.cs b/src/GraphicObjects/TemplatedControl.cs
index fc1a61f2..32c75a5c 100644
--- a/src/GraphicObjects/TemplatedControl.cs
+++ b/src/GraphicObjects/TemplatedControl.cs
@@ -95,9 +95,7 @@ namespace go
 		}
 
 		protected override void loadDefaultValues ()
-		{
-//			if (child == null)//trigger loading of default template if child is empty
-//				loadTemplate ();
+		{			
 			base.loadDefaultValues ();
 		}
 		public override GraphicObject FindByName (string nameToFind)
-- 
2.47.3