Merge branch 'DefTemplateSizing0'

diff --cc Templates/CheckBox.goml
index 5f5807aa2c1154cdc698d46000c48eec8b86306b,ffdb2202c62703222609d98badc6dc2f254f8938..0e55491fe9c4032bd47f56287c6f4480d0f64db3
--- 1/Templates/CheckBox.goml
--- 2/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 427c188079f5aee38324b30dc773d978ce633ec9,b2465abb3f56dfeb6c187e3a94bbc84a8ee23f2c..6757fb68949e46558fe5cd26787775f16620fe61
--- 1/Templates/Expandable.goml
--- 2/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 a2fb1e7880c148cca8cd3e8d8446e9155a604304,8c2787fb3d0b3fedb2b52c34b339673e79e11c90..1a61085b41491019690d1dc965555bf10f4f26f2
--- 1/Tests/Interfaces/testExpandable.goml
--- 2/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 39b4818207268e36e65b530944fda88e9457ab60,862d25db6bd05dbeac0e1bd258da6f56bc4f341e..17d9581f918938251a26af9bd15dc0903662ab65
--- 1/src/OpenTKGameWindow.cs
--- 2/src/OpenTKGameWindow.cs
+++ b/src/OpenTKGameWindow.cs
@@@ -583,4 -638,4 +629,4 @@@ namespace Cro
                public Rectangle getBounds () => ClientRectangle;
                #endregion
      }
--}
++}