test refresh of scrollbar in listbox template, add RegisterForGraphicUpdate in scroll...

diff --git a/Tests/GOLIBTest_Listbox.cs b/Tests/GOLIBTest_Listbox.cs
index 1d6b2f38ecddef1961eab1e25c0c8642b118c111..cedf695aa219c257e8753e163525b9c713136e6a 100644 (file)
--- a/Tests/GOLIBTest_Listbox.cs
+++ b/Tests/GOLIBTest_Listbox.cs
@@ -82,13 +82,21 @@ namespace test
                {\r
                        base.OnLoad (e);\r
 \r
-                       TestList = Directory.GetFileSystemEntries("/home/jp/tmp/mtgdata/a", "*.txt",SearchOption.AllDirectories).ToList();\r
+                       //TestList = Directory.GetFileSystemEntries("/home/jp/tmp/mtgdata/a", "*.txt",SearchOption.AllDirectories).ToList();\r
                        GraphicObject tlb = LoadInterface("Interfaces/test_Listbox.goml");\r
                        tlb.DataSource = this;\r
 \r
 //                     TestList [1].Field = "test string";\r
 //                     ValueChanged.Raise(this, new ValueChangeEventArgs ("TestList", TestList));\r
                }\r
+               void OnClear (object sender, MouseButtonEventArgs e){\r
+                       TestList = null;\r
+                       ValueChanged.Raise(this, new ValueChangeEventArgs ("TestList", TestList));\r
+               }\r
+               void OnLoadList (object sender, MouseButtonEventArgs e){\r
+                       TestList = Directory.GetFileSystemEntries("/home/jp/tmp/mtgdata/a", "*.txt",SearchOption.AllDirectories).ToList();\r
+                       ValueChanged.Raise(this, new ValueChangeEventArgs ("TestList", TestList));\r
+               }\r
                protected override void OnMouseMove (MouseMoveEventArgs e)\r
                {                       \r
                        base.OnMouseMove (e);\r
@@ -102,7 +110,8 @@ namespace test
                }\r
                protected override void OnKeyDown (KeyboardKeyEventArgs e)\r
                {\r
-                       TestList.Add ("newly added list item");\r
+                       TestList = Directory.GetFileSystemEntries("/home/jp/tmp/mtgdata/a", "*.txt",SearchOption.AllDirectories).ToList();\r
+                       //TestList.Add ("newly added list item");\r
                        ValueChanged.Raise(this, new ValueChangeEventArgs ("TestList", TestList));\r
                }\r
 \r

diff --git a/Tests/Interfaces/test_Listbox.goml b/Tests/Interfaces/test_Listbox.goml
index 342f29093c811846b3a8bacafb67fe5d7de676d8..fa4b730caaa030c88c8ab93730a44646aad14f47 100755 (executable)
--- a/Tests/Interfaces/test_Listbox.goml
+++ b/Tests/Interfaces/test_Listbox.goml
@@ -1,25 +1,27 @@
 <?xml version="1.0"?>\r
 <!--<ListBox Data="{TestList}" Focusable="true"/>-->\r
-<VerticalStack Fit="true">\r
-       <Label Text="{MousePos}" Width="-1" Background="DarkGreen"/>\r
-       <Label Text="{Hover}" Width="-1" Background="DarkGreen"/>\r
-       <Button Text="button 1" Width="150"/>\r
-       <ListBox Data="{TestList}" Background="0,5;0,5;0,5;0,5"\r
-                                HorizontalAlignment="Center" Width="-1" Height="150" Margin="5">\r
-               <Template>\r
-                       <Border BorderWidth="1" MinimumSize="20;20" Height="{../TemplatedHeight}" Width="{../TemplatedWidth}">\r
-                               <HorizontalStack Margin="1" Height="{../../TemplatedHeight}" Width="{../../TemplatedWidth}">\r
-                                       <Scroller Name="scroller1" Height="{../../../TemplatedHeight}" Width="{../../../TemplatedWidth}" \r
-                                                       Margin="2" VerticalScrolling="true" ScrollY="{../scrollbar1.Scroll}">\r
-                                               <VerticalStack Width="{../../../../TemplatedWidth}" Height="-1" \r
-                                                       Name="List" Margin="0" VerticalAlignment="Top" />\r
-                                       </Scroller>\r
-                                       <Scrollbar Name="scrollbar1" Scroll="{../scroller1.ScrollY}" \r
-                                               MaximumScroll="{../scroller1.MaximumScroll}" Orientation="Vertical" \r
-                                               Width="10" Height="{../../../TemplatedHeight}" />\r
-                               </HorizontalStack>\r
-                       </Border>\r
-               </Template>\r
-       </ListBox>\r
-       <Button Text="button 1" Width="0"/>\r
-</VerticalStack>\r
+<Border BorderWidth="2" Fit="true">\r
+       <VerticalStack Fit="true" Margin="50">\r
+               <Label Text="{MousePos}" Width="-1" Background="DarkGreen"/>\r
+               <Label Text="{Hover}" Width="-1" Background="DarkGreen"/>\r
+               <Button Text="Clear" Width="150" MouseClick="OnClear"/>\r
+               <ListBox Data="{TestList}" Background="0,5;0,5;0,5;0,5"\r
+                                        HorizontalAlignment="Center" Width="-1" Height="150" Margin="5">\r
+                       <Template>\r
+                               <Border BorderWidth="1" Height="{../TemplatedHeight}" Width="{../TemplatedWidth}">\r
+                                       <HorizontalStack Margin="1" Height="{../../TemplatedHeight}" Width="{../../TemplatedWidth}" >\r
+                                               <Scroller Name="scroller1" Height="{../../../TemplatedHeight}" Width="{../../../TemplatedWidth}" \r
+                                                               Margin="2" VerticalScrolling="true" ScrollY="{../scrollbar1.Scroll}">\r
+                                                       <VerticalStack Width="{../../../../TemplatedWidth}" Height="-1" MinimumSize="100;100"\r
+                                                               Name="List" Margin="0" VerticalAlignment="Top" />\r
+                                               </Scroller>\r
+                                               <Scrollbar Name="scrollbar1" Scroll="{../scroller1.ScrollY}" \r
+                                                       MaximumScroll="{../scroller1.MaximumScroll}" Orientation="Vertical" \r
+                                                       Width="10" Height="{../../../TemplatedHeight}" />\r
+                                       </HorizontalStack>\r
+                               </Border>\r
+                       </Template>\r
+               </ListBox>\r
+               <Button Text="Load list" Width="0" MouseClick="OnLoadList"/>\r
+       </VerticalStack>\r
+</Border>
\ No newline at end of file

diff --git a/src/GraphicObjects/Scrollbar.cs b/src/GraphicObjects/Scrollbar.cs
index 8e3b2db5c277f49cfb07b3e3b2c442bd77d71027..956d96ab13d44008eb36112440c1c8fddbf7dcea 100644 (file)
--- a/src/GraphicObjects/Scrollbar.cs
+++ b/src/GraphicObjects/Scrollbar.cs
@@ -46,6 +46,7 @@ namespace go
                                if (_maximumScroll == value)\r
                                        return;\r
                                _maximumScroll = value;\r
+                               registerForGraphicUpdate ();\r
                                ValueChanged.Raise(this, new ValueChangeEventArgs ("MaximumScroll", _maximumScroll));\r
                        }\r
                }\r
@@ -74,6 +75,7 @@ namespace go
                                        return;\r
                                _orientation = value;\r
                                ValueChanged.Raise(this, new ValueChangeEventArgs ("Orientation", _orientation));\r
+                               registerForGraphicUpdate ();\r
                        }\r
                }\r
                public void onScrollBack (object sender, MouseButtonEventArgs e)\r