debug and typo

diff --git a/Templates/Checkbox.goml b/Templates/Checkbox.goml
index 130b01937e59f154e2339eb0e7c95d1a022b46ca..44e66817567c1cdee9f179e87841c869a1da3735 100755 (executable)
--- a/Templates/Checkbox.goml
+++ b/Templates/Checkbox.goml
@@ -1,8 +1,4 @@
 <?xml version="1.0"?>\r
-<!--<HorizontalStack Spacing="1" Height="-1" Width="0">\r
-       <Image Margin="2" Width="14" Height="14" Path="{Image}" SvgSub="{SvgSub2}"/>\r
-       <Label Text="{Caption}" Width="0"/>\r
-</HorizontalStack>-->\r
 <HorizontalStack Spacing="1" Height="{TemplatedHeight}" Width="{TemplatedWidth}">\r
        <Image Margin="2" Width="14" Height="14" Path="{Image}" SvgSub="{SvgSub}"/>\r
        <Label Text="{Caption}" Height="{TemplatedHeight}" Width="{TemplatedWidth}"/>\r

diff --git a/Tests/GOLIBTests.cs b/Tests/GOLIBTests.cs
index 2585ad6c4ebc56b42a9500118fabf447b3ab8979..a9014d3f4dd565795341a2e3b2038f071b4497f3 100644 (file)
--- a/Tests/GOLIBTests.cs
+++ b/Tests/GOLIBTests.cs
@@ -31,6 +31,8 @@ namespace test
                int frameCpt = 0;\r
                int idx = 0;\r
                string[] testFiles = {\r
+                       "testGroupBox.goml",\r
+                       "testBorder.goml",\r
                        "testCheckbox.goml",\r
                        "testWindow.goml",\r
                        "test0.goml",\r

diff --git a/Tests/Interfaces/testBorder.goml b/Tests/Interfaces/testBorder.goml
index 15ecba3a702b09150f4c84884c68c9aeaa8854d1..8a6627b614bde258106bca4bd3cafc2d12f6f13b 100755 (executable)
--- a/Tests/Interfaces/testBorder.goml
+++ b/Tests/Interfaces/testBorder.goml
@@ -1,7 +1,8 @@
 <?xml version="1.0"?>\r
-<GroupBox Width="-1" Height="-1" Background="Red">\r
-       <VerticalStack Margin="0">\r
-               <Checkbox />\r
-\r
-       </VerticalStack>\r
-</GroupBox>\r
+<Container Fit="true" Margin="5" Background="Blue">\r
+<Group Fit="true" Margin="5" Background="Green">\r
+<Border Fit="true" Background="Red" Margin="10">\r
+       <Checkbox/>\r
+</Border>\r
+</Group>\r
+</Container>\r

diff --git a/Tests/Interfaces/testExpandable.goml b/Tests/Interfaces/testExpandable.goml
index 712a485f7fe8feb37d476b6e150ce91beacd5317..1627055b0873bc8a3400223d386583dd04a8b02b 100755 (executable)
--- a/Tests/Interfaces/testExpandable.goml
+++ b/Tests/Interfaces/testExpandable.goml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>\r
-<Expandable Title="Test expandable" Width="150" Background="DimGray">\r
-               <VerticalStack Width="100" Height="-1">\r
+<Expandable Title="Test expandable" Width="-1" Background="DimGray">\r
+               <VerticalStack Width="-1" Height="-1">\r
                        <Checkbox Name="chk1"/>\r
                        <Checkbox Name="chk2" IsChecked="true"/>\r
                        <Checkbox Name="chk3"/>\r

diff --git a/Tests/Interfaces/testGroupBox.goml b/Tests/Interfaces/testGroupBox.goml
index 712a485f7fe8feb37d476b6e150ce91beacd5317..fd328be4f9262f0ac463b95e51bf511b4c90b40b 100755 (executable)
--- a/Tests/Interfaces/testGroupBox.goml
+++ b/Tests/Interfaces/testGroupBox.goml
@@ -1,9 +1,7 @@
 <?xml version="1.0"?>\r
-<Expandable Title="Test expandable" Width="150" Background="DimGray">\r
-               <VerticalStack Width="100" Height="-1">\r
-                       <Checkbox Name="chk1"/>\r
-                       <Checkbox Name="chk2" IsChecked="true"/>\r
-                       <Checkbox Name="chk3"/>\r
-                       <Checkbox Name="chk4"/>\r
-               </VerticalStack>                \r
-</Expandable>\r
+<Groupbox Width="-1" Height="-1" Background="Red">\r
+       <VerticalStack Margin="0">\r
+               <Checkbox />\r
+\r
+       </VerticalStack>\r
+</Groupbox>\r

diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index bf926a16580c230d798942fe0979ba801fed7899..ce5f48b7397f01fa6d9433c9b84eaa2d946e775d 100644 (file)
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -159,6 +159,12 @@
     <None Include="Interfaces\testWindow2.goml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="Interfaces\testGroupBox.goml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Interfaces\testBorder.goml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Interfaces\" />

diff --git a/src/GraphicObjects/AnalogMeter.cs b/src/GraphicObjects/AnalogMeter.cs
index bf7f1c2491a2e4972feaceea388b7ba0e9fe921e..1be24c4f50f571caaa1d1f5f59bd489d3420ae56 100644 (file)
--- a/src/GraphicObjects/AnalogMeter.cs
+++ b/src/GraphicObjects/AnalogMeter.cs
@@ -17,15 +17,6 @@ namespace go
                }
                #endregion
 
