From: jpbruyere <jp.bruyere@hotmail.com>
Date: Sat, 6 Feb 2016 08:03:15 +0000 (+0100)
Subject: rename LayoutChangeEventArgs=>LayoutingEventArgs
X-Git-Tag: 0.3~42^2~11
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=95e936cad1d7e5e666c633d8ba132b0d54fdf3b5;p=jp%2Fcrow.git

rename LayoutChangeEventArgs=>LayoutingEventArgs
---

diff --git a/Crow.csproj b/Crow.csproj
index a3dbc710..851f75e1 100644
--- a/Crow.csproj
+++ b/Crow.csproj
@@ -46,7 +46,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>TRACE;DEBUG;__linux__;MEASURE_TIME;DEBUG_LOAD_TIME0;DEBUG_LAYOUTING0;DEBUG_BINDING0;DEBUG_CLIP_RECTANGLE0</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;__linux__;MEASURE_TIME;DEBUG_LOAD_TIME0;DEBUG_LAYOUTING;DEBUG_BINDING0;DEBUG_CLIP_RECTANGLE0</DefineConstants>
   </PropertyGroup>
   <!--  <PropertyGroup Condition=" '$(Platform)' == 'Linux_x86' ">
     <DefineConstants>__linux__</DefineConstants>
@@ -116,7 +116,6 @@
     <Compile Include="src\GraphicObjects\TemplatedContainer.cs" />
     <Compile Include="src\GraphicObjects\Popper.cs" />
     <Compile Include="src\TextChangeEventArgs.cs" />
-    <Compile Include="src\LayoutChangeEventArgs.cs" />
     <Compile Include="src\ReflexionExtensions.cs" />
     <Compile Include="src\XCursor.cs" />
     <Compile Include="src\GraphicObjects\Grid.cs" />
@@ -133,6 +132,7 @@
     <Compile Include="src\SolidColor.cs" />
     <Compile Include="src\Gradient.cs" />
     <Compile Include="src\Fill\Fill.cs" />
+    <Compile Include="src\LayoutingEventArgs.cs" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/src/GraphicObjects/ComboBox.cs b/src/GraphicObjects/ComboBox.cs
index ed979d75..181131b4 100644
--- a/src/GraphicObjects/ComboBox.cs
+++ b/src/GraphicObjects/ComboBox.cs
@@ -281,7 +281,7 @@ namespace Crow
 		{
 			IsPopped = false;
 		}
-		void _overlay_LayoutChanged (object sender, LayoutChangeEventArgs e)
+		void _overlay_LayoutChanged (object sender, LayoutingEventArgs e)
 		{
 			ILayoutable tc = Overlay.Parent as ILayoutable;
 			if (tc == null)
diff --git a/src/GraphicObjects/GenericStack.cs b/src/GraphicObjects/GenericStack.cs
index 7bdb3b56..5a83be72 100644
--- a/src/GraphicObjects/GenericStack.cs
+++ b/src/GraphicObjects/GenericStack.cs
@@ -181,7 +181,7 @@ namespace Crow
 			}else if (layoutType == LayoutingType.Height)
 				this.RegisterForLayouting (LayoutingType.PositionChildren);
 		}
-		public override void OnChildLayoutChanges (object sender, LayoutChangeEventArgs arg)
+		public override void OnChildLayoutChanges (object sender, LayoutingEventArgs arg)
 		{
 			base.OnChildLayoutChanges (sender, arg);
 
diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs
index 19002a5d..7927ccbe 100644
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/GraphicObject.cs
@@ -174,7 +174,7 @@ namespace Crow
 		public event EventHandler<KeyboardKeyEventArgs> KeyUp;
 		public event EventHandler Focused;
 		public event EventHandler Unfocused;
-		public event EventHandler<LayoutChangeEventArgs> LayoutChanged;
+		public event EventHandler<LayoutingEventArgs> LayoutChanged;
 		#endregion
 
 		#region public properties
@@ -523,7 +523,7 @@ namespace Crow
 			if (Parent == null)
 				return;
 			#if DEBUG_LAYOUTING
-			Debug.WriteLine ("RegisterForLayouting => {1}->{0}", layoutType, this.ToString());
+			Debug.WriteLine ("RegisterForLayouting => {1}->{0}", RegisteredLayoutings.ToString(), this.ToString());
 			#endif
 
 			//deleteLQI (RegisteredLayoutings);
@@ -580,7 +580,7 @@ namespace Crow
 					this.RegisterForLayouting (LayoutingType.Y);
 				break;
 			}
