From 301305a631c834740d1e4d8ffceac599451fe881 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jean-Philippe=20Bruy=C3=A8re?= Date: Mon, 7 Oct 2019 17:20:36 +0200 Subject: [PATCH] rename GraphicObjects folder to Widgets --- Crow/src/GraphicObjects/ColorSelector.cs | 74 ----------------- .../src/{GraphicObjects => Widgets}/Border.cs | 0 .../src/{GraphicObjects => Widgets}/Button.cs | 0 .../{GraphicObjects => Widgets}/CheckBox.cs | 0 .../ColorPicker.cs | 0 Crow/src/Widgets/ColorSelector.cs | 50 +++++++++++ .../ColorSlider.cs | 83 +++++++++---------- .../{GraphicObjects => Widgets}/ComboBox.cs | 0 .../{GraphicObjects => Widgets}/Container.cs | 0 .../DataSourceChangeEventArgs.cs | 0 .../DirectoryView.cs | 0 .../{GraphicObjects => Widgets}/DockStack.cs | 0 .../{GraphicObjects => Widgets}/DockWindow.cs | 0 .../EnumSelector.cs | 0 .../{GraphicObjects => Widgets}/Expandable.cs | 0 .../{GraphicObjects => Widgets}/FileDialog.cs | 0 .../GenericStack.cs | 0 .../GraduatedSlider.cs | 0 Crow/src/{GraphicObjects => Widgets}/Grid.cs | 0 Crow/src/{GraphicObjects => Widgets}/Group.cs | 0 .../{GraphicObjects => Widgets}/GroupBox.cs | 0 .../HorizontalStack.cs | 0 .../HueSelector.cs | 0 .../ILayoutable.cs | 0 .../IMLContainer.cs | 0 .../IValueChange.cs | 0 Crow/src/{GraphicObjects => Widgets}/Image.cs | 0 Crow/src/{GraphicObjects => Widgets}/Label.cs | 0 .../{GraphicObjects => Widgets}/ListBox.cs | 0 Crow/src/{GraphicObjects => Widgets}/Menu.cs | 0 .../{GraphicObjects => Widgets}/MenuItem.cs | 0 .../{GraphicObjects => Widgets}/MessageBox.cs | 0 .../NumericControl.cs | 0 .../src/{GraphicObjects => Widgets}/Popper.cs | 0 .../PrivateContainer.cs | 0 .../ProgressBar.cs | 0 .../RadioButton.cs | 0 .../SaturationValueSelector.cs | 0 .../{GraphicObjects => Widgets}/ScrollBar.cs | 0 .../{GraphicObjects => Widgets}/Scroller.cs | 0 .../ScrollingObject.cs | 0 Crow/src/{GraphicObjects => Widgets}/Shape.cs | 0 .../src/{GraphicObjects => Widgets}/Slider.cs | 0 .../{GraphicObjects => Widgets}/Spinner.cs | 0 .../{GraphicObjects => Widgets}/Splitter.cs | 0 .../{GraphicObjects => Widgets}/TabItem.cs | 0 .../{GraphicObjects => Widgets}/TabView.cs | 0 .../TemplatedContainer.cs | 0 .../TemplatedControl.cs | 0 .../TemplatedGroup.cs | 0 .../TestCairoPatch.cs | 0 .../{GraphicObjects => Widgets}/TextBox.cs | 0 .../{GraphicObjects => Widgets}/TextRun.cs | 0 .../{GraphicObjects => Widgets}/TreeView.cs | 0 Crow/src/{GraphicObjects => Widgets}/Trend.cs | 0 .../VerticalStack.cs | 0 .../src/{GraphicObjects => Widgets}/Widget.cs | 0 .../src/{GraphicObjects => Widgets}/Window.cs | 0 .../{GraphicObjects => Widgets}/Wrapper.cs | 0 .../XmlIgnoreAttribute.cs | 0 60 files changed, 90 insertions(+), 117 deletions(-) delete mode 100644 Crow/src/GraphicObjects/ColorSelector.cs rename Crow/src/{GraphicObjects => Widgets}/Border.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/Button.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/CheckBox.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/ColorPicker.cs (100%) create mode 100644 Crow/src/Widgets/ColorSelector.cs rename Crow/src/{GraphicObjects => Widgets}/ColorSlider.cs (84%) rename Crow/src/{GraphicObjects => Widgets}/ComboBox.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/Container.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/DataSourceChangeEventArgs.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/DirectoryView.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/DockStack.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/DockWindow.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/EnumSelector.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/Expandable.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/FileDialog.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/GenericStack.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/GraduatedSlider.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/Grid.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/Group.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/GroupBox.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/HorizontalStack.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/HueSelector.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/ILayoutable.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/IMLContainer.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/IValueChange.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/Image.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/Label.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/ListBox.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/Menu.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/MenuItem.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/MessageBox.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/NumericControl.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/Popper.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/PrivateContainer.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/ProgressBar.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/RadioButton.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/SaturationValueSelector.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/ScrollBar.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/Scroller.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/ScrollingObject.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/Shape.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/Slider.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/Spinner.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/Splitter.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/TabItem.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/TabView.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/TemplatedContainer.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/TemplatedControl.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/TemplatedGroup.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/TestCairoPatch.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/TextBox.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/TextRun.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/TreeView.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/Trend.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/VerticalStack.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/Widget.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/Window.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/Wrapper.cs (100%) rename Crow/src/{GraphicObjects => Widgets}/XmlIgnoreAttribute.cs (100%) diff --git a/Crow/src/GraphicObjects/ColorSelector.cs b/Crow/src/GraphicObjects/ColorSelector.cs deleted file mode 100644 index 83e69626..00000000 --- a/Crow/src/GraphicObjects/ColorSelector.cs +++ /dev/null @@ -1,74 +0,0 @@ -// -// ColorSelector.cs -// -// Author: -// Jean-Philippe Bruyère -// -// Copyright (c) 2013-2017 Jean-Philippe Bruyère -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. - -using System; -using System.Xml.Serialization; -using System.ComponentModel; - -namespace Crow -{ - /// - /// simple squarred rgb color selector - /// - [DesignIgnore] - public class ColorSelector : Widget - { - #region CTOR - protected ColorSelector() : base(){} - public ColorSelector (Interface iface) : base(iface){} - #endregion - - protected Point mousePos; - - public override void onMouseMove (object sender, MouseMoveEventArgs e) - { - base.onMouseMove (sender, e); - if (IFace.Mouse.LeftButton == ButtonState.Released) - return; - updateMouseLocalPos (e.Position); - } - public override void onMouseDown (object sender, MouseButtonEventArgs e) - { - base.onMouseDown (sender, e); - if (e.Button == MouseButton.Left) - updateMouseLocalPos (e.Position); - } - - protected virtual void updateMouseLocalPos(Point mPos){ - Rectangle r = ScreenCoordinates (Slot); - Rectangle cb = ClientRectangle; - mousePos = mPos - r.Position; - - mousePos.X = Math.Max(cb.X, mousePos.X); - mousePos.X = Math.Min(cb.Right, mousePos.X); - mousePos.Y = Math.Max(cb.Y, mousePos.Y); - mousePos.Y = Math.Min(cb.Bottom, mousePos.Y); - - RegisterForRedraw (); - } - } -} - diff --git a/Crow/src/GraphicObjects/Border.cs b/Crow/src/Widgets/Border.cs similarity index 100% rename from Crow/src/GraphicObjects/Border.cs rename to Crow/src/Widgets/Border.cs diff --git a/Crow/src/GraphicObjects/Button.cs b/Crow/src/Widgets/Button.cs similarity index 100% rename from Crow/src/GraphicObjects/Button.cs rename to Crow/src/Widgets/Button.cs diff --git a/Crow/src/GraphicObjects/CheckBox.cs b/Crow/src/Widgets/CheckBox.cs similarity index 100% rename from Crow/src/GraphicObjects/CheckBox.cs rename to Crow/src/Widgets/CheckBox.cs diff --git a/Crow/src/GraphicObjects/ColorPicker.cs b/Crow/src/Widgets/ColorPicker.cs similarity index 100% rename from Crow/src/GraphicObjects/ColorPicker.cs rename to Crow/src/Widgets/ColorPicker.cs diff --git a/Crow/src/Widgets/ColorSelector.cs b/Crow/src/Widgets/ColorSelector.cs new file mode 100644 index 00000000..dea2b48c --- /dev/null +++ b/Crow/src/Widgets/ColorSelector.cs @@ -0,0 +1,50 @@ +// Copyright (c) 2013-2019 Bruyère Jean-Philippe jp_bruyere@hotmail.com +// +// This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) + +using System; + +namespace Crow +{ + /// + /// simple squarred rgb color selector + /// + [DesignIgnore] + public class ColorSelector : Widget + { + #region CTOR + protected ColorSelector() : base(){} + public ColorSelector (Interface iface) : base(iface){} + #endregion + + protected Point mousePos; + + public override void onMouseMove (object sender, MouseMoveEventArgs e) + { + base.onMouseMove (sender, e); + if (IFace.Mouse.LeftButton == ButtonState.Released) + return; + updateMouseLocalPos (e.Position); + } + public override void onMouseDown (object sender, MouseButtonEventArgs e) + { + base.onMouseDown (sender, e); + if (e.Button == MouseButton.Left) + updateMouseLocalPos (e.Position); + } + + protected virtual void updateMouseLocalPos(Point mPos){ + Rectangle r = ScreenCoordinates (Slot); + Rectangle cb = ClientRectangle; + mousePos = mPos - r.Position; + + mousePos.X = Math.Max(cb.X, mousePos.X); + mousePos.X = Math.Min(cb.Right, mousePos.X); + mousePos.Y = Math.Max(cb.Y, mousePos.Y); + mousePos.Y = Math.Min(cb.Bottom, mousePos.Y); + + RegisterForRedraw (); + } + } +} + diff --git a/Crow/src/GraphicObjects/ColorSlider.cs b/Crow/src/Widgets/ColorSlider.cs similarity index 84% rename from Crow/src/GraphicObjects/ColorSlider.cs rename to Crow/src/Widgets/ColorSlider.cs index 9a7e470b..84e688e9 100644 --- a/Crow/src/GraphicObjects/ColorSlider.cs +++ b/Crow/src/Widgets/ColorSlider.cs @@ -9,7 +9,7 @@ using Crow.Cairo; namespace Crow { /// - /// simple squarred rgb color selector + /// Color component slider with background gradient ranging from 0 to 1 for this component value. /// [DesignIgnore] public class ColorSlider : Widget @@ -19,12 +19,12 @@ namespace Crow public ColorSlider (Interface iface) : base(iface){} #endregion - protected Point mousePos; + protected Point mousePos;//store local mouse pos sync with currentValue Orientation orientation; CursorType cursorType = CursorType.Pentagone; ColorComponent component; Color currentColor = Color.Black; - double currentValue; + double currentValue = -1;//force notify for property less binding 'CurrentValue' [DefaultValue (Orientation.Horizontal)] public Orientation Orientation { @@ -64,53 +64,56 @@ namespace Crow set { if (currentColor == value) return; + currentColor = value; + + NotifyValueChanged ("CurrentColor", currentColor); + RegisterForRedraw (); + switch (component) { case ColorComponent.Red: - if (currentValue != currentColor.R) { - currentValue = currentColor.R; - updateMousePosFromComponentValue (); - } + if (currentValue == currentColor.R) + return; + currentValue = currentColor.R; break; case ColorComponent.Green: - if (currentValue != currentColor.G) { - currentValue = currentColor.G; - updateMousePosFromComponentValue (); - } + if (currentValue == currentColor.G) + return; + currentValue = currentColor.G; break; case ColorComponent.Blue: - if (currentValue != currentColor.B) { - currentValue = currentColor.B; - updateMousePosFromComponentValue (); - } + if (currentValue == currentColor.B) + return; + currentValue = currentColor.B; break; case ColorComponent.Alpha: - if (currentValue != currentColor.A) { - currentValue = currentColor.A; - updateMousePosFromComponentValue (); - } + if (currentValue == currentColor.A) + return; + currentValue = currentColor.A; break; case ColorComponent.Hue: - if (currentValue != currentColor.Hue) { - currentValue = currentColor.Hue; - updateMousePosFromComponentValue (); - } + if (currentValue == currentColor.Hue) + return; + currentValue = currentColor.Hue; break; case ColorComponent.Saturation: - if (currentValue != currentColor.Saturation) { - currentValue = currentColor.Saturation; - updateMousePosFromComponentValue (); - } + if (currentValue == currentColor.Saturation) + return; + currentValue = currentColor.Saturation; break; case ColorComponent.Value: - if (currentValue != currentColor.Value) { - currentValue = currentColor.Value; - updateMousePosFromComponentValue (); - } + if (currentValue == currentColor.Value) + return; + currentValue = currentColor.Value; break; } - NotifyValueChanged ("CurrentColor", currentColor); - RegisterForRedraw (); + + NotifyValueChanged ("CurrentValue", $"{currentValue:0.000}"); + + if (Orientation == Orientation.Horizontal) + mousePos.X = (int)Math.Floor (currentValue * ClientRectangle.Width); + else + mousePos.Y = (int)Math.Floor (currentValue * ClientRectangle.Height); } } public override void onMouseMove (object sender, MouseMoveEventArgs e) @@ -229,16 +232,9 @@ namespace Crow if (Orientation == Orientation.Horizontal) { if (layoutType == LayoutingType.Width) - updateMousePosFromComponentValue (); + mousePos.X = (int)Math.Floor (currentValue * ClientRectangle.Width); } else if (layoutType == LayoutingType.Height) - updateMousePosFromComponentValue (); - } - void updateMousePosFromComponentValue () { - if (Orientation == Orientation.Horizontal) - mousePos.X = (int)Math.Floor (currentValue * ClientRectangle.Width); - else mousePos.Y = (int)Math.Floor (currentValue * ClientRectangle.Height); - RegisterForRedraw (); } protected virtual void updateMouseLocalPos(Point mPos){ @@ -255,6 +251,9 @@ namespace Crow currentValue = (double)mousePos.X / ClientRectangle.Width; else currentValue = (double)mousePos.Y / ClientRectangle.Height; + + NotifyValueChanged ("CurrentValue", $"{currentValue:0.000}"); + Color c = currentColor; switch (component) { case ColorComponent.Red: @@ -279,8 +278,6 @@ namespace Crow CurrentColor = Color.FromHSV (c.Hue, currentValue, c.Saturation, c.A); break; } - //NotifyValueChanged ("CurrentColor", currentColor); - //RegisterForRedraw (); } } } diff --git a/Crow/src/GraphicObjects/ComboBox.cs b/Crow/src/Widgets/ComboBox.cs similarity index 100% rename from Crow/src/GraphicObjects/ComboBox.cs rename to Crow/src/Widgets/ComboBox.cs diff --git a/Crow/src/GraphicObjects/Container.cs b/Crow/src/Widgets/Container.cs similarity index 100% rename from Crow/src/GraphicObjects/Container.cs rename to Crow/src/Widgets/Container.cs diff --git a/Crow/src/GraphicObjects/DataSourceChangeEventArgs.cs b/Crow/src/Widgets/DataSourceChangeEventArgs.cs similarity index 100% rename from Crow/src/GraphicObjects/DataSourceChangeEventArgs.cs rename to Crow/src/Widgets/DataSourceChangeEventArgs.cs diff --git a/Crow/src/GraphicObjects/DirectoryView.cs b/Crow/src/Widgets/DirectoryView.cs similarity index 100% rename from Crow/src/GraphicObjects/DirectoryView.cs rename to Crow/src/Widgets/DirectoryView.cs diff --git a/Crow/src/GraphicObjects/DockStack.cs b/Crow/src/Widgets/DockStack.cs similarity index 100% rename from Crow/src/GraphicObjects/DockStack.cs rename to Crow/src/Widgets/DockStack.cs diff --git a/Crow/src/GraphicObjects/DockWindow.cs b/Crow/src/Widgets/DockWindow.cs similarity index 100% rename from Crow/src/GraphicObjects/DockWindow.cs rename to Crow/src/Widgets/DockWindow.cs diff --git a/Crow/src/GraphicObjects/EnumSelector.cs b/Crow/src/Widgets/EnumSelector.cs similarity index 100% rename from Crow/src/GraphicObjects/EnumSelector.cs rename to Crow/src/Widgets/EnumSelector.cs diff --git a/Crow/src/GraphicObjects/Expandable.cs b/Crow/src/Widgets/Expandable.cs similarity index 100% rename from Crow/src/GraphicObjects/Expandable.cs rename to Crow/src/Widgets/Expandable.cs diff --git a/Crow/src/GraphicObjects/FileDialog.cs b/Crow/src/Widgets/FileDialog.cs similarity index 100% rename from Crow/src/GraphicObjects/FileDialog.cs rename to Crow/src/Widgets/FileDialog.cs diff --git a/Crow/src/GraphicObjects/GenericStack.cs b/Crow/src/Widgets/GenericStack.cs similarity index 100% rename from Crow/src/GraphicObjects/GenericStack.cs rename to Crow/src/Widgets/GenericStack.cs diff --git a/Crow/src/GraphicObjects/GraduatedSlider.cs b/Crow/src/Widgets/GraduatedSlider.cs similarity index 100% rename from Crow/src/GraphicObjects/GraduatedSlider.cs rename to Crow/src/Widgets/GraduatedSlider.cs diff --git a/Crow/src/GraphicObjects/Grid.cs b/Crow/src/Widgets/Grid.cs similarity index 100% rename from Crow/src/GraphicObjects/Grid.cs rename to Crow/src/Widgets/Grid.cs diff --git a/Crow/src/GraphicObjects/Group.cs b/Crow/src/Widgets/Group.cs similarity index 100% rename from Crow/src/GraphicObjects/Group.cs rename to Crow/src/Widgets/Group.cs diff --git a/Crow/src/GraphicObjects/GroupBox.cs b/Crow/src/Widgets/GroupBox.cs similarity index 100% rename from Crow/src/GraphicObjects/GroupBox.cs rename to Crow/src/Widgets/GroupBox.cs diff --git a/Crow/src/GraphicObjects/HorizontalStack.cs b/Crow/src/Widgets/HorizontalStack.cs similarity index 100% rename from Crow/src/GraphicObjects/HorizontalStack.cs rename to Crow/src/Widgets/HorizontalStack.cs diff --git a/Crow/src/GraphicObjects/HueSelector.cs b/Crow/src/Widgets/HueSelector.cs similarity index 100% rename from Crow/src/GraphicObjects/HueSelector.cs rename to Crow/src/Widgets/HueSelector.cs diff --git a/Crow/src/GraphicObjects/ILayoutable.cs b/Crow/src/Widgets/ILayoutable.cs similarity index 100% rename from Crow/src/GraphicObjects/ILayoutable.cs rename to Crow/src/Widgets/ILayoutable.cs diff --git a/Crow/src/GraphicObjects/IMLContainer.cs b/Crow/src/Widgets/IMLContainer.cs similarity index 100% rename from Crow/src/GraphicObjects/IMLContainer.cs rename to Crow/src/Widgets/IMLContainer.cs diff --git a/Crow/src/GraphicObjects/IValueChange.cs b/Crow/src/Widgets/IValueChange.cs similarity index 100% rename from Crow/src/GraphicObjects/IValueChange.cs rename to Crow/src/Widgets/IValueChange.cs diff --git a/Crow/src/GraphicObjects/Image.cs b/Crow/src/Widgets/Image.cs similarity index 100% rename from Crow/src/GraphicObjects/Image.cs rename to Crow/src/Widgets/Image.cs diff --git a/Crow/src/GraphicObjects/Label.cs b/Crow/src/Widgets/Label.cs similarity index 100% rename from Crow/src/GraphicObjects/Label.cs rename to Crow/src/Widgets/Label.cs diff --git a/Crow/src/GraphicObjects/ListBox.cs b/Crow/src/Widgets/ListBox.cs similarity index 100% rename from Crow/src/GraphicObjects/ListBox.cs rename to Crow/src/Widgets/ListBox.cs diff --git a/Crow/src/GraphicObjects/Menu.cs b/Crow/src/Widgets/Menu.cs similarity index 100% rename from Crow/src/GraphicObjects/Menu.cs rename to Crow/src/Widgets/Menu.cs diff --git a/Crow/src/GraphicObjects/MenuItem.cs b/Crow/src/Widgets/MenuItem.cs similarity index 100% rename from Crow/src/GraphicObjects/MenuItem.cs rename to Crow/src/Widgets/MenuItem.cs diff --git a/Crow/src/GraphicObjects/MessageBox.cs b/Crow/src/Widgets/MessageBox.cs similarity index 100% rename from Crow/src/GraphicObjects/MessageBox.cs rename to Crow/src/Widgets/MessageBox.cs diff --git a/Crow/src/GraphicObjects/NumericControl.cs b/Crow/src/Widgets/NumericControl.cs similarity index 100% rename from Crow/src/GraphicObjects/NumericControl.cs rename to Crow/src/Widgets/NumericControl.cs diff --git a/Crow/src/GraphicObjects/Popper.cs b/Crow/src/Widgets/Popper.cs similarity index 100% rename from Crow/src/GraphicObjects/Popper.cs rename to Crow/src/Widgets/Popper.cs diff --git a/Crow/src/GraphicObjects/PrivateContainer.cs b/Crow/src/Widgets/PrivateContainer.cs similarity index 100% rename from Crow/src/GraphicObjects/PrivateContainer.cs rename to Crow/src/Widgets/PrivateContainer.cs diff --git a/Crow/src/GraphicObjects/ProgressBar.cs b/Crow/src/Widgets/ProgressBar.cs similarity index 100% rename from Crow/src/GraphicObjects/ProgressBar.cs rename to Crow/src/Widgets/ProgressBar.cs diff --git a/Crow/src/GraphicObjects/RadioButton.cs b/Crow/src/Widgets/RadioButton.cs similarity index 100% rename from Crow/src/GraphicObjects/RadioButton.cs rename to Crow/src/Widgets/RadioButton.cs diff --git a/Crow/src/GraphicObjects/SaturationValueSelector.cs b/Crow/src/Widgets/SaturationValueSelector.cs similarity index 100% rename from Crow/src/GraphicObjects/SaturationValueSelector.cs rename to Crow/src/Widgets/SaturationValueSelector.cs diff --git a/Crow/src/GraphicObjects/ScrollBar.cs b/Crow/src/Widgets/ScrollBar.cs similarity index 100% rename from Crow/src/GraphicObjects/ScrollBar.cs rename to Crow/src/Widgets/ScrollBar.cs diff --git a/Crow/src/GraphicObjects/Scroller.cs b/Crow/src/Widgets/Scroller.cs similarity index 100% rename from Crow/src/GraphicObjects/Scroller.cs rename to Crow/src/Widgets/Scroller.cs diff --git a/Crow/src/GraphicObjects/ScrollingObject.cs b/Crow/src/Widgets/ScrollingObject.cs similarity index 100% rename from Crow/src/GraphicObjects/ScrollingObject.cs rename to Crow/src/Widgets/ScrollingObject.cs diff --git a/Crow/src/GraphicObjects/Shape.cs b/Crow/src/Widgets/Shape.cs similarity index 100% rename from Crow/src/GraphicObjects/Shape.cs rename to Crow/src/Widgets/Shape.cs diff --git a/Crow/src/GraphicObjects/Slider.cs b/Crow/src/Widgets/Slider.cs similarity index 100% rename from Crow/src/GraphicObjects/Slider.cs rename to Crow/src/Widgets/Slider.cs diff --git a/Crow/src/GraphicObjects/Spinner.cs b/Crow/src/Widgets/Spinner.cs similarity index 100% rename from Crow/src/GraphicObjects/Spinner.cs rename to Crow/src/Widgets/Spinner.cs diff --git a/Crow/src/GraphicObjects/Splitter.cs b/Crow/src/Widgets/Splitter.cs similarity index 100% rename from Crow/src/GraphicObjects/Splitter.cs rename to Crow/src/Widgets/Splitter.cs diff --git a/Crow/src/GraphicObjects/TabItem.cs b/Crow/src/Widgets/TabItem.cs similarity index 100% rename from Crow/src/GraphicObjects/TabItem.cs rename to Crow/src/Widgets/TabItem.cs diff --git a/Crow/src/GraphicObjects/TabView.cs b/Crow/src/Widgets/TabView.cs similarity index 100% rename from Crow/src/GraphicObjects/TabView.cs rename to Crow/src/Widgets/TabView.cs diff --git a/Crow/src/GraphicObjects/TemplatedContainer.cs b/Crow/src/Widgets/TemplatedContainer.cs similarity index 100% rename from Crow/src/GraphicObjects/TemplatedContainer.cs rename to Crow/src/Widgets/TemplatedContainer.cs diff --git a/Crow/src/GraphicObjects/TemplatedControl.cs b/Crow/src/Widgets/TemplatedControl.cs similarity index 100% rename from Crow/src/GraphicObjects/TemplatedControl.cs rename to Crow/src/Widgets/TemplatedControl.cs diff --git a/Crow/src/GraphicObjects/TemplatedGroup.cs b/Crow/src/Widgets/TemplatedGroup.cs similarity index 100% rename from Crow/src/GraphicObjects/TemplatedGroup.cs rename to Crow/src/Widgets/TemplatedGroup.cs diff --git a/Crow/src/GraphicObjects/TestCairoPatch.cs b/Crow/src/Widgets/TestCairoPatch.cs similarity index 100% rename from Crow/src/GraphicObjects/TestCairoPatch.cs rename to Crow/src/Widgets/TestCairoPatch.cs diff --git a/Crow/src/GraphicObjects/TextBox.cs b/Crow/src/Widgets/TextBox.cs similarity index 100% rename from Crow/src/GraphicObjects/TextBox.cs rename to Crow/src/Widgets/TextBox.cs diff --git a/Crow/src/GraphicObjects/TextRun.cs b/Crow/src/Widgets/TextRun.cs similarity index 100% rename from Crow/src/GraphicObjects/TextRun.cs rename to Crow/src/Widgets/TextRun.cs diff --git a/Crow/src/GraphicObjects/TreeView.cs b/Crow/src/Widgets/TreeView.cs similarity index 100% rename from Crow/src/GraphicObjects/TreeView.cs rename to Crow/src/Widgets/TreeView.cs diff --git a/Crow/src/GraphicObjects/Trend.cs b/Crow/src/Widgets/Trend.cs similarity index 100% rename from Crow/src/GraphicObjects/Trend.cs rename to Crow/src/Widgets/Trend.cs diff --git a/Crow/src/GraphicObjects/VerticalStack.cs b/Crow/src/Widgets/VerticalStack.cs similarity index 100% rename from Crow/src/GraphicObjects/VerticalStack.cs rename to Crow/src/Widgets/VerticalStack.cs diff --git a/Crow/src/GraphicObjects/Widget.cs b/Crow/src/Widgets/Widget.cs similarity index 100% rename from Crow/src/GraphicObjects/Widget.cs rename to Crow/src/Widgets/Widget.cs diff --git a/Crow/src/GraphicObjects/Window.cs b/Crow/src/Widgets/Window.cs similarity index 100% rename from Crow/src/GraphicObjects/Window.cs rename to Crow/src/Widgets/Window.cs diff --git a/Crow/src/GraphicObjects/Wrapper.cs b/Crow/src/Widgets/Wrapper.cs similarity index 100% rename from Crow/src/GraphicObjects/Wrapper.cs rename to Crow/src/Widgets/Wrapper.cs diff --git a/Crow/src/GraphicObjects/XmlIgnoreAttribute.cs b/Crow/src/Widgets/XmlIgnoreAttribute.cs similarity index 100% rename from Crow/src/GraphicObjects/XmlIgnoreAttribute.cs rename to Crow/src/Widgets/XmlIgnoreAttribute.cs -- 2.47.3