split graphic objects dirRearangeDirs

40 files changed, 67 insertions, 57 deletions

diff --git a/Crow.csproj b/Crow.csproj
index 20b38cf8..0b6f22f4 100644
--- a/Crow.csproj
+++ b/Crow.csproj
@@ -44,60 +44,30 @@
     <Compile Include="src\Rectangle.cs" />
     <Compile Include="src\Rectangles.cs" />
     <Compile Include="src\Size.cs" />
-    <Compile Include="src\GraphicObjects\GraphicObject.cs" />
-    <Compile Include="src\GraphicObjects\Container.cs" />
-    <Compile Include="src\GraphicObjects\Group.cs" />
-    <Compile Include="src\GraphicObjects\HorizontalStack.cs" />
-    <Compile Include="src\GraphicObjects\Image.cs" />
-    <Compile Include="src\GraphicObjects\Label.cs" />
-    <Compile Include="src\GraphicObjects\TextBox.cs" />
-    <Compile Include="src\GraphicObjects\ProgressBar.cs" />
-    <Compile Include="src\GraphicObjects\VerticalStack.cs" />
     <Compile Include="src\Cairo\CairoHelpers.cs" />
     <Compile Include="src\win32\Win32.cs" />
     <Compile Include="src\win32\winApi.cs" />
-    <Compile Include="src\GraphicObjects\Button.cs" />
     <Compile Include="src\GraphicObjects\GraduatedSlider.cs" />
-    <Compile Include="src\GraphicObjects\Slider.cs" />
-    <Compile Include="src\GraphicObjects\NumericControl.cs" />
-    <Compile Include="src\GraphicObjects\Scroller.cs" />
     <Compile Include="src\GraphicObjects\ILayoutable.cs" />
     <Compile Include="src\Enums.cs" />
-    <Compile Include="src\GraphicObjects\GenericStack.cs" />
     <Compile Include="src\CompilerServices\CompilerServices.cs" />
     <Compile Include="src\GraphicObjects\AnalogMeter.cs" />
-    <Compile Include="src\GraphicObjects\Border.cs" />
     <Compile Include="src\Font.cs" />
-    <Compile Include="src\GraphicObjects\Window.cs" />
-    <Compile Include="src\GraphicObjects\ListBox.cs" />
     <Compile Include="src\ExtensionsMethods.cs" />
     <Compile Include="src\Interface.cs" />
     <Compile Include="src\LayoutingQueueItem.cs" />
-    <Compile Include="src\GraphicObjects\Spinner.cs" />
     <Compile Include="src\DynAttribute.cs" />
     <Compile Include="src\GraphicObjects\IValueChange.cs" />
     <Compile Include="src\Picture.cs" />
     <Compile Include="src\SvgPicture.cs" />
     <Compile Include="src\BmpPicture.cs" />
-    <Compile Include="src\GraphicObjects\TemplatedControl.cs" />
-    <Compile Include="src\GraphicObjects\RadioButton.cs" />
-    <Compile Include="src\GraphicObjects\Expandable.cs" />
-    <Compile Include="src\GraphicObjects\PrivateContainer.cs" />
-    <Compile Include="src\GraphicObjects\TemplatedContainer.cs" />
-    <Compile Include="src\GraphicObjects\Popper.cs" />
     <Compile Include="src\TextChangeEventArgs.cs" />
     <Compile Include="src\ReflexionExtensions.cs" />
     <Compile Include="src\XCursor.cs" />
     <Compile Include="src\GraphicObjects\Grid.cs" />
-    <Compile Include="src\GraphicObjects\TextRun.cs" />
-    <Compile Include="src\GraphicObjects\MessageBox.cs" />
     <Compile Include="src\SelectionChangeEventArgs.cs" />
     <Compile Include="src\ValueChangeEventArgs.cs" />
     <Compile Include="src\GraphicObjects\FileDialog.cs" />
-    <Compile Include="src\GraphicObjects\CheckBox.cs" />
-    <Compile Include="src\GraphicObjects\ComboBox.cs" />
-    <Compile Include="src\GraphicObjects\GroupBox.cs" />
-    <Compile Include="src\GraphicObjects\ScrollBar.cs" />
     <Compile Include="src\BubblingMouseButtonEventArgs.cs" />
     <Compile Include="src\SolidColor.cs" />
     <Compile Include="src\Gradient.cs" />