-               #region implemented abstract members of TemplatedControl
-
-               protected override void loadTemplate (GraphicObject template = null)
-               {
-                       base.loadTemplate (template);
-               }
-
-               #endregion
-
                #region GraphicObject Overrides
                protected override void onDraw (Context gr)
                {                       

diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs
index 6a146c649b3ff3243fbf9de9e13b0168b233b527..41720ed95fb55eb69d9f79b68b321973ebdf6c66 100644 (file)
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/GraphicObject.cs
@@ -480,6 +480,8 @@ namespace go
                {\r
                        if (Parent==null)\r
                                return;\r
+\r
+                       //Debug.WriteLine ("Layout change: " + this.ToString () + ":" + LastSlots.ToString() + "=>" + Slot.ToString ());\r
                        \r
                        switch (layoutType) {\r
                        case LayoutingType.Width:                               \r
@@ -644,7 +646,7 @@ namespace go
                        using (ImageSurface draw =\r
                 new ImageSurface(bmp, Format.Argb32, Slot.Width, Slot.Height, stride)) {\r
                                using (Context gr = new Context (draw)) {\r
-                                       gr.Antialias = Antialias.Gray;\r
+                                       gr.Antialias = Antialias.Subpixel;\r
                                        onDraw (gr);\r
                                }\r
                                draw.Flush ();\r

diff --git a/src/GraphicObjects/TemplatedContainer.cs b/src/GraphicObjects/TemplatedContainer.cs
index 4d8eb832d7c2e757f0ae6cab7421470243f06040..a19f6c282006cf2f091e846dabd53a6706187f97 100644 (file)
--- a/src/GraphicObjects/TemplatedContainer.cs
+++ b/src/GraphicObjects/TemplatedContainer.cs
@@ -26,13 +26,13 @@ namespace go
 {
        public abstract class TemplatedContainer : TemplatedControl
        {
-               [XmlIgnore]
-               public abstract GraphicObject Content{ get; set;}
+               [XmlIgnore]public abstract GraphicObject Content{ get; set;}
 
                protected override void loadTemplate (GraphicObject template)
                {
                        base.loadTemplate (template);
                }
+
                public TemplatedContainer () : base()
                {
                }

diff --git a/src/GraphicObjects/TemplatedControl.cs b/src/GraphicObjects/TemplatedControl.cs
index ca3ed68c05f79fe38fedaf3a7fa1f549f2c08871..87bbeb09a734a1c263b3840630b00ce7ee9a1043 100644 (file)
--- a/src/GraphicObjects/TemplatedControl.cs
+++ b/src/GraphicObjects/TemplatedControl.cs
@@ -108,9 +108,7 @@ namespace go
                        }else
                                this.SetChild (template);
                }
-
-
-
+                       
                #region IXmlSerializable
 
                public override System.Xml.Schema.XmlSchema GetSchema(){ return null; }