diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/GraphicObjects/Base/Border.cs (renamed from src/GraphicObjects/Border.cs) | 0 | ||||
| -rw-r--r-- | src/GraphicObjects/Base/Button.cs (renamed from src/GraphicObjects/Button.cs) | 0 | ||||
| -rw-r--r-- | src/GraphicObjects/Base/CheckBox.cs (renamed from src/GraphicObjects/CheckBox.cs) | 0 | ||||
| -rw-r--r-- | src/GraphicObjects/Base/ComboBox.cs (renamed from src/GraphicObjects/ComboBox.cs) | 0 | ||||
| -rw-r--r-- | src/GraphicObjects/Base/Container.cs (renamed from src/GraphicObjects/Container.cs) | 0 | ||||
| -rw-r--r-- | src/GraphicObjects/Base/Expandable.cs (renamed from src/GraphicObjects/Expandable.cs) | 0 | ||||
| -rw-r--r-- | src/GraphicObjects/Base/GenericStack.cs (renamed from src/GraphicObjects/GenericStack.cs) | 0 | ||||
| -rw-r--r-- | src/GraphicObjects/Base/GraphicObject.cs (renamed from src/GraphicObjects/GraphicObject.cs) | 0 | ||||
| -rw-r--r-- | src/GraphicObjects/Base/Group.cs (renamed from src/GraphicObjects/Group.cs) | 0 | ||||
| -rw-r--r-- | src/GraphicObjects/Base/GroupBox.cs (renamed from src/GraphicObjects/GroupBox.cs) | 0 | ||||
| -rw-r--r-- | src/GraphicObjects/Base/HorizontalStack.cs (renamed from src/GraphicObjects/HorizontalStack.cs) | 0 | ||||
| -rw-r--r-- | src/GraphicObjects/Base/Image.cs (renamed from src/GraphicObjects/Image.cs) | 0 | ||||
| -rw-r--r-- | src/GraphicObjects/Base/Label.cs (renamed from src/GraphicObjects/Label.cs) | 0 | ||||
| -rw-r--r-- | src/GraphicObjects/Base/ListBox.cs (renamed from src/GraphicObjects/ListBox.cs) | 0 | ||||
| -rw-r--r-- | src/GraphicObjects/Base/Menu.cs (renamed from src/GraphicObjects/Menu.cs) | 0 | ||||
| -rw-r--r-- | src/GraphicObjects/Base/MenuItem.cs (renamed from src/GraphicObjects/MenuItem.cs) | 0 | ||||
| -rw-r--r-- | src/GraphicObjects/Base/MessageBox.cs (renamed from src/GraphicObjects/MessageBox.cs) | 0 | ||||
| -rw-r--r-- | src/GraphicObjects/Base/NumericControl.cs (renamed from src/GraphicObjects/NumericControl.cs) | 0 | ||||
| -rw-r--r-- | src/GraphicObjects/Base/Popper.cs (renamed from src/GraphicObjects/Popper.cs) | 0 | ||||
| -rw-r--r-- | src/GraphicObjects/Base/PrivateContainer.cs (renamed from src/GraphicObjects/PrivateContainer.cs) | 0 | ||||
| -rw-r--r-- | src/GraphicObjects/Base/ProgressBar.cs (renamed from src/GraphicObjects/ProgressBar.cs) | 0 | ||||
| -rw-r--r-- | src/GraphicObjects/Base/RadioButton.cs (renamed from src/GraphicObjects/RadioButton.cs) | 0 | ||||
| -rw-r--r-- | src/GraphicObjects/Base/ScrollBar.cs (renamed from src/GraphicObjects/ScrollBar.cs) | 0 | ||||
| -rw-r--r-- | src/GraphicObjects/Base/Scroller.cs (renamed from src/GraphicObjects/Scroller.cs) | 0 | ||||
| -rw-r--r-- | src/GraphicObjects/Base/Slider.cs (renamed from src/GraphicObjects/Slider.cs) | 0 | ||||
| -rw-r--r-- | src/GraphicObjects/Base/Spinner.cs (renamed from src/GraphicObjects/Spinner.cs) | 0 | ||||
| -rw-r--r-- | src/GraphicObjects/Base/Splitter.cs (renamed from src/GraphicObjects/Splitter.cs) | 0 | ||||
| -rw-r--r-- | src/GraphicObjects/Base/TabItem.cs (renamed from src/GraphicObjects/TabItem.cs) | 0 | ||||
| -rw-r--r-- | src/GraphicObjects/Base/TabView.cs (renamed from src/GraphicObjects/TabView.cs) | 0 | ||||
| -rw-r--r-- | src/GraphicObjects/Base/TemplatedContainer.cs (renamed from src/GraphicObjects/TemplatedContainer.cs) | 0 | ||||
| -rw-r--r-- | src/GraphicObjects/Base/TemplatedControl.cs (renamed from src/GraphicObjects/TemplatedControl.cs) | 0 | ||||
| -rw-r--r-- | src/GraphicObjects/Base/TemplatedGroup.cs (renamed from src/GraphicObjects/TemplatedGroup.cs) | 0 | ||||
| -rw-r--r-- | src/GraphicObjects/Base/TextBox.cs (renamed from src/GraphicObjects/TextBox.cs) | 0 | ||||
| -rw-r--r-- | src/GraphicObjects/Base/TextRun.cs (renamed from src/GraphicObjects/TextRun.cs) | 0 | ||||
| -rw-r--r-- | src/GraphicObjects/Base/TreeView.cs (renamed from src/GraphicObjects/TreeView.cs) | 0 | ||||
| -rw-r--r-- | src/GraphicObjects/Base/VerticalStack.cs (renamed from src/GraphicObjects/VerticalStack.cs) | 0 | ||||
| -rw-r--r-- | src/GraphicObjects/Base/Window.cs (renamed from src/GraphicObjects/Window.cs) | 0 | ||||
| -rw-r--r-- | src/GraphicObjects/Base/Wrapper.cs (renamed from src/GraphicObjects/Wrapper.cs) | 0 | ||||
| -rw-r--r-- | src/Size.cs | 47 |
39 files changed, 28 insertions, 19 deletions
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) |