@@ -105,10 +75,6 @@
     <Compile Include="src\LayoutingEventArgs.cs" />
     <Compile Include="src\ScrollingEventArgs.cs" />
     <Compile Include="src\GraphicObjects\Trend.cs" />
-    <Compile Include="src\GraphicObjects\Splitter.cs" />
-    <Compile Include="src\GraphicObjects\TreeView.cs" />
-    <Compile Include="src\GraphicObjects\TabView.cs" />
-    <Compile Include="src\GraphicObjects\TabItem.cs" />
     <Compile Include="src\GraphicObjects\DummyTemplate.cs" />
     <Compile Include="src\Input\KeyboardKeyEventArgs.cs" />
     <Compile Include="src\Input\Buttons.cs" />
@@ -133,10 +99,6 @@
     <Compile Include="src\Instantiator.cs" />
     <Compile Include="src\ItemTemplate.cs" />
     <Compile Include="src\Style.cs" />
-    <Compile Include="src\GraphicObjects\Wrapper.cs" />
-    <Compile Include="src\GraphicObjects\TemplatedGroup.cs" />
-    <Compile Include="src\GraphicObjects\MenuItem.cs" />
-    <Compile Include="src\GraphicObjects\Menu.cs" />
     <Compile Include="src\Command.cs" />
     <Compile Include="src\GraphicObjects\DataSourceChangeEventArgs.cs" />
     <Compile Include="src\IML\Context.cs" />
@@ -154,6 +116,44 @@
     <Compile Include="src\PerformanceMeasure.cs" />
     <Compile Include="src\IML\BindingMember.cs" />
     <Compile Include="src\CrowThread.cs" />
+    <Compile Include="src\GraphicObjects\Base\Border.cs" />
+    <Compile Include="src\GraphicObjects\Base\Button.cs" />
+    <Compile Include="src\GraphicObjects\Base\CheckBox.cs" />
+    <Compile Include="src\GraphicObjects\Base\ComboBox.cs" />
+    <Compile Include="src\GraphicObjects\Base\Container.cs" />
+    <Compile Include="src\GraphicObjects\Base\Expandable.cs" />
+    <Compile Include="src\GraphicObjects\Base\GenericStack.cs" />
+    <Compile Include="src\GraphicObjects\Base\GraphicObject.cs" />
+    <Compile Include="src\GraphicObjects\Base\Group.cs" />
+    <Compile Include="src\GraphicObjects\Base\GroupBox.cs" />
+    <Compile Include="src\GraphicObjects\Base\HorizontalStack.cs" />
+    <Compile Include="src\GraphicObjects\Base\Image.cs" />
+    <Compile Include="src\GraphicObjects\Base\Label.cs" />
+    <Compile Include="src\GraphicObjects\Base\ListBox.cs" />
+    <Compile Include="src\GraphicObjects\Base\Menu.cs" />
+    <Compile Include="src\GraphicObjects\Base\MenuItem.cs" />
+    <Compile Include="src\GraphicObjects\Base\MessageBox.cs" />
+    <Compile Include="src\GraphicObjects\Base\NumericControl.cs" />
+    <Compile Include="src\GraphicObjects\Base\Popper.cs" />
+    <Compile Include="src\GraphicObjects\Base\PrivateContainer.cs" />
+    <Compile Include="src\GraphicObjects\Base\ProgressBar.cs" />
+    <Compile Include="src\GraphicObjects\Base\RadioButton.cs" />
+    <Compile Include="src\GraphicObjects\Base\ScrollBar.cs" />
+    <Compile Include="src\GraphicObjects\Base\Scroller.cs" />
+    <Compile Include="src\GraphicObjects\Base\Slider.cs" />
+    <Compile Include="src\GraphicObjects\Base\Spinner.cs" />
+    <Compile Include="src\GraphicObjects\Base\Splitter.cs" />
+    <Compile Include="src\GraphicObjects\Base\Wrapper.cs" />
+    <Compile Include="src\GraphicObjects\Base\Window.cs" />
+    <Compile Include="src\GraphicObjects\Base\VerticalStack.cs" />
+    <Compile Include="src\GraphicObjects\Base\TreeView.cs" />
+    <Compile Include="src\GraphicObjects\Base\TextBox.cs" />
+    <Compile Include="src\GraphicObjects\Base\TextRun.cs" />
+    <Compile Include="src\GraphicObjects\Base\TabItem.cs" />
+    <Compile Include="src\GraphicObjects\Base\TabView.cs" />
+    <Compile Include="src\GraphicObjects\Base\TemplatedContainer.cs" />
+    <Compile Include="src\GraphicObjects\Base\TemplatedControl.cs" />
+    <Compile Include="src\GraphicObjects\Base\TemplatedGroup.cs" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -186,6 +186,7 @@
     <Folder Include="src\rsvg\" />
     <Folder Include="src\IML\" />
     <Folder Include="Icons\" />
