From 45f74150dd79db5a162034ab0c43e6abdb83beea Mon Sep 17 00:00:00 2001 From: jpbruyere Date: Wed, 15 Mar 2017 05:59:51 +0100 Subject: [PATCH] split graphic objects dir --- Crow.csproj | 77 ++++++++++--------- src/GraphicObjects/{ => Base}/Border.cs | 0 src/GraphicObjects/{ => Base}/Button.cs | 0 src/GraphicObjects/{ => Base}/CheckBox.cs | 0 src/GraphicObjects/{ => Base}/ComboBox.cs | 0 src/GraphicObjects/{ => Base}/Container.cs | 0 src/GraphicObjects/{ => Base}/Expandable.cs | 0 src/GraphicObjects/{ => Base}/GenericStack.cs | 0 .../{ => Base}/GraphicObject.cs | 0 src/GraphicObjects/{ => Base}/Group.cs | 0 src/GraphicObjects/{ => Base}/GroupBox.cs | 0 .../{ => Base}/HorizontalStack.cs | 0 src/GraphicObjects/{ => Base}/Image.cs | 0 src/GraphicObjects/{ => Base}/Label.cs | 0 src/GraphicObjects/{ => Base}/ListBox.cs | 0 src/GraphicObjects/{ => Base}/Menu.cs | 0 src/GraphicObjects/{ => Base}/MenuItem.cs | 0 src/GraphicObjects/{ => Base}/MessageBox.cs | 0 .../{ => Base}/NumericControl.cs | 0 src/GraphicObjects/{ => Base}/Popper.cs | 0 .../{ => Base}/PrivateContainer.cs | 0 src/GraphicObjects/{ => Base}/ProgressBar.cs | 0 src/GraphicObjects/{ => Base}/RadioButton.cs | 0 src/GraphicObjects/{ => Base}/ScrollBar.cs | 0 src/GraphicObjects/{ => Base}/Scroller.cs | 0 src/GraphicObjects/{ => Base}/Slider.cs | 0 src/GraphicObjects/{ => Base}/Spinner.cs | 0 src/GraphicObjects/{ => Base}/Splitter.cs | 0 src/GraphicObjects/{ => Base}/TabItem.cs | 0 src/GraphicObjects/{ => Base}/TabView.cs | 0 .../{ => Base}/TemplatedContainer.cs | 0 .../{ => Base}/TemplatedControl.cs | 0 .../{ => Base}/TemplatedGroup.cs | 0 src/GraphicObjects/{ => Base}/TextBox.cs | 0 src/GraphicObjects/{ => Base}/TextRun.cs | 0 src/GraphicObjects/{ => Base}/TreeView.cs | 0 .../{ => Base}/VerticalStack.cs | 0 src/GraphicObjects/{ => Base}/Window.cs | 0 src/GraphicObjects/{ => Base}/Wrapper.cs | 0 src/Size.cs | 47 ++++++----- 40 files changed, 67 insertions(+), 57 deletions(-) rename src/GraphicObjects/{ => Base}/Border.cs (100%) rename src/GraphicObjects/{ => Base}/Button.cs (100%) rename src/GraphicObjects/{ => Base}/CheckBox.cs (100%) rename src/GraphicObjects/{ => Base}/ComboBox.cs (100%) rename src/GraphicObjects/{ => Base}/Container.cs (100%) rename src/GraphicObjects/{ => Base}/Expandable.cs (100%) rename src/GraphicObjects/{ => Base}/GenericStack.cs (100%) rename src/GraphicObjects/{ => Base}/GraphicObject.cs (100%) rename src/GraphicObjects/{ => Base}/Group.cs (100%) rename src/GraphicObjects/{ => Base}/GroupBox.cs (100%) rename src/GraphicObjects/{ => Base}/HorizontalStack.cs (100%) rename src/GraphicObjects/{ => Base}/Image.cs (100%) rename src/GraphicObjects/{ => Base}/Label.cs (100%) rename src/GraphicObjects/{ => Base}/ListBox.cs (100%) rename src/GraphicObjects/{ => Base}/Menu.cs (100%) rename src/GraphicObjects/{ => Base}/MenuItem.cs (100%) rename src/GraphicObjects/{ => Base}/MessageBox.cs (100%) rename src/GraphicObjects/{ => Base}/NumericControl.cs (100%) rename src/GraphicObjects/{ => Base}/Popper.cs (100%) rename src/GraphicObjects/{ => Base}/PrivateContainer.cs (100%) rename src/GraphicObjects/{ => Base}/ProgressBar.cs (100%) rename src/GraphicObjects/{ => Base}/RadioButton.cs (100%) rename src/GraphicObjects/{ => Base}/ScrollBar.cs (100%) rename src/GraphicObjects/{ => Base}/Scroller.cs (100%) rename src/GraphicObjects/{ => Base}/Slider.cs (100%) rename src/GraphicObjects/{ => Base}/Spinner.cs (100%) rename src/GraphicObjects/{ => Base}/Splitter.cs (100%) rename src/GraphicObjects/{ => Base}/TabItem.cs (100%) rename src/GraphicObjects/{ => Base}/TabView.cs (100%) rename src/GraphicObjects/{ => Base}/TemplatedContainer.cs (100%) rename src/GraphicObjects/{ => Base}/TemplatedControl.cs (100%) rename src/GraphicObjects/{ => Base}/TemplatedGroup.cs (100%) rename src/GraphicObjects/{ => Base}/TextBox.cs (100%) rename src/GraphicObjects/{ => Base}/TextRun.cs (100%) rename src/GraphicObjects/{ => Base}/TreeView.cs (100%) rename src/GraphicObjects/{ => Base}/VerticalStack.cs (100%) rename src/GraphicObjects/{ => Base}/Window.cs (100%) rename src/GraphicObjects/{ => Base}/Wrapper.cs (100%) diff --git a/Crow.csproj b/Crow.csproj index 20b38cf8..0b6f22f4 100644 --- a/Crow.csproj +++ b/Crow.csproj @@ -44,60 +44,30 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -105,10 +75,6 @@ - - - - @@ -133,10 +99,6 @@ - - - - @@ -154,6 +116,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -186,6 +186,7 @@ + diff --git a/src/GraphicObjects/Border.cs b/src/GraphicObjects/Base/Border.cs similarity index 100% rename from src/GraphicObjects/Border.cs rename to src/GraphicObjects/Base/Border.cs diff --git a/src/GraphicObjects/Button.cs b/src/GraphicObjects/Base/Button.cs similarity index 100% rename from src/GraphicObjects/Button.cs rename to src/GraphicObjects/Base/Button.cs diff --git a/src/GraphicObjects/CheckBox.cs b/src/GraphicObjects/Base/CheckBox.cs similarity index 100% rename from src/GraphicObjects/CheckBox.cs rename to src/GraphicObjects/Base/CheckBox.cs diff --git a/src/GraphicObjects/ComboBox.cs b/src/GraphicObjects/Base/ComboBox.cs similarity index 100% rename from src/GraphicObjects/ComboBox.cs rename to src/GraphicObjects/Base/ComboBox.cs diff --git a/src/GraphicObjects/Container.cs b/src/GraphicObjects/Base/Container.cs similarity index 100% rename from src/GraphicObjects/Container.cs rename to src/GraphicObjects/Base/Container.cs diff --git a/src/GraphicObjects/Expandable.cs b/src/GraphicObjects/Base/Expandable.cs similarity index 100% rename from src/GraphicObjects/Expandable.cs rename to src/GraphicObjects/Base/Expandable.cs diff --git a/src/GraphicObjects/GenericStack.cs b/src/GraphicObjects/Base/GenericStack.cs similarity index 100% rename from src/GraphicObjects/GenericStack.cs rename to src/GraphicObjects/Base/GenericStack.cs diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/Base/GraphicObject.cs similarity index 100% rename from src/GraphicObjects/GraphicObject.cs rename to src/GraphicObjects/Base/GraphicObject.cs diff --git a/src/GraphicObjects/Group.cs b/src/GraphicObjects/Base/Group.cs similarity index 100% rename from src/GraphicObjects/Group.cs rename to src/GraphicObjects/Base/Group.cs diff --git a/src/GraphicObjects/GroupBox.cs b/src/GraphicObjects/Base/GroupBox.cs similarity index 100% rename from src/GraphicObjects/GroupBox.cs rename to src/GraphicObjects/Base/GroupBox.cs diff --git a/src/GraphicObjects/HorizontalStack.cs b/src/GraphicObjects/Base/HorizontalStack.cs similarity index 100% rename from src/GraphicObjects/HorizontalStack.cs rename to src/GraphicObjects/Base/HorizontalStack.cs diff --git a/src/GraphicObjects/Image.cs b/src/GraphicObjects/Base/Image.cs similarity index 100% rename from src/GraphicObjects/Image.cs rename to src/GraphicObjects/Base/Image.cs diff --git a/src/GraphicObjects/Label.cs b/src/GraphicObjects/Base/Label.cs similarity index 100% rename from src/GraphicObjects/Label.cs rename to src/GraphicObjects/Base/Label.cs diff --git a/src/GraphicObjects/ListBox.cs b/src/GraphicObjects/Base/ListBox.cs similarity index 100% rename from src/GraphicObjects/ListBox.cs rename to src/GraphicObjects/Base/ListBox.cs diff --git a/src/GraphicObjects/Menu.cs b/src/GraphicObjects/Base/Menu.cs similarity index 100% rename from src/GraphicObjects/Menu.cs rename to src/GraphicObjects/Base/Menu.cs diff --git a/src/GraphicObjects/MenuItem.cs b/src/GraphicObjects/Base/MenuItem.cs similarity index 100% rename from src/GraphicObjects/MenuItem.cs rename to src/GraphicObjects/Base/MenuItem.cs diff --git a/src/GraphicObjects/MessageBox.cs b/src/GraphicObjects/Base/MessageBox.cs similarity index 100% rename from src/GraphicObjects/MessageBox.cs rename to src/GraphicObjects/Base/MessageBox.cs diff --git a/src/GraphicObjects/NumericControl.cs b/src/GraphicObjects/Base/NumericControl.cs similarity index 100% rename from src/GraphicObjects/NumericControl.cs rename to src/GraphicObjects/Base/NumericControl.cs diff --git a/src/GraphicObjects/Popper.cs b/src/GraphicObjects/Base/Popper.cs similarity index 100% rename from src/GraphicObjects/Popper.cs rename to src/GraphicObjects/Base/Popper.cs diff --git a/src/GraphicObjects/PrivateContainer.cs b/src/GraphicObjects/Base/PrivateContainer.cs similarity index 100% rename from src/GraphicObjects/PrivateContainer.cs rename to src/GraphicObjects/Base/PrivateContainer.cs diff --git a/src/GraphicObjects/ProgressBar.cs b/src/GraphicObjects/Base/ProgressBar.cs similarity index 100% rename from src/GraphicObjects/ProgressBar.cs rename to src/GraphicObjects/Base/ProgressBar.cs diff --git a/src/GraphicObjects/RadioButton.cs b/src/GraphicObjects/Base/RadioButton.cs similarity index 100% rename from src/GraphicObjects/RadioButton.cs rename to src/GraphicObjects/Base/RadioButton.cs diff --git a/src/GraphicObjects/ScrollBar.cs b/src/GraphicObjects/Base/ScrollBar.cs similarity index 100% rename from src/GraphicObjects/ScrollBar.cs rename to src/GraphicObjects/Base/ScrollBar.cs diff --git a/src/GraphicObjects/Scroller.cs b/src/GraphicObjects/Base/Scroller.cs similarity index 100% rename from src/GraphicObjects/Scroller.cs rename to src/GraphicObjects/Base/Scroller.cs diff --git a/src/GraphicObjects/Slider.cs b/src/GraphicObjects/Base/Slider.cs similarity index 100% rename from src/GraphicObjects/Slider.cs rename to src/GraphicObjects/Base/Slider.cs diff --git a/src/GraphicObjects/Spinner.cs b/src/GraphicObjects/Base/Spinner.cs similarity index 100% rename from src/GraphicObjects/Spinner.cs rename to src/GraphicObjects/Base/Spinner.cs diff --git a/src/GraphicObjects/Splitter.cs b/src/GraphicObjects/Base/Splitter.cs similarity index 100% rename from src/GraphicObjects/Splitter.cs rename to src/GraphicObjects/Base/Splitter.cs diff --git a/src/GraphicObjects/TabItem.cs b/src/GraphicObjects/Base/TabItem.cs similarity index 100% rename from src/GraphicObjects/TabItem.cs rename to src/GraphicObjects/Base/TabItem.cs diff --git a/src/GraphicObjects/TabView.cs b/src/GraphicObjects/Base/TabView.cs similarity index 100% rename from src/GraphicObjects/TabView.cs rename to src/GraphicObjects/Base/TabView.cs diff --git a/src/GraphicObjects/TemplatedContainer.cs b/src/GraphicObjects/Base/TemplatedContainer.cs similarity index 100% rename from src/GraphicObjects/TemplatedContainer.cs rename to src/GraphicObjects/Base/TemplatedContainer.cs diff --git a/src/GraphicObjects/TemplatedControl.cs b/src/GraphicObjects/Base/TemplatedControl.cs similarity index 100% rename from src/GraphicObjects/TemplatedControl.cs rename to src/GraphicObjects/Base/TemplatedControl.cs diff --git a/src/GraphicObjects/TemplatedGroup.cs b/src/GraphicObjects/Base/TemplatedGroup.cs similarity index 100% rename from src/GraphicObjects/TemplatedGroup.cs rename to src/GraphicObjects/Base/TemplatedGroup.cs diff --git a/src/GraphicObjects/TextBox.cs b/src/GraphicObjects/Base/TextBox.cs similarity index 100% rename from src/GraphicObjects/TextBox.cs rename to src/GraphicObjects/Base/TextBox.cs diff --git a/src/GraphicObjects/TextRun.cs b/src/GraphicObjects/Base/TextRun.cs similarity index 100% rename from src/GraphicObjects/TextRun.cs rename to src/GraphicObjects/Base/TextRun.cs diff --git a/src/GraphicObjects/TreeView.cs b/src/GraphicObjects/Base/TreeView.cs similarity index 100% rename from src/GraphicObjects/TreeView.cs rename to src/GraphicObjects/Base/TreeView.cs diff --git a/src/GraphicObjects/VerticalStack.cs b/src/GraphicObjects/Base/VerticalStack.cs similarity index 100% rename from src/GraphicObjects/VerticalStack.cs rename to src/GraphicObjects/Base/VerticalStack.cs diff --git a/src/GraphicObjects/Window.cs b/src/GraphicObjects/Base/Window.cs similarity index 100% rename from src/GraphicObjects/Window.cs rename to src/GraphicObjects/Base/Window.cs diff --git a/src/GraphicObjects/Wrapper.cs b/src/GraphicObjects/Base/Wrapper.cs similarity index 100% rename from src/GraphicObjects/Wrapper.cs rename to 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) -- 2.47.3