From: jpbruyere <jp.bruyere@hotmail.com>
Date: Fri, 5 Feb 2016 15:36:08 +0000 (+0100)
Subject: ScrollBar derived from NumericControl
X-Git-Tag: 0.3~48
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=e86428443b1db0f1d07b51d0c202a111427837d2;p=jp%2Fcrow.git

ScrollBar derived from NumericControl
---

diff --git a/Templates/ScrollBar.goml b/Templates/ScrollBar.goml
index 95271b5e..b643c36b 100755
--- a/Templates/ScrollBar.goml
+++ b/Templates/ScrollBar.goml
@@ -6,9 +6,14 @@
 			Template="#Crow.Templates.ArrowButTemplate.crow">
 			<Image Margin="1" Path="#Crow.Images.Icons.updown.svg" SvgSub="up"/>
 		</Button>
-		<Slider Name="Slider" Value="{../../../Scroll}" Maximum="{../../../MaximumScroll}"
+		<Slider Name="Slider"
+			Orientation="{../../../Orientation}"
+			Value="{../../../Value}"
+			Maximum="{../../../Maximum}"
+			LargeIncrement="{../../../LargeIncrement}"
+			SmallIncrement="{../../../SmallIncrement}"
 			Background="hgradient|0:DimGray|0,1:Gray|0,95:Gray|1:White"
-			Width="{../../../TemplatedWidth}" Height="{../../../TemplatedHeight}" Orientation="{../../../Orientation}"
+			Width="{../../../TemplatedWidth}" Height="{../../../TemplatedHeight}"
 			ValueChanged="../../../onSliderValueChange"/>
 		<Button MouseRepeat="true" Width="12" Height="12" MouseClick="../../../onScrollForth"
 			Template="#Crow.Templates.ArrowButTemplate.crow">
diff --git a/Templates/ScrollingListBox.goml b/Templates/ScrollingListBox.goml
index 0c92dcf6..db0973d8 100644
--- a/Templates/ScrollingListBox.goml
+++ b/Templates/ScrollingListBox.goml
@@ -2,12 +2,12 @@
 <Border BorderWidth="1" MinimumSize="20;20" Height="{../TemplatedHeight}" Width="{../TemplatedWidth}">
 	<HorizontalStack Margin="1" Height="{../../TemplatedHeight}" Width="{../../TemplatedWidth}">
 		<Scroller Name="scroller1" Height="{../../../TemplatedHeight}" Width="{../../../TemplatedWidth}" 
-				Margin="2" VerticalScrolling="true" ScrollY="{../scrollbar1.Scroll}">
+				Margin="2" VerticalScrolling="true" ScrollY="{../scrollbar1.Value}">
 			<VerticalStack Width="{../../../../TemplatedWidth}" Height="-1" 
 				Name="List" Margin="0" VerticalAlignment="Top" />
 		</Scroller>
-		<ScrollBar Name="scrollbar1" Scroll="{../scroller1.ScrollY}" 
-			MaximumScroll="{../scroller1.MaximumScroll}" Orientation="Vertical" 
+		<ScrollBar Name="scrollbar1" Value="{../scroller1.ScrollY}" 
+			Maximum="{../scroller1.MaximumScroll}" Orientation="Vertical" 
 			Width="10" Height="{../../../TemplatedHeight}" />
 	</HorizontalStack>
 </Border>
\ No newline at end of file
diff --git a/Tests/GOLIBTests.cs b/Tests/GOLIBTests.cs
index 026ce11d..1ac9bdc3 100644
--- a/Tests/GOLIBTests.cs
+++ b/Tests/GOLIBTests.cs
@@ -37,6 +37,7 @@ namespace test
 		int frameCpt = 0;
 		int idx = 0;
 		string[] testFiles = {
+			"testScrollbar.goml",
 			"4.crow",
 			"testColorList.crow",
 			"testGroupBox.goml",
@@ -52,7 +53,6 @@ namespace test
 			"testTextBox.crow",
 			"testImage.crow",
 			"test4.goml",
-			"testScrollbar.goml",
 			"2.crow",
 			"test1.goml",
 			"testWindow2.goml",
diff --git a/Tests/Interfaces/testColorList.crow b/Tests/Interfaces/testColorList.crow
index a38e899d..a39547f3 100755
--- a/Tests/Interfaces/testColorList.crow
+++ b/Tests/Interfaces/testColorList.crow
@@ -8,12 +8,12 @@
 				<Border BorderWidth="1" Height="{../TemplatedHeight}" Width="{../TemplatedWidth}">
 					<HorizontalStack Margin="1" Height="{../../TemplatedHeight}" Width="{../../TemplatedWidth}" >
 						<Scroller Name="scroller1" Height="{../../../TemplatedHeight}" Width="{../../../TemplatedWidth}" 
-								Margin="2" VerticalScrolling="true" ScrollY="{../scrollbar1.Scroll}">
+								Margin="2" VerticalScrolling="true" ScrollY="{../scrollbar1.Value}">
 							<VerticalStack Width="{../../../../TemplatedWidth}" Height="-1" MinimumSize="100;100"
 								Name="List" Margin="0" VerticalAlignment="Top" />
 						</Scroller>
-						<ScrollBar Name="scrollbar1" Scroll="{../scroller1.ScrollY}" 
-							MaximumScroll="{../scroller1.MaximumScroll}" Orientation="Vertical" 
+						<ScrollBar Name="scrollbar1" Value="{../scroller1.ScrollY}" 
+							Maximum="{../scroller1.MaximumScroll}" Orientation="Vertical" 
 							Width="14" Height="{../../../TemplatedHeight}" />
 					</HorizontalStack>
 				</Border>
diff --git a/Tests/Interfaces/testScrollbar.goml b/Tests/Interfaces/testScrollbar.goml
index 5d522dc6..ef08abb7 100755
--- a/Tests/Interfaces/testScrollbar.goml
+++ b/Tests/Interfaces/testScrollbar.goml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <Group Name="TopContainer" Width="400" Height="400"
 	Focusable="True" Background="Gray">
-	<ScrollBar Height="0" Orientation="Vertical" Width="16" MaximumScroll="100"/>
+	<ScrollBar Height="0" Orientation="Vertical" Width="16" Maximum="100"/>
 </Group>
\ No newline at end of file
diff --git a/src/GraphicObjects/ScrollBar.cs b/src/GraphicObjects/ScrollBar.cs
index 3e095457..dddd441e 100644
--- a/src/GraphicObjects/ScrollBar.cs
+++ b/src/GraphicObjects/ScrollBar.cs
@@ -17,50 +17,18 @@ using System.ComponentModel;
 namespace Crow
 {
 	[DefaultTemplate("#Crow.Templates.ScrollBar.goml")]
-	public class ScrollBar : TemplatedControl
+	public class ScrollBar : NumericControl
 	{
 		Orientation _orientation;
-		Slider _slider;
-		double _maximumScroll;
-		double _scroll;
 
-		public ScrollBar() : base()
-		{
-		}	
-
-		protected override void loadTemplate(GraphicObject template = null)
-		{			
-			base.loadTemplate (template);
-			_slider = this.child.FindByName ("Slider") as Slider;
-		}
+		#region CTOR
+		public ScrollBar() : base()	{}
+		#endregion
 
 		[XmlAttributeAttribute()][DefaultValue(0.0)]
-		public virtual double MaximumScroll
-		{
-			get { return _maximumScroll; }
-			set {
-				if (_maximumScroll == value)
-					return;
-				_maximumScroll = value;
-				registerForGraphicUpdate ();
-				NotifyValueChanged ("MaximumScroll", _maximumScroll);
-			}
-		}
-		[XmlAttributeAttribute()][DefaultValue(0.0)]
-		public virtual double Scroll
-		{
-			get { return _scroll; }
-			set {
-				if (_scroll == value)
-					return;
-				_scroll = value;
-				if (_scroll < 0.0)
-					_scroll = 0.0;
-				else if (_scroll > _maximumScroll)
-					_scroll = _maximumScroll;
-				registerForGraphicUpdate ();
-				NotifyValueChanged ("Scroll", _scroll);
-			}
+		public override double Maximum {
+			get { return base.Maximum; }
+			set { base.Maximum = value; }
 		}
 		[XmlAttributeAttribute()][DefaultValue(Orientation.Vertical)]
 		public virtual Orientation Orientation
@@ -76,17 +44,16 @@ namespace Crow
 		}
 		public void onScrollBack (object sender, MouseButtonEventArgs e)
 		{
-			Scroll -= 50;
+			Value -= SmallIncrement;
 		}
 		public void onScrollForth (object sender, MouseButtonEventArgs e)
 		{
-			Scroll += 50;
-
+			Value += SmallIncrement;
 		}
 
 		public void onSliderValueChange(object sender, ValueChangeEventArgs e){
 			if (e.MemberName == "Value")
-				Scroll = Convert.ToDouble(e.NewValue);
+				Value = Convert.ToDouble(e.NewValue);
 		}
 	}
 }