From 1c7f2d63a7230cb487faf915b9431784653f48ef Mon Sep 17 00:00:00 2001
From: jpbruyere <jp.bruyere@hotmail.com>
Date: Sat, 6 Feb 2016 17:01:28 +0100
Subject: [PATCH] resolved Checkbox bug (template was modified), adjust several
 layout registering

---
 Templates/CheckBox.goml                |  6 +--
 Tests/Interfaces/testWindow.goml       | 14 +++++++
 src/GraphicObjects/GenericStack.cs     | 55 +++++++++++++++++---------
 src/GraphicObjects/GraphicObject.cs    |  8 ++--
 src/GraphicObjects/Group.cs            | 19 ++++-----
 src/GraphicObjects/PrivateContainer.cs | 12 ++----
 6 files changed, 69 insertions(+), 45 deletions(-)

diff --git a/Templates/CheckBox.goml b/Templates/CheckBox.goml
index 799bde1e..b1b224d8 100755
--- a/Templates/CheckBox.goml
+++ b/Templates/CheckBox.goml
@@ -3,8 +3,8 @@
 	<Image Margin="2" Width="14" Height="14" Path="{../../Image}"  SvgSub="{../../SvgSub}"/>
 	<Label Text="{../../Caption}" Height="80" Width="200"/>
 </HorizontalStack>-->
-<!--<HorizontalStack Spacing="1" Height="{../TemplatedHeight}" Width="{../TemplatedWidth}">
+<HorizontalStack Spacing="1" Height="{../TemplatedHeight}" Width="{../TemplatedWidth}">
 	<Image Margin="2" Width="14" Height="14" Path="{../../Image}" SvgSub="{../../SvgSub}"/>
 	<Label Text="{../../Caption}" Height="{../../TemplatedHeight}" Width="{../../TemplatedWidth}"/>
-</HorizontalStack>-->
-<GraphicObject Text="{../Caption}" Height="20" Width="{../TemplatedWidth}"/>
\ No newline at end of file
+</HorizontalStack>
+<!--<GraphicObject Text="{../Caption}" Height="20" Width="{../TemplatedWidth}"/>-->
\ No newline at end of file
diff --git a/Tests/Interfaces/testWindow.goml b/Tests/Interfaces/testWindow.goml
index 5a1e7a97..4febd81f 100755
--- a/Tests/Interfaces/testWindow.goml
+++ b/Tests/Interfaces/testWindow.goml
@@ -11,6 +11,20 @@
 				<RadioButton  Caption="Radio 1" Background="SkyBlue" Width="0"/>
 			</VerticalStack>
 		</GroupBox>
+		<HorizontalStack Width="0" Height="-1" Margin="10" CornerRadius="5" Background="SkyBlue">
+<!--			<VerticalStack  Height="-1" Width="-1" >
+				<RadioButton  Caption="Radio 2" IsChecked="true" />
+				<RadioButton  Caption="Radio 3" />
+			</VerticalStack>
+			<VerticalStack  Height="-1" Width="-1" >
+				<RadioButton  Caption="Radio 2" IsChecked="true" />
+				<RadioButton  Caption="Radio 3" />
+			</VerticalStack>-->
+			<RadioButton Width="80" Height="-1"  Caption="Radio 2" IsChecked="true" />
+			<GraphicObject Width="0"/>
+			<RadioButton Width="80" Height="-1" Caption="Radio 3" />
+		</HorizontalStack>
+
 		<HorizontalStack Width="0" Height="-1" Margin="10" CornerRadius="5" 
 				Background="vgradient|0:White|0,1:SteelBlue|0,9:SteelBlue|1:Transparent">
 			<CheckBox Height="-1" Width="80"/>
