From: jpbruyere <jp.bruyere@hotmail.com>
Date: Fri, 12 Aug 2016 13:46:38 +0000 (+0200)
Subject: 	* Default.style, Instantiator.cs, MessageBox.goml, ScrollBar.cs, GenericStack.cs... 
X-Git-Tag: v0.4~8
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=ed815a31113235890cf6c902c754fb3dc7536708;p=jp%2Fcrow.git

	* Default.style, Instantiator.cs, MessageBox.goml, ScrollBar.cs, GenericStack.cs, GraphicObject.cs:
	  debug, codeclean, slot height and width test in Paint to prevent surface creation hang

	* Splitter.cs:
	  splitter debug
---

diff --git a/Default.style b/Default.style
index 12f5110e..247219d7 100644
--- a/Default.style
+++ b/Default.style
@@ -50,6 +50,10 @@ Border {
 ProgressBar {
 	Foreground = vgradient|0:BlueCrayola|0.5:SkyBlue|1:BlueCrayola;
 }
+ScrollBar {
+	Maximum = 0;
+	Value = 0;
+}
 Icon {
 	Margin=1;
 	Width=12;
diff --git a/Templates/MessageBox.goml b/Templates/MessageBox.goml
index f40b5640..e9dc5148 100644
--- a/Templates/MessageBox.goml
+++ b/Templates/MessageBox.goml
@@ -23,10 +23,9 @@
 				TextAlignment="Left"
 				Multiline="true" />		
 		</HorizontalStack>
-		<HorizontalStack Margin="1"  Height="Fit" Width="60%" HorizontalAlignment="Right">
-			<Button Width="48%" Caption="Ok" MouseClick="./onOkButtonClick" />
-			<GraphicObject Width="4%" Height="5"/>
-			<Button Width="48%" Caption="Cancel" MouseClick="./onCancelButtonClick" />
+		<HorizontalStack Margin="1" Spacing="0" Height="Fit" Width="60%" HorizontalAlignment="Right">
+			<Button Width="50%" Caption="Ok" MouseClick="./onOkButtonClick" />
+			<Button Width="50%" Caption="Cancel" MouseClick="./onCancelButtonClick" />
 		</HorizontalStack>
 	</VerticalStack>
 </Border>
diff --git a/src/GraphicObjects/GenericStack.cs b/src/GraphicObjects/GenericStack.cs
index efa98d1a..fcc90e98 100644
--- a/src/GraphicObjects/GenericStack.cs
+++ b/src/GraphicObjects/GenericStack.cs
@@ -175,7 +175,7 @@ namespace Crow
 							stretchedGO.Slot.Height = newH;
 							stretchedGO.bmp = null;
 #if DEBUG_LAYOUTING
-					Debug.WriteLine ("\tAdjusting Width of " + stretchedGO.ToString());
+					Debug.WriteLine ("\tAdjusting Height of " + stretchedGO.ToString());
 #endif
 							stretchedGO.LayoutChanged -= OnChildLayoutChanges;
 							stretchedGO.OnLayoutChanges (LayoutingType.Height);
diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs
index 925f69df..f8d307ea 100644
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/GraphicObject.cs
@@ -512,6 +512,7 @@ namespace Crow
 		}
 		#endregion
 
+		#region Default and Style Values loading
 		/// <summary> Loads the default values from XML attributes default </summary>
 		public void loadDefaultValues()
 		{
@@ -664,7 +665,7 @@ namespace Crow
 			}
 			return true;
 		}
-
+		#endregion
 
 		public virtual GraphicObject FindByName(string nameToFind){
 			return string.Equals(nameToFind, _name, StringComparison.Ordinal) ? this : null;
@@ -988,6 +989,10 @@ namespace Crow
 			if (!Visible)
 				return;
 
+			//TODO:this test should not be necessary
+			if (Slot.Height < 0 || Slot.Width < 0)
+				return;
+
 			LastPaintedSlot = Slot;
 			#if DEBUG_LAYOUTING
 			if (CurrentDrawLQIs != null){
diff --git a/src/GraphicObjects/ScrollBar.cs b/src/GraphicObjects/ScrollBar.cs
index ea75d6d1..017b50ac 100644
--- a/src/GraphicObjects/ScrollBar.cs
+++ b/src/GraphicObjects/ScrollBar.cs
@@ -14,11 +14,6 @@ namespace Crow
 		public ScrollBar() : base()	{}
 		#endregion
 
-		[XmlAttributeAttribute()][DefaultValue(0.0)]
-		public override double Maximum {
-			get { return base.Maximum; }
-			set { base.Maximum = value; }
-		}
 		[XmlAttributeAttribute()][DefaultValue(Orientation.Vertical)]
 		public virtual Orientation Orientation
 		{
diff --git a/src/GraphicObjects/Splitter.cs b/src/GraphicObjects/Splitter.cs
index f3321065..1a1558af 100644
--- a/src/GraphicObjects/Splitter.cs
+++ b/src/GraphicObjects/Splitter.cs
@@ -78,30 +78,40 @@ namespace Crow
 				return;
 
 			GenericStack gs = Parent as GenericStack;
-			int ptrThis = gs.Children.IndexOf (this);
+			int ptrSplit = gs.Children.IndexOf (this);
+
+			if (ptrSplit == 0 || ptrSplit == gs.Children.Count - 1)
+				return;
 
 			if (gs.Orientation == Orientation.Horizontal) {
-				if (ptrThis >= 0){
-					if (!gs.Children [ptrThis - 1].Width.IsFixed)
-						gs.Children [ptrThis - 1].Width = gs.Children [ptrThis - 1].Slot.Width;
-					gs.Children [ptrThis - 1].Width = Math.Max(gs.Children [ptrThis - 1].Width + e.XDelta, 1);
-				}
-				if (ptrThis < gs.Children.Count - 1){
-					if (!gs.Children [ptrThis + 1].Width.IsFixed)
-						gs.Children [ptrThis + 1].Width = gs.Children [ptrThis + 1].Slot.Width;					
-					gs.Children [ptrThis + 1].Width = Math.Max(gs.Children [ptrThis + 1].Width - e.XDelta, 1);
-				}
+				if ((gs.Children [ptrSplit - 1].Width + e.XDelta <
+					gs.Children [ptrSplit - 1].MinimumSize.Width) ||
+					(gs.Children [ptrSplit + 1].Width - e.XDelta <
+						gs.Children [ptrSplit + 1].MinimumSize.Width))
+					return;
+				
+				if (!gs.Children [ptrSplit - 1].Width.IsFixed)
+					gs.Children [ptrSplit - 1].Width = gs.Children [ptrSplit - 1].Slot.Width;					
+				if (!gs.Children [ptrSplit + 1].Width.IsFixed)
+					gs.Children [ptrSplit + 1].Width = gs.Children [ptrSplit + 1].Slot.Width;
+				
+				gs.Children [ptrSplit - 1].Width = gs.Children [ptrSplit - 1].Width + e.XDelta;
+				gs.Children [ptrSplit + 1].Width = gs.Children [ptrSplit + 1].Width - e.XDelta;
+
 			} else {
-				if (ptrThis >= 0) {
-					if (!gs.Children [ptrThis - 1].Height.IsFixed)
-						gs.Children [ptrThis - 1].Height = gs.Children [ptrThis - 1].Slot.Height;
-					gs.Children [ptrThis - 1].Height = Math.Max (gs.Children [ptrThis - 1].Height + e.YDelta, 1);
-				}
-				if (ptrThis < gs.Children.Count - 1) {
-					if (!gs.Children [ptrThis + 1].Height.IsFixed)
-						gs.Children [ptrThis + 1].Height = gs.Children [ptrThis + 1].Slot.Height;
-					gs.Children [ptrThis + 1].Height = Math.Max (gs.Children [ptrThis + 1].Height - e.YDelta, 1);
-				}
+				if ((gs.Children [ptrSplit - 1].Height + e.YDelta <
+					gs.Children [ptrSplit - 1].MinimumSize.Height) ||
+					(gs.Children [ptrSplit + 1].Height - e.YDelta <
+						gs.Children [ptrSplit + 1].MinimumSize.Height))
+					return;
+				
+				if (!gs.Children [ptrSplit - 1].Height.IsFixed)
+					gs.Children [ptrSplit - 1].Height = gs.Children [ptrSplit - 1].Slot.Height;
+				if (!gs.Children [ptrSplit + 1].Height.IsFixed)
+					gs.Children [ptrSplit + 1].Height = gs.Children [ptrSplit + 1].Slot.Height;
+				
+				gs.Children [ptrSplit - 1].Height = gs.Children [ptrSplit - 1].Height + e.YDelta;
+				gs.Children [ptrSplit + 1].Height = gs.Children [ptrSplit + 1].Height - e.YDelta;
 			}
 		}
 		public override bool UpdateLayout (LayoutingType layoutType)
diff --git a/src/Instantiator.cs b/src/Instantiator.cs
index e79988fb..fc3595f4 100644
--- a/src/Instantiator.cs
+++ b/src/Instantiator.cs
@@ -22,6 +22,7 @@ using System;
 using System.Threading;
 using System.IO;
 using System.Text;
+using System.Diagnostics;
 
 namespace Crow
 {
@@ -76,7 +77,7 @@ namespace Crow
 			#if DEBUG_LOAD
 			loadingTime.Stop ();
 			Debug.WriteLine ("IML Instantiator creation '{2}' : {0} ticks, {1} ms",
-			loadingTime.ElapsedTicks, loadingTime.ElapsedMilliseconds, path);
+				loadingTime.ElapsedTicks, loadingTime.ElapsedMilliseconds, imlPath);
 			#endif
 		}
 		public Instantiator (Type _root, Interface.LoaderInvoker _loader)