From: jpbruyere <jp.bruyere@hotmail.com>
Date: Wed, 17 Feb 2016 07:44:34 +0000 (+0100)
Subject: Merge branch 'DefTemplateSizing0'
X-Git-Tag: v0.4~127
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=a8156b149f2e4a3c087bcb090db293d08116bd67;p=jp%2Fcrow.git

Merge branch 'DefTemplateSizing0'
---

a8156b149f2e4a3c087bcb090db293d08116bd67
diff --cc Templates/CheckBox.goml
index 5f5807aa,ffdb2202..0e55491f
--- a/Templates/CheckBox.goml
+++ b/Templates/CheckBox.goml
@@@ -1,5 -1,5 +1,5 @@@
  <?xml version="1.0"?>
- <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 Spacing="1" Height="{../HeightPolicy}" Width="{../WidthPolicy}">
 -	<Image Background="Red" Margin="2" Width="14"  Height="14" Path="{../../Image}" SvgSub="{../../SvgSub}"/>
 -	<Label Background="Blue" Text="{../../Caption}" Height="{../../HeightPolicy}" Width="{../../WidthPolicy}"/>
++<HorizontalStack Margin="1" Spacing="1" Height="{../HeightPolicy}" Width="{../WidthPolicy}">
++	<Image Margin="2" Width="14"  Height="14" Path="{../../Image}" SvgSub="{../../SvgSub}"/>
++	<Label Text="{../../Caption}" Height="{../../HeightPolicy}" Width="{../../WidthPolicy}"/>
  </HorizontalStack>
diff --cc Templates/Expandable.goml
index 427c1880,b2465abb..6757fb68
--- a/Templates/Expandable.goml
+++ b/Templates/Expandable.goml
@@@ -1,11 -1,11 +1,12 @@@
  <?xml version="1.0"?>
- <Border BorderWidth="1" Foreground="LightGray" Height="{../TemplatedHeight}" Width="{../TemplatedWidth}" 
+ <Border BorderWidth="1" Foreground="LightGray" Height="{../HeightPolicy}" Width="{../WidthPolicy}" 
  		MouseClick="../onMouseClick">
- 	<VerticalStack Height="{../../TemplatedHeight}" Width="{../../TemplatedWidth}">
- 		<HorizontalStack Spacing="1" Height="-1" Width="{../../../TemplatedWidth}">
+ 	<VerticalStack Height="{../../HeightPolicy}" Width="{../../WidthPolicy}">
+ 		<HorizontalStack Spacing="1" Height="-1" Width="{../../../WidthPolicy}">
  			<Image Margin="2" Width="12" Height="12" Path="{../../../../Image}" SvgSub="{../../../../SvgSub}"/>
- 			<Label Text="{../../../../Caption}" Width="{../../../../TemplatedWidth}"/>
+ 			<Label Text="{../../../../Caption}" Width="{../../../../WidthPolicy}"/>
  		</HorizontalStack>
- 		<Container Name="Content" Visible="false" Height="{../../../TemplatedHeight}" Width="{../../../TemplatedWidth}"/>
 -		<Container Background="Red" Name="Content" Visible="false" Height="{../../../HeightPolicy}" Width="{../../../WidthPolicy}"/>
++		<Container Name="Content" Visible="false"
++			Height="{../../../HeightPolicy}" Width="{../../../WidthPolicy}"/>
  	</VerticalStack>
  </Border>
diff --cc Tests/Interfaces/testExpandable.goml
index a2fb1e78,8c2787fb..1a61085b
--- a/Tests/Interfaces/testExpandable.goml
+++ b/Tests/Interfaces/testExpandable.goml
@@@ -1,13 -1,13 +1,13 @@@
  <?xml version="1.0"?>
--<Expandable Caption="Test expandable" Background="DimGray">
- 		<VerticalStack Width="-1" Height="-1">
 -		<VerticalStack Margin="5" Background="Green">
--			<CheckBox Name="chk1" Background="Red"/>
--			<CheckBox Name="chk2" IsChecked="true"/>
--			<CheckBox Name="chk3"/>
--			<CheckBox Name="chk4"/>
- 			<HorizontalStack Fit="true" Margin="2" Background="Blue">
++<Expandable Fit="true" Caption="Test expandable" Background="DimGray">
++		<VerticalStack Margin="5" Background="Green" Fit="true">
++			<CheckBox Name="chk1" Background="Red" Fit="true"/>
++			<CheckBox Name="chk2" IsChecked="true" Fit="true"/>
++			<CheckBox Name="chk3" Fit="true"/>
++			<CheckBox Name="chk4" Fit="true"/>
+ <!--			<HorizontalStack Fit="true" Margin="2" Background="Blue">
  				<Label Name="captionFps" Text="Fps:" Width="30" TextAlignment="Right"/>
  				<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="-1" TextAlignment="Center" Background="AoEnglish"/>
- 			</HorizontalStack>
+ 			</HorizontalStack>-->
  		</VerticalStack>
  </Expandable>
diff --cc src/OpenTKGameWindow.cs
index 39b48182,862d25db..17d9581f
--- a/src/OpenTKGameWindow.cs
+++ b/src/OpenTKGameWindow.cs
@@@ -583,4 -638,4 +629,4 @@@ namespace Cro
  		public Rectangle getBounds () => ClientRectangle;
  		#endregion
      }
--}
++}