+    <Folder Include="src\GraphicObjects\Base\" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Images\Icons\updown.svg" />
diff --git a/src/GraphicObjects/Border.cs b/src/GraphicObjects/Base/Border.cs
index 672d5ab8..672d5ab8 100644
--- a/src/GraphicObjects/Border.cs
+++ b/src/GraphicObjects/Base/Border.cs
diff --git a/src/GraphicObjects/Button.cs b/src/GraphicObjects/Base/Button.cs
index 75f43014..75f43014 100644
--- a/src/GraphicObjects/Button.cs
+++ b/src/GraphicObjects/Base/Button.cs
diff --git a/src/GraphicObjects/CheckBox.cs b/src/GraphicObjects/Base/CheckBox.cs
index 0a40d269..0a40d269 100644
--- a/src/GraphicObjects/CheckBox.cs
+++ b/src/GraphicObjects/Base/CheckBox.cs
diff --git a/src/GraphicObjects/ComboBox.cs b/src/GraphicObjects/Base/ComboBox.cs
index 15b49dbe..15b49dbe 100644
--- a/src/GraphicObjects/ComboBox.cs
+++ b/src/GraphicObjects/Base/ComboBox.cs
diff --git a/src/GraphicObjects/Container.cs b/src/GraphicObjects/Base/Container.cs
index aac35946..aac35946 100644
--- a/src/GraphicObjects/Container.cs
+++ b/src/GraphicObjects/Base/Container.cs
diff --git a/src/GraphicObjects/Expandable.cs b/src/GraphicObjects/Base/Expandable.cs
index 1cb36450..1cb36450 100644
--- a/src/GraphicObjects/Expandable.cs
+++ b/src/GraphicObjects/Base/Expandable.cs
diff --git a/src/GraphicObjects/GenericStack.cs b/src/GraphicObjects/Base/GenericStack.cs
index cecdaffd..cecdaffd 100644
--- a/src/GraphicObjects/GenericStack.cs
+++ b/src/GraphicObjects/Base/GenericStack.cs
diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/Base/GraphicObject.cs
index 2afbe336..2afbe336 100644
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/Base/GraphicObject.cs
diff --git a/src/GraphicObjects/Group.cs b/src/GraphicObjects/Base/Group.cs
index d00449cb..d00449cb 100644
--- a/src/GraphicObjects/Group.cs
+++ b/src/GraphicObjects/Base/Group.cs
diff --git a/src/GraphicObjects/GroupBox.cs b/src/GraphicObjects/Base/GroupBox.cs
index 9cabbb51..9cabbb51 100644
--- a/src/GraphicObjects/GroupBox.cs
+++ b/src/GraphicObjects/Base/GroupBox.cs
diff --git a/src/GraphicObjects/HorizontalStack.cs b/src/GraphicObjects/Base/HorizontalStack.cs
index 620dab22..620dab22 100644
--- a/src/GraphicObjects/HorizontalStack.cs
+++ b/src/GraphicObjects/Base/HorizontalStack.cs
diff --git a/src/GraphicObjects/Image.cs b/src/GraphicObjects/Base/Image.cs
index 6a4c590d..6a4c590d 100644
--- a/src/GraphicObjects/Image.cs
+++ b/src/GraphicObjects/Base/Image.cs
diff --git a/src/GraphicObjects/Label.cs b/src/GraphicObjects/Base/Label.cs
index 64ee9688..64ee9688 100644
--- a/src/GraphicObjects/Label.cs
+++ b/src/GraphicObjects/Base/Label.cs
diff --git a/src/GraphicObjects/ListBox.cs b/src/GraphicObjects/Base/ListBox.cs
index f66edf61..f66edf61 100644
--- a/src/GraphicObjects/ListBox.cs
+++ b/src/GraphicObjects/Base/ListBox.cs
diff --git a/src/GraphicObjects/Menu.cs b/src/GraphicObjects/Base/Menu.cs
index 50494815..50494815 100644
--- a/src/GraphicObjects/Menu.cs
+++ b/src/GraphicObjects/Base/Menu.cs
diff --git a/src/GraphicObjects/MenuItem.cs b/src/GraphicObjects/Base/MenuItem.cs
index 0d99a2eb..0d99a2eb 100644
--- a/src/GraphicObjects/MenuItem.cs
+++ b/src/GraphicObjects/Base/MenuItem.cs
diff --git a/src/GraphicObjects/MessageBox.cs b/src/GraphicObjects/Base/MessageBox.cs
index d8ce1dae..d8ce1dae 100644
--- a/src/GraphicObjects/MessageBox.cs
+++ b/src/GraphicObjects/Base/MessageBox.cs
diff --git a/src/GraphicObjects/NumericControl.cs b/src/GraphicObjects/Base/NumericControl.cs
index 9b511831..9b511831 100644
--- a/src/GraphicObjects/NumericControl.cs
+++ b/src/GraphicObjects/Base/NumericControl.cs
diff --git a/src/GraphicObjects/Popper.cs b/src/GraphicObjects/Base/Popper.cs
index d3f2e7c8..d3f2e7c8 100644
--- a/src/GraphicObjects/Popper.cs
+++ b/src/GraphicObjects/Base/Popper.cs
diff --git a/src/GraphicObjects/PrivateContainer.cs b/src/GraphicObjects/Base/PrivateContainer.cs
index 65eacabb..65eacabb 100644
--- a/src/GraphicObjects/PrivateContainer.cs
+++ b/src/GraphicObjects/Base/PrivateContainer.cs
diff --git a/src/GraphicObjects/ProgressBar.cs b/src/GraphicObjects/Base/ProgressBar.cs
index 34366ca7..34366ca7 100644
--- a/src/GraphicObjects/ProgressBar.cs
+++ b/src/GraphicObjects/Base/ProgressBar.cs
diff --git a/src/GraphicObjects/RadioButton.cs b/src/GraphicObjects/Base/RadioButton.cs
index 993ead59..993ead59 100644
--- a/src/GraphicObjects/RadioButton.cs
+++ b/src/GraphicObjects/Base/RadioButton.cs
diff --git a/src/GraphicObjects/ScrollBar.cs b/src/GraphicObjects/Base/ScrollBar.cs
index 91ce50ef..91ce50ef 100644
--- a/src/GraphicObjects/ScrollBar.cs
+++ b/src/GraphicObjects/Base/ScrollBar.cs
diff --git a/src/GraphicObjects/Scroller.cs b/src/GraphicObjects/Base/Scroller.cs
index 640fcfe8..640fcfe8 100644
--- a/src/GraphicObjects/Scroller.cs
+++ b/src/GraphicObjects/Base/Scroller.cs
diff --git a/src/GraphicObjects/Slider.cs b/src/GraphicObjects/Base/Slider.cs
index 36f7e731..36f7e731 100644
--- a/src/GraphicObjects/Slider.cs
+++ b/src/GraphicObjects/Base/Slider.cs
diff --git a/src/GraphicObjects/Spinner.cs b/src/GraphicObjects/Base/Spinner.cs
index 1bf93a37..1bf93a37 100644
--- a/src/GraphicObjects/Spinner.cs
+++ b/src/GraphicObjects/Base/Spinner.cs
diff --git a/src/GraphicObjects/Splitter.cs b/src/GraphicObjects/Base/Splitter.cs
index 2f5dd15b..2f5dd15b 100644
--- a/src/GraphicObjects/Splitter.cs
+++ b/src/GraphicObjects/Base/Splitter.cs
diff --git a/src/GraphicObjects/TabItem.cs b/src/GraphicObjects/Base/TabItem.cs
index 7dac5472..7dac5472 100644
--- a/src/GraphicObjects/TabItem.cs
+++ b/src/GraphicObjects/Base/TabItem.cs
diff --git a/src/GraphicObjects/TabView.cs b/src/GraphicObjects/Base/TabView.cs
index ecf38f10..ecf38f10 100644
--- a/src/GraphicObjects/TabView.cs
+++ b/src/GraphicObjects/Base/TabView.cs
diff --git a/src/GraphicObjects/TemplatedContainer.cs b/src/GraphicObjects/Base/TemplatedContainer.cs
index 1ab8cf7d..1ab8cf7d 100644
--- a/src/GraphicObjects/TemplatedContainer.cs
+++ b/src/GraphicObjects/Base/TemplatedContainer.cs
diff --git a/src/GraphicObjects/TemplatedControl.cs b/src/GraphicObjects/Base/TemplatedControl.cs
index 082d0426..082d0426 100644
--- a/src/GraphicObjects/TemplatedControl.cs
+++ b/src/GraphicObjects/Base/TemplatedControl.cs
diff --git a/src/GraphicObjects/TemplatedGroup.cs b/src/GraphicObjects/Base/TemplatedGroup.cs
index e4447168..e4447168 100644
--- a/src/GraphicObjects/TemplatedGroup.cs
+++ b/src/GraphicObjects/Base/TemplatedGroup.cs
diff --git a/src/GraphicObjects/TextBox.cs b/src/GraphicObjects/Base/TextBox.cs
index 0cbee9f8..0cbee9f8 100644
--- a/src/GraphicObjects/TextBox.cs
+++ b/src/GraphicObjects/Base/TextBox.cs
diff --git a/src/GraphicObjects/TextRun.cs b/src/GraphicObjects/Base/TextRun.cs
index a312ca1e..a312ca1e 100644
--- a/src/GraphicObjects/TextRun.cs
+++ b/src/GraphicObjects/Base/TextRun.cs
diff --git a/src/GraphicObjects/TreeView.cs b/src/GraphicObjects/Base/TreeView.cs
index 6549f148..6549f148 100644
--- a/src/GraphicObjects/TreeView.cs
+++ b/src/GraphicObjects/Base/TreeView.cs
diff --git a/src/GraphicObjects/VerticalStack.cs b/src/GraphicObjects/Base/VerticalStack.cs
index d5d0236b..d5d0236b 100644
--- a/src/GraphicObjects/VerticalStack.cs
+++ b/src/GraphicObjects/Base/VerticalStack.cs
diff --git a/src/GraphicObjects/Window.cs b/src/GraphicObjects/Base/Window.cs
index e2820528..e2820528 100644
--- a/src/GraphicObjects/Window.cs
+++ b/src/GraphicObjects/Base/Window.cs
diff --git a/src/GraphicObjects/Wrapper.cs b/src/GraphicObjects/Base/Wrapper.cs
index 8b282ebb..8b282ebb 100644
--- a/src/GraphicObjects/Wrapper.cs
+++ b/src/GraphicObjects/Base/Wrapper.cs
diff --git a/src/Size.cs b/src/Size.cs
index 47288b06..c73370e4 100644
--- a/src/Size.cs
+++ b/src/Size.cs
@@ -99,6 +99,18 @@ namespace Crow
             else
                 return false;
         }
