* OpenTK:

* GOLIBTest_4.cs: fps in pgbar

* test4.goml: tests

* CompilerServices.cs: check null src value

diff --git a/Tests/GOLIBTest_4.cs b/Tests/GOLIBTest_4.cs
index 5b421100996ab12c5e73ebcf8493fc51653acd0c..3fb79fffb91bcdb24286f53164fe564dfd6b33f5 100644 (file)
--- a/Tests/GOLIBTest_4.cs
+++ b/Tests/GOLIBTest_4.cs
@@ -88,7 +88,7 @@ namespace test
                        //c2.VerticalAlignment = VerticalAlignment.Top;\r
                        c.Background.AdjustAlpha (0.5);\r
                        labMousePos = c.FindByName ("labMouse") as Label;\r
-                       pb = c.FindByName("pbBar") as ProgressBar;\r
+                       //pb = c.FindByName("pbBar") as ProgressBar;\r
                        pb2 = c.FindByName("pbBar2") as ProgressBar;\r
                        labPb = c.FindByName ("labPb") as Label;\r
                        labF = c.FindByName ("labFocus") as Label;\r
@@ -135,8 +135,8 @@ namespace test
                                        }\r
                                );\r
                                i++;\r
-                               if (i > 250)\r
-                                       break;\r
+//                             if (i > 150)\r
+//                                     break;\r
                        }\r
                        ValueChanged.Raise(this, new ValueChangeEventArgs ("TestList", TestList));\r
                }\r
@@ -171,11 +171,10 @@ namespace test
                        }\r
                        frameCpt++;\r
 \r
-                       if (pb.Value == pb.Maximum)\r
-                               pb.Value = 0;\r
-                       pb.Value++;\r
-                       pb2.Value = pb.Value;\r
-                       //labPb.Text = pb.Value.ToString ();\r
+                       if (pb2.Value == pb2.Maximum)\r
+                               pb2.Value = 0;\r
+                       pb2.Value++;\r
+\r
                        if (FocusedWidget==null)\r
                                labF.Text = "- none -";\r
                        else\r

diff --git a/Tests/Interfaces/test4.goml b/Tests/Interfaces/test4.goml
index c468aef286f8150fe05d3368db3a980dd1c0a878..ec4251fe6dc44ba1955d708483b4f72d2b8457c6 100755 (executable)
--- a/Tests/Interfaces/test4.goml
+++ b/Tests/Interfaces/test4.goml
@@ -48,15 +48,15 @@
 <!--                           <ListBox Data="{TestList}"></ListBox>-->\r
                                <HorizontalStack Name="hsPbar" Margin="5">\r
                                        <ProgressBar Name="pbBar" \r
-                                               Width="100" Height="20"\r
+                                               Width="200" Height="20"\r
                                                Minimum="0"\r
                                                Maximum="200"\r
-                                               Value="50"\r
+                                               Value="{fps}"\r
                                                Foreground="BlueCrayola" Background="DarkGray"\r
                                                BorderWidth="2" BorderColor="White"/>\r
-                                       <Label Name="labPb"\r
+<!--                                   <Label Name="labPb"\r
                                                Width="30"\r
-                                               TextAlignment="RightCenter"/>\r
+                                               TextAlignment="RightCenter"/>-->\r
                                </HorizontalStack>\r
                                <HorizontalStack  Name="hsFocus">\r
                                        <Label Text="Focused:"/>\r
@@ -79,7 +79,7 @@
                                                                Text="editable text"/>\r
                                <GroupBox Title="Group Box" Width="300" Height="100" \r
                                        BorderColor="White" BorderWidth="2" Margin="3">\r
-                                       <Label Name="labValue" FontSize="14" Text="000" TextAlignment="Center"/>\r
+                                       <Label Name="labValue" FontSize="14" Text="{../../slider.Value}" TextAlignment="Center"/>\r
                                </GroupBox>\r
                                <Slider Height="10" Width="300" BorderWidth="1" Background="Transparent" />\r
                                <GraduatedSlider Name="slider" Height="30" Width="300" Foreground="BlueBell"/>\r
@@ -139,6 +139,8 @@
                                        <VerticalStack Name="colors" VerticalAlignment="Top" Margin="1">\r
                                                <ProgressBar Name="pbBar2" Width="100" Height="20" Value="50"\r
                                                                        BorderWidth="2" BorderColor="White" Foreground="BlueCrayola" Background="DarkGray"/>\r
+                                               <ProgressBar Width="100" Height="20" Value="{fps}" BorderWidth="2"\r
+                                                       BorderColor="White" Foreground="BlueCrayola" Background="DarkGray"/>                                                                                            \r
                                        </VerticalStack>\r
                                </Scroller>\r
                                <Scrollbar Name="scrollbar1" Scroll="{../scroller1.ScrollY}" MaximumScroll="{../scroller1.MaximumScroll}"\r

diff --git a/src/CompilerServices/CompilerServices.cs b/src/CompilerServices/CompilerServices.cs
index b2f2e14c8c26e66049ed7327d5db02b971454c2d..bedb554f013b555aab81b12442b67801188365ec 100644 (file)
--- a/src/CompilerServices/CompilerServices.cs
+++ b/src/CompilerServices/CompilerServices.cs
@@ -199,8 +199,10 @@ namespace go
                        if (miDst.MemberType == MemberTypes.Property) {
                                PropertyInfo piDst = miDst as PropertyInfo;
                                //TODO: handle other dest type conversions
-                               if (piDst.PropertyType == typeof(string))
-                                       srcVal = srcVal.ToString ();
+                               if (piDst.PropertyType == typeof(string)){
+                                       if (srcVal != null)
+                                               srcVal = srcVal.ToString ();
+                               }
                                piDst.GetSetMethod ().Invoke (binding.Source, new object[] { srcVal });
                        } else if (miDst.MemberType == MemberTypes.Field) {
                                FieldInfo fiDst = miDst as FieldInfo;