rename LayoutChangeEventArgs=>LayoutingEventArgs

diff --git a/Crow.csproj b/Crow.csproj
index a3dbc710556d0bcbbed15931020a80db4f736435..851f75e124e221a79ca31d5d2bb8d37beb503dd9 100644 (file)
--- 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 ed979d75437b8482a5b31f1ef1e9c17e2b90b7d5..181131b4237c6630f5391564128d5244897b830f 100644 (file)
--- 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 7bdb3b56fc2f2fd49582d40d3bb0b785bf3badde..5a83be72c0c9da04ce198b0514d852bdb27bd089 100644 (file)
--- 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 19002a5d380c32d4add9267b5d3753e94c8128a3..7927ccbeb86243b2f5d4fad337b726b9c453fc2d 100644 (file)
--- 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 e8632feac1ac41c7020f64c378e1fc5117b310b1..457187c6a7ebecf45d814f098acfd66cf1b26e8e 100644 (file)
--- 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 d213fd6dad42f693f9e33d537940a6af19f5dee3..528022e74a6406a2fa8d22bba008ea03bb7208e8 100644 (file)
--- 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 b7651d766b64106d8feebe01a188612fc28f815d..15d3ce060661b4645a67c45d9dd5c9900c049bb5 100644 (file)
--- 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 b2a09db5a11f3f9e8f4cb2db9b1f25042b7f6fc1..5188baf88388367df2b282f80099b873ce0c702e 100644 (file)
--- 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 (file)
index 35ef9c5..0000000
--- 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 (file)
index 0000000..c212a96
--- /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;
+               }
+       }
+}
+