+		public static bool operator <(Size s1, Size s2)
+		{
+			if (s1.Width < s2.Width)
+				if (s1.Height <= s2.Height)
+					return true;
+			else
+				return false;
+			else if (s1.Width == s2.Width && s1.Height < s2.Height)
+				return true;
+
+			return false;
+		}
         public static bool operator >=(Size s1, Size s2)
         {
             if (s1.Width >= s2.Width && s1.Height >= s2.Height)
@@ -106,18 +118,13 @@ namespace Crow
             else
                 return false;
         }
-        public static bool operator <(Size s1, Size s2)
-        {
-            if (s1.Width < s2.Width)
-                if (s1.Height <= s2.Height)
-                    return true;
-                else
-                    return false;
-            else if (s1.Width == s2.Width && s1.Height < s2.Height)
-                return true;
-
-            return false;
-        }
+		public static bool operator <=(Size s1, Size s2)
+		{
+			if (s1.Width <= s2.Width && s1.Height <= s2.Height)
+				return true;
+			else
+				return false;
+		}
 		public static bool operator <(Size s, int i)
 		{
 			return s.Width < i && s.Height < i ? true : false;
@@ -126,13 +133,15 @@ namespace Crow
 		{
 			return s.Width <= i && s.Height <= i ? true : false;
 		}
-        public static bool operator <=(Size s1, Size s2)
-        {
-            if (s1.Width <= s2.Width && s1.Height <= s2.Height)
-                return true;
-            else
-                return false;
-        }
+		public static bool operator >(Size s, int i)
+		{
+			return s.Width > i && s.Height > i ? true : false;
+		}
+		public static bool operator >=(Size s, int i)
+		{
+			return s.Width >= i && s.Height >= i ? true : false;
+		}
+
         public static bool operator ==(Size s, int i)
         {
             if (s.Width == i && s.Height == i)