diff --git a/src/GraphicObjects/GenericStack.cs b/src/GraphicObjects/GenericStack.cs
index 5de21fac..291d300d 100644
--- a/src/GraphicObjects/GenericStack.cs
+++ b/src/GraphicObjects/GenericStack.cs
@@ -66,14 +66,18 @@ namespace Crow
 			Size tmp = new Size ();
 
 			if (Orientation == Orientation.Horizontal) {
-				foreach (GraphicObject c in Children.Where(ch=>ch.Visible)) {
+				foreach (GraphicObject c in Children) {
+					if (!c.Visible)
+						continue;					
 					tmp.Width += c.Slot.Width + Spacing;
 					tmp.Height = Math.Max (tmp.Height, Math.Max(c.Slot.Bottom, c.Slot.Height));
 				}
 				if (tmp.Width > 0)
 					tmp.Width -= Spacing;
 			} else {
-				foreach (GraphicObject c in Children.Where(ch=>ch.Visible)) {
+				foreach (GraphicObject c in Children) {
+					if (!c.Visible)
+						continue;					
 					tmp.Width = Math.Max (tmp.Width, Math.Max(c.Slot.Right, c.Slot.Width));
 					tmp.Height += c.Slot.Height + Spacing;
 				}
@@ -93,18 +97,20 @@ namespace Crow
 			#endif
 			int d = 0;
 			if (Orientation == Orientation.Horizontal) {
-				foreach (GraphicObject c in Children.Where(ch=>ch.Visible)) {
+				foreach (GraphicObject c in Children) {
+					if (!c.Visible)
+						continue;
 					c.Slot.X = d;
 					d += c.Slot.Width + Spacing;
-					if (c.Height != 0)
-						c.RegisterForLayouting (LayoutingType.Y);
+					c.RegisterForLayouting (LayoutingType.Y);
 				}
 			} else {
-				foreach (GraphicObject c in Children.Where(ch=>ch.Visible)) {
+				foreach (GraphicObject c in Children) {
+					if (!c.Visible)
+						continue;					
 					c.Slot.Y = d;
 					d += c.Slot.Height + Spacing;
-					if (c.Width != 0)
-						c.RegisterForLayouting (LayoutingType.X);
+					c.RegisterForLayouting (LayoutingType.X);
 				}
 			}
 			bmp = null;
@@ -114,6 +120,19 @@ namespace Crow
         {
 			RegisteredLayoutings &= (~layoutType);
 
+			LayoutingType childSizeToCheck;
+			if (Orientation == Orientation.Horizontal)
+				childSizeToCheck = LayoutingType.Width;
+			else
+				childSizeToCheck = LayoutingType.Height;
+
+			foreach (GraphicObject g in Children) {
+				if (!g.Visible)
+					continue;
+				if (g.RegisteredLayoutings.HasFlag (childSizeToCheck))
+					return false;						
+			}
+
 			if (layoutType == LayoutingType.PositionChildren) {
 				//allow 1 child to have size to 0 if stack has fixed or streched size,
 				//this child will occupy remaining space
@@ -170,16 +189,16 @@ namespace Crow
 
 			return base.UpdateLayout(layoutType);
         }
-		public override void OnLayoutChanges (LayoutingType layoutType)
-		{
-			base.OnLayoutChanges (layoutType);
-
-			if (Orientation == Orientation.Horizontal){
-				if(layoutType == LayoutingType.Width)
-					this.RegisterForLayouting (LayoutingType.PositionChildren);
-			}else if (layoutType == LayoutingType.Height)
-				this.RegisterForLayouting (LayoutingType.PositionChildren);
-		}
+//		public override void OnLayoutChanges (LayoutingType layoutType)
+//		{
+//			base.OnLayoutChanges (layoutType);
+//
+//			if (Orientation == Orientation.Horizontal){
+//				if(layoutType == LayoutingType.Width)
+//					this.RegisterForLayouting (LayoutingType.PositionChildren);
+//			}else if (layoutType == LayoutingType.Height)
+//				this.RegisterForLayouting (LayoutingType.PositionChildren);
+//		}
 		public override void OnChildLayoutChanges (object sender, LayoutingEventArgs arg)
 		{
 			base.OnChildLayoutChanges (sender, arg);
diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs
index 4d00b99a..40f5dcf7 100644
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/GraphicObject.cs
@@ -549,13 +549,11 @@ namespace Crow
 			#endif
 
 			switch (layoutType) {
-			case LayoutingType.Width:				
-				if (Width != 0 && Parent.getBounds().Width >=0) //update position in parent
-					this.RegisterForLayouting (LayoutingType.X);
+			case LayoutingType.Width:
+				this.RegisterForLayouting (LayoutingType.X);
 				break;
 			case LayoutingType.Height:
-				if (Height != 0 && Parent.getBounds().Height >=0) //update position in parent
-					this.RegisterForLayouting (LayoutingType.Y);
+				this.RegisterForLayouting (LayoutingType.Y);
 				break;
 			}
 			LayoutChanged.Raise (this, new LayoutingEventArgs (layoutType));
diff --git a/src/GraphicObjects/Group.cs b/src/GraphicObjects/Group.cs
index 457187c6..9006191d 100644
--- a/src/GraphicObjects/Group.cs
+++ b/src/GraphicObjects/Group.cs
@@ -145,20 +145,17 @@ namespace Crow
 			//position smaller objects in group when group size is fit
 			switch (layoutType) {
 			case LayoutingType.Width:
-				foreach (GraphicObject c in Children.Where(ch => ch.Visible)) {
-					if (c.getBounds ().Width == 0)
-						c.RegisterForLayouting (LayoutingType.Width);
-					else
-						c.RegisterForLayouting (LayoutingType.X);					
+				foreach (GraphicObject c in Children) {
+					if (!c.Visible)
+						continue;					
+					c.RegisterForLayouting (LayoutingType.X | LayoutingType.Width);
 				}
 				break;
 			case LayoutingType.Height:
-				foreach (GraphicObject c in Children.Where(ch => ch.Visible)) {
-					if (c.getBounds ().Height == 0)
-						c.RegisterForLayouting (LayoutingType.Height);
-					else
-						c.RegisterForLayouting (LayoutingType.Y);
-				}
+				foreach (GraphicObject c in Children) {
+					if (!c.Visible)
+						continue;
+					c.RegisterForLayouting (LayoutingType.Y | LayoutingType.Height);				}
 				break;
 			}
 		}
diff --git a/src/GraphicObjects/PrivateContainer.cs b/src/GraphicObjects/PrivateContainer.cs
index 15d3ce06..9f787eac 100644
--- a/src/GraphicObjects/PrivateContainer.cs
+++ b/src/GraphicObjects/PrivateContainer.cs
@@ -103,18 +103,14 @@ namespace Crow
 			switch (layoutType) {
 			case LayoutingType.Width:								
 				if (child != null) {
-					if (child.getBounds ().Width == 0)
-						child.RegisterForLayouting (LayoutingType.Width);
-					else
-						child.RegisterForLayouting (LayoutingType.X);
+					if (child.Visible)
+						child.RegisterForLayouting (LayoutingType.X | LayoutingType.Width);
 				}
 				break;
 			case LayoutingType.Height:
 				if (child != null) {
-					if (child.getBounds ().Height == 0)
-						child.RegisterForLayouting (LayoutingType.Height);
-					else
-						child.RegisterForLayouting (LayoutingType.Y);
+					if (child.Visible)
+						child.RegisterForLayouting (LayoutingType.Y | LayoutingType.Height);
 				}
 				break;
 			}							
-- 
2.47.3