From: jpbruyere <jp.bruyere@hotmail.com>
Date: Tue, 19 Apr 2016 16:22:27 +0000 (+0200)
Subject: adjust spinner properties, compute proportion in Double precision
X-Git-Tag: v0.4~63
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=88769581ad8993ae9e3b1cb60ccbdc4cb5008fe7;p=jp%2Fcrow.git

adjust spinner properties, compute proportion in Double precision
---

diff --git a/Templates/Spinner.goml b/Templates/Spinner.goml
index c7b5cfb9..03986175 100755
--- a/Templates/Spinner.goml
+++ b/Templates/Spinner.goml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
-<HorizontalStack Name="hstack" Margin="0" Spacing="0" Height="{../HeightPolicy}" Width="{../WidthPolicy}">
+<HorizontalStack MinimumSize="40;10" Name="hstack" Margin="0" Spacing="0" Height="{../HeightPolicy}" Width="{../WidthPolicy}">
 	<Border BorderWidth="1" Height="{../../HeightPolicy}" Width="80%"  Background="White" 
 		Foreground="DimGray" Margin="0">
 		<Label Foreground="DimGray" Height="{../../../HeightPolicy}" Width="Stretched"
 			Text="{../../../Value}" TextAlignment="Right" Margin="0"/>
 	</Border>
-	<VerticalStack Width="20%" Height="Stretched" Spacing="0" Margin="0" Background="Red">
+	<VerticalStack MinimumSize="8;10" Width="20%" Height="Stretched" Spacing="0" Margin="0" Background="Red">
 		<Button MouseRepeat="true" Width="Stretched" Height="50%" Margin="0" MouseClick="../../../onUp"
 			Template="#Crow.Templates.ArrowButTemplate.crow">
 			<Image Path="#Crow.Images.Icons.updown.svg" SvgSub="up" Margin="0"/>
diff --git a/Tests/Interfaces/testSpinner.goml b/Tests/Interfaces/testSpinner.goml
index 224900af..4efd587a 100755
--- a/Tests/Interfaces/testSpinner.goml
+++ b/Tests/Interfaces/testSpinner.goml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<VerticalStack Name="TopContainer" Width="400" Height="-1"
+<VerticalStack Name="TopContainer" Width="400" Height="Fit"
 	Margin="20" Background="DarkGray">
 
 	<HorizontalStack Fit="true" Margin="5" Background="SkyBlue">
diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs
index 88bb3885..1750e11e 100644
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/GraphicObject.cs
@@ -811,7 +811,7 @@ namespace Crow
 				else if (Width == Measure.Stretched)
 					Slot.Width = Parent.ClientRectangle.Width;
 				else
-					Slot.Width = Parent.ClientRectangle.Width * Width / 100;
+					Slot.Width = (int)Math.Round((double)(Parent.ClientRectangle.Width * Width) / 100.0);
 
 				if (Slot.Width == int.MinValue)
 					return false;
@@ -844,7 +844,7 @@ namespace Crow
 				else if (Height == Measure.Stretched)
 					Slot.Height = Parent.ClientRectangle.Height;
 				else
-					Slot.Height = Parent.ClientRectangle.Height * Height.Value / 100;
+					Slot.Height = (int)Math.Round((double)(Parent.ClientRectangle.Height * Height) / 100.0);
 
 				if (Slot.Height == int.MinValue)
 					return false;
diff --git a/src/GraphicObjects/Scroller.cs b/src/GraphicObjects/Scroller.cs
index 2fb80033..22b36fd2 100644
--- a/src/GraphicObjects/Scroller.cs
+++ b/src/GraphicObjects/Scroller.cs
@@ -97,9 +97,13 @@ namespace Crow
 		[XmlIgnore]
 		public int MaximumScroll {
 			get {
-				return VerticalScrolling ? 
-					child == null ? 0 : Math.Max(Child.Slot.Height - ClientRectangle.Height,0) :
-					Math.Max(Child.Slot.Width - ClientRectangle.Width,0);
+				try {
+					return VerticalScrolling ? 
+						Math.Max(Child.Slot.Height - ClientRectangle.Height,0) :
+						Math.Max(Child.Slot.Width - ClientRectangle.Width,0);					
+				} catch {
+					return 0;
+				}
 			}
 		}
 
@@ -117,6 +121,7 @@ namespace Crow
             : base(){}
 
 		#region GraphicObject Overrides
+		//TODO:put this override in style
 		[XmlAttributeAttribute()][DefaultValue(false)]
 		public override bool CacheEnabled {
 			get { return base.CacheEnabled; }