From 38f49f7e656bc4965ada71b4c8fc90c4cb7b5fba Mon Sep 17 00:00:00 2001 From: jpbruyere Date: Mon, 24 Apr 2017 10:25:22 +0200 Subject: [PATCH] first try with simple docking view --- Crow.csproj | 5 + Templates/DockingView.template | 24 ++++ Tests/Interfaces/Divers/welcome.crow | 12 +- src/GraphicObjects/DockingView.cs | 200 +++++++++++++++++++++++++++ src/GraphicObjects/DocksView.cs | 55 ++++++++ src/GraphicObjects/Window.cs | 8 +- 6 files changed, 294 insertions(+), 10 deletions(-) create mode 100755 Templates/DockingView.template create mode 100644 src/GraphicObjects/DockingView.cs create mode 100644 src/GraphicObjects/DocksView.cs diff --git a/Crow.csproj b/Crow.csproj index 4edb707b..4ca2f5d0 100644 --- a/Crow.csproj +++ b/Crow.csproj @@ -213,6 +213,8 @@ + + @@ -365,6 +367,9 @@ + + Crow.DockingView.template + diff --git a/Templates/DockingView.template b/Templates/DockingView.template new file mode 100755 index 00000000..0a3b4e01 --- /dev/null +++ b/Templates/DockingView.template @@ -0,0 +1,24 @@ + + + + + + + + + + + + diff --git a/Tests/Interfaces/Divers/welcome.crow b/Tests/Interfaces/Divers/welcome.crow index c4ec889f..4a38c433 100644 --- a/Tests/Interfaces/Divers/welcome.crow +++ b/Tests/Interfaces/Divers/welcome.crow @@ -1,7 +1,7 @@  - - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/src/GraphicObjects/DockingView.cs b/src/GraphicObjects/DockingView.cs new file mode 100644 index 00000000..b0fe294e --- /dev/null +++ b/src/GraphicObjects/DockingView.cs @@ -0,0 +1,200 @@ +// +// DockingView.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; + +namespace Crow +{ + public class DockingView : Window + { + #region CTOR + public DockingView () : base () + { + } + #endregion + + bool isDocked = false; + Alignment docking = Alignment.Center; + + Point lastMousePos; //last known mouse pos in this control + Point undockingMousePosOrig; //mouse pos when docking was donne, use for undocking on mouse move + Rectangle savedSlot; //last undocked slot recalled when view is undocked + bool wasResizable; + + + public override void OnLayoutChanges (LayoutingType layoutType) + { + base.OnLayoutChanges (layoutType); + + if (isDocked) + return; + + DocksView dv = Parent as DocksView; + if (dv == null) + return; + + Rectangle dvCliRect = dv.ClientRectangle; + + if (layoutType == LayoutingType.X) { + if (Slot.X < dv.DockingThreshold) + dock (Alignment.Left); + else if (Slot.Right > dvCliRect.Width - dv.DockingThreshold) + dock (Alignment.Right); + }else if (layoutType == LayoutingType.Y) { + if (Slot.Y < dv.DockingThreshold) + dock (Alignment.Top); + else if (Slot.Bottom > dvCliRect.Height - dv.DockingThreshold) + dock (Alignment.Bottom); + } + } + + public override void onMouseMove (object sender, MouseMoveEventArgs e) + { + lastMousePos = e.Position; + + if (this.HasFocus && e.Mouse.IsButtonDown (MouseButton.Left) && isDocked) { + DocksView dv = Parent as DocksView; + if (docking == Alignment.Left) { + if (lastMousePos.X - undockingMousePosOrig.X > dv.DockingThreshold) + undock (); + } else if (docking == Alignment.Right) { + if (undockingMousePosOrig.X - lastMousePos.X > dv.DockingThreshold) + undock (); + } else if (docking == Alignment.Top) { + if (lastMousePos.Y - undockingMousePosOrig.Y > dv.DockingThreshold) + undock (); + } else if (docking == Alignment.Bottom) { + if (undockingMousePosOrig.Y - lastMousePos.Y > dv.DockingThreshold) + undock (); + } + return; + } + + base.onMouseMove (sender, e); + } + public override void onMouseDown (object sender, MouseButtonEventArgs e) + { + base.onMouseDown (sender, e); + + if (this.HasFocus && isDocked && e.Button == MouseButton.Left) + undockingMousePosOrig = lastMousePos; + } + +// protected override void onBorderMouseEnter (object sender, MouseMoveEventArgs e) +// { +// base.onBorderMouseEnter (sender, e); +// +// if (isDocked) { +// switch (docking) { +// case Alignment.Top: +// if (this.currentDirection != Window.Direction.S) +// onBorderMouseLeave (this, null); +// break; +// case Alignment.Left: +// if (this.currentDirection != Window.Direction.E) +// onBorderMouseLeave (this, null); +// break; +// case Alignment.TopLeft: +// break; +// case Alignment.Right: +// if (this.currentDirection != Window.Direction.W) +// onBorderMouseLeave (this, null); +// break; +// case Alignment.TopRight: +// break; +// case Alignment.Bottom: +// if (this.currentDirection != Window.Direction.N) +// onBorderMouseLeave (this, null); +// break; +// case Alignment.BottomLeft: +// break; +// case Alignment.BottomRight: +// break; +// case Alignment.Center: +// break; +// default: +// break; +// } +// } +// } + + void undock () { + this.Left = savedSlot.Left; + this.Top = savedSlot.Top; + this.Width = savedSlot.Width; + this.Height = savedSlot.Height; + + isDocked = false; + Resizable = wasResizable; + } + void dock (Alignment align){ + isDocked = true; + docking = align; + undockingMousePosOrig = lastMousePos; + savedSlot = this.LastPaintedSlot; + wasResizable = Resizable; + Resizable = false; + + this.Left = this.Top = 0; + + switch (align) { + case Alignment.Top: + this.HorizontalAlignment = HorizontalAlignment.Left; + this.VerticalAlignment = VerticalAlignment.Top; + this.Width = Measure.Stretched; + break; + case Alignment.Left: + this.HorizontalAlignment = HorizontalAlignment.Left; + this.VerticalAlignment = VerticalAlignment.Top; + this.Height = Measure.Stretched; + break; + case Alignment.TopLeft: + break; + case Alignment.Right: + this.HorizontalAlignment = HorizontalAlignment.Right; + this.VerticalAlignment = VerticalAlignment.Top; + this.Height = Measure.Stretched; + break; + case Alignment.TopRight: + break; + case Alignment.Bottom: + this.HorizontalAlignment = HorizontalAlignment.Left; + this.VerticalAlignment = VerticalAlignment.Bottom; + this.Width = Measure.Stretched; + break; + case Alignment.BottomLeft: + break; + case Alignment.BottomRight: + break; + case Alignment.Center: + break; + default: + break; + } + + } + } +} + diff --git a/src/GraphicObjects/DocksView.cs b/src/GraphicObjects/DocksView.cs new file mode 100644 index 00000000..6c4d32dd --- /dev/null +++ b/src/GraphicObjects/DocksView.cs @@ -0,0 +1,55 @@ +// +// DocksView.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 +{ + public class DocksView : Group + { + #region CTOR + public DocksView () : base () + { + } + #endregion + + int dockingThreshold; + + [XmlAttributeAttribute][DefaultValue(10)] + public virtual int DockingThreshold { + get { return dockingThreshold; } + set { + if (dockingThreshold == value) + return; + dockingThreshold = value; + NotifyValueChanged ("DockingThreshold", dockingThreshold); + + } + } + } +} + diff --git a/src/GraphicObjects/Window.cs b/src/GraphicObjects/Window.cs index 336784e2..d1f34374 100644 --- a/src/GraphicObjects/Window.cs +++ b/src/GraphicObjects/Window.cs @@ -33,7 +33,7 @@ namespace Crow { public class Window : TemplatedContainer { - enum Direction + protected enum Direction { None, N, @@ -49,7 +49,7 @@ namespace Crow string _icon; bool _resizable; bool _movable; - bool hoverBorder = false; + protected bool hoverBorder = false; bool alwaysOnTop = false; Rectangle savedBounds; @@ -369,13 +369,13 @@ namespace Crow Minimize.Raise (sender, e); } - protected void onBorderMouseLeave (object sender, MouseMoveEventArgs e) + protected virtual void onBorderMouseLeave (object sender, MouseMoveEventArgs e) { hoverBorder = false; currentDirection = Direction.None; CurrentInterface.MouseCursor = XCursor.Default; } - protected void onBorderMouseEnter (object sender, MouseMoveEventArgs e) + protected virtual void onBorderMouseEnter (object sender, MouseMoveEventArgs e) { hoverBorder = true; } -- 2.47.3