-			LayoutChanged.Raise (this, new LayoutChangeEventArgs (layoutType));
+			LayoutChanged.Raise (this, new LayoutingEventArgs (layoutType));
 		}
 		/// <summary> Update layout component, this is where the computation of alignement
 		/// and size take place </summary>
diff --git a/src/GraphicObjects/Group.cs b/src/GraphicObjects/Group.cs
index e8632fea..457187c6 100644
--- a/src/GraphicObjects/Group.cs
+++ b/src/GraphicObjects/Group.cs
@@ -162,7 +162,7 @@ namespace Crow
 				break;
 			}
 		}
-		public virtual void OnChildLayoutChanges (object sender, LayoutChangeEventArgs arg)
+		public virtual void OnChildLayoutChanges (object sender, LayoutingEventArgs arg)
 		{
 			GraphicObject g = sender as GraphicObject;
 			switch (arg.LayoutType) {
diff --git a/src/GraphicObjects/Popper.cs b/src/GraphicObjects/Popper.cs
index d213fd6d..528022e7 100644
--- a/src/GraphicObjects/Popper.cs
+++ b/src/GraphicObjects/Popper.cs
@@ -60,7 +60,7 @@ namespace Crow
 			IsPopped = false;
 		}
 
-		void _content_LayoutChanged (object sender, LayoutChangeEventArgs e)
+		void _content_LayoutChanged (object sender, LayoutingEventArgs e)
 		{
 			ILayoutable tc = Content.Parent as ILayoutable;
 			if (tc == null)
@@ -166,7 +166,7 @@ namespace Crow
 				if (Content.Parent == null)
 					tc.AddWidget (Content);
 				tc.PutOnTop (Content);
-				_content_LayoutChanged (this, new LayoutChangeEventArgs (LayoutingType.Sizing));
+				_content_LayoutChanged (this, new LayoutingEventArgs (LayoutingType.Sizing));
 			}
 			Pop.Raise (this, e);
 		}
diff --git a/src/GraphicObjects/PrivateContainer.cs b/src/GraphicObjects/PrivateContainer.cs
index b7651d76..15d3ce06 100644
--- a/src/GraphicObjects/PrivateContainer.cs
+++ b/src/GraphicObjects/PrivateContainer.cs
@@ -119,7 +119,7 @@ namespace Crow
 				break;
 			}							
 		}
-		public virtual void OnChildLayoutChanges (object sender, LayoutChangeEventArgs arg)
+		public virtual void OnChildLayoutChanges (object sender, LayoutingEventArgs arg)
 		{
 			GraphicObject g = sender as GraphicObject;
 			switch (arg.LayoutType) {
diff --git a/src/GraphicObjects/Scroller.cs b/src/GraphicObjects/Scroller.cs
index b2a09db5..5188baf8 100644
--- a/src/GraphicObjects/Scroller.cs
+++ b/src/GraphicObjects/Scroller.cs
@@ -100,7 +100,7 @@ namespace Crow
             : base(){}
 
 		#region GraphicObject Overrides
-		void OnChildLayoutChanges (object sender, LayoutChangeEventArgs arg)
+		void OnChildLayoutChanges (object sender, LayoutingEventArgs arg)
 		{
 			int maxScroll = MaximumScroll;
 			if (_verticalScrolling) {
diff --git a/src/LayoutChangeEventArgs.cs b/src/LayoutChangeEventArgs.cs
deleted file mode 100644
index 35ef9c5c..00000000
--- a/src/LayoutChangeEventArgs.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-
-namespace Crow
-{
-	public class LayoutChangeEventArgs: EventArgs
-	{
-		public LayoutingType  LayoutType;
-
-		public LayoutChangeEventArgs (LayoutingType  _layoutType) : base()
-		{
-			LayoutType = _layoutType;
-		}
-	}
-}
-
diff --git a/src/LayoutingEventArgs.cs b/src/LayoutingEventArgs.cs
new file mode 100644
index 00000000..c212a96f
--- /dev/null
+++ b/src/LayoutingEventArgs.cs
@@ -0,0 +1,15 @@
+using System;
+
+namespace Crow
+{
+	public class LayoutingEventArgs: EventArgs
+	{
+		public LayoutingType  LayoutType;
+
+		public LayoutingEventArgs (LayoutingType  _layoutType) : base()
+		{
+			LayoutType = _layoutType;
+		}
+	}
+}
+