resolve several bug in scrollbar

diff --git a/src/GraphicObjects/NumericControl.cs b/src/GraphicObjects/NumericControl.cs
index 3e35f102f9e97e19f1ce4176d9da2aabf2706c89..409a200f5a5efe508928ea00a7bc3ece6d5b6d52 100644 (file)
--- a/src/GraphicObjects/NumericControl.cs
+++ b/src/GraphicObjects/NumericControl.cs
@@ -29,7 +29,8 @@ namespace Crow
                                        return;
 
                                minValue = value;
-
+                               NotifyValueChanged ("Minimum", minValue);
+                               registerForGraphicUpdate ();
                        }
                }
                [XmlAttributeAttribute()][DefaultValue(100.0)]
@@ -41,7 +42,8 @@ namespace Crow
                                        return;
 
                                maxValue = value;
-
+                               NotifyValueChanged ("Maximum", maxValue);
+                               registerForGraphicUpdate ();
                        }
                }
                [XmlAttributeAttribute()][DefaultValue(1.0)]
@@ -53,7 +55,8 @@ namespace Crow
                                        return;
 
                                smallStep = value;
-
+                               NotifyValueChanged ("SmallIncrement", smallStep);
+                               registerForGraphicUpdate ();
                        }
                }
                [XmlAttributeAttribute()][DefaultValue(5.0)]
@@ -65,7 +68,8 @@ namespace Crow
                                        return;
 
                                bigStep = value;
-
+                               NotifyValueChanged ("LargeIncrement", bigStep);
+                               registerForGraphicUpdate ();
                        }
                }
                [XmlAttributeAttribute()][DefaultValue(0)]

diff --git a/src/GraphicObjects/ScrollBar.cs b/src/GraphicObjects/ScrollBar.cs
index 9a598abad7764b7fa6ea299e9057498c6c78ca3b..3e0954574aaa88465f0b2b3cf1b54003d68923fe 100644 (file)
--- a/src/GraphicObjects/ScrollBar.cs
+++ b/src/GraphicObjects/ScrollBar.cs
@@ -76,22 +76,17 @@ namespace Crow
                }
                public void onScrollBack (object sender, MouseButtonEventArgs e)
                {
-                       Scroll -= _slider.LargeIncrement;
+                       Scroll -= 50;
                }
                public void onScrollForth (object sender, MouseButtonEventArgs e)
                {
-                       Scroll += _slider.LargeIncrement;
+                       Scroll += 50;
 
                }
 
                public void onSliderValueChange(object sender, ValueChangeEventArgs e){
-                       Scroll = Convert.ToDouble(e.NewValue);
-               }
-
-               public override void OnLayoutChanges (LayoutingType layoutType)
-               {
-                       OpenTKGameWindow.currentWindow.CursorVisible = true;
-                       base.OnLayoutChanges (layoutType);
+                       if (e.MemberName == "Value")
+                               Scroll = Convert.ToDouble(e.NewValue);
                }
        }
 }

diff --git a/src/GraphicObjects/Scroller.cs b/src/GraphicObjects/Scroller.cs
index 1171d8d9921ea02ba71bcc1118f19c70eb3c2065..b2a09db5a11f3f9e8f4cb2db9b1f25042b7f6fc1 100644 (file)
--- a/src/GraphicObjects/Scroller.cs
+++ b/src/GraphicObjects/Scroller.cs
@@ -80,8 +80,8 @@ namespace Crow
                public int MaximumScroll {
                        get {
                                return VerticalScrolling ? 
-                                       child == null ? 0 : Child.Slot.Height - ClientRectangle.Height :
-                                       Child.Slot.Width - ClientRectangle.Width;                               
+                                       child == null ? 0 : Math.Max(Child.Slot.Height - ClientRectangle.Height,0) :
+                                       Math.Max(Child.Slot.Width - ClientRectangle.Width,0);
                        }
                }
 

diff --git a/src/GraphicObjects/Slider.cs b/src/GraphicObjects/Slider.cs
index d0a56d9d147c6a39b38eb166f03d1cbf0eca57f0..495683d2fa1732319450fca09f8234e0b412cd36 100644 (file)
--- a/src/GraphicObjects/Slider.cs
+++ b/src/GraphicObjects/Slider.cs
@@ -86,7 +86,6 @@ namespace Crow
                                base.Maximum = value;
                                LargeIncrement = base.Maximum / 10.0;
                                SmallIncrement = LargeIncrement / 5.0;
-
                        }
                }