From: Jean-Philippe Bruyère Date: Mon, 19 Feb 2018 13:02:08 +0000 (+0100) Subject: docking X-Git-Tag: v0.9.5-beta~160 X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=85c564717f2d9ab75288b2a680cdb3f58a1b0e86;p=jp%2Fcrow.git docking --- diff --git a/Crow.csproj b/Crow.csproj index bb4a9bbe..f9c42c85 100644 --- a/Crow.csproj +++ b/Crow.csproj @@ -220,6 +220,8 @@ + + @@ -378,6 +380,9 @@ + + Crow.DockWindow.template + diff --git a/Default.style b/Default.style index 887ecc9f..11a22191 100644 --- a/Default.style +++ b/Default.style @@ -58,6 +58,12 @@ MenuItem { MouseLeave = {Foreground=LightGray;Background=Transparent;} SelectionBackground = Transparent; } +Docker { + AllowDrop = true; +} +DockWindow { + AllowDrag = true; +} MessageBox { Background = 0.3,0.3,0.3,0.3; Width = Fit; diff --git a/Templates/DockWindow.template b/Templates/DockWindow.template new file mode 100755 index 00000000..0a3b4e01 --- /dev/null +++ b/Templates/DockWindow.template @@ -0,0 +1,24 @@ + + + + + + + + + + + + diff --git a/Tests/Interfaces/Divers/testDock.crow b/Tests/Interfaces/Divers/testDock.crow new file mode 100644 index 00000000..3dc9a6eb --- /dev/null +++ b/Tests/Interfaces/Divers/testDock.crow @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj index e5cccb5c..9a63b7d0 100644 --- a/Tests/Tests.csproj +++ b/Tests/Tests.csproj @@ -270,6 +270,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest diff --git a/src/GraphicObjects/DockWindow.cs b/src/GraphicObjects/DockWindow.cs new file mode 100644 index 00000000..5e066f39 --- /dev/null +++ b/src/GraphicObjects/DockWindow.cs @@ -0,0 +1,208 @@ +// +// 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 DockWindow : Window + { + #region CTOR + public DockWindow () : 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 bool IsDocked { + get { return isDocked; } + set { + if (isDocked == value) + return; + isDocked = value; + NotifyValueChanged ("IsDocked", isDocked); + } + } + public override void OnLayoutChanges (LayoutingType layoutType) + { + base.OnLayoutChanges (layoutType); + + if (isDocked) + return; + + Docker dv = Parent as Docker; + 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) { + Docker dv = Parent as Docker; + 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/Docker.cs b/src/GraphicObjects/Docker.cs new file mode 100644 index 00000000..57b49390 --- /dev/null +++ b/src/GraphicObjects/Docker.cs @@ -0,0 +1,67 @@ +// +// 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 Docker : Group + { + #region CTOR + public Docker () : base () + { + } + #endregion + + int dockingThreshold; + + [XmlAttributeAttribute][DefaultValue(10)] + public virtual int DockingThreshold { + get { return dockingThreshold; } + set { + if (dockingThreshold == value) + return; + dockingThreshold = value; + NotifyValueChanged ("DockingThreshold", dockingThreshold); + + } + } + + public override void onMouseMove (object sender, MouseMoveEventArgs e) + { + if (CurrentInterface.DragAndDropOperation?.DragSource as DockWindow != null) { + DockWindow dw = CurrentInterface.DragAndDropOperation?.DragSource as DockWindow; + if (CurrentInterface.DragAndDropOperation.DragSource.Parent == this && !dw.IsDocked) + dw.MoveAndResize (e.XDelta, e.YDelta); + } + + + base.onMouseMove (sender, e); + } + } +} + diff --git a/src/GraphicObjects/Window.cs b/src/GraphicObjects/Window.cs index cb9498ff..b4a5f4c4 100644 --- a/src/GraphicObjects/Window.cs +++ b/src/GraphicObjects/Window.cs @@ -33,7 +33,7 @@ namespace Crow { public class Window : TemplatedContainer { - protected enum Direction + public enum Direction { None, N, @@ -196,6 +196,83 @@ namespace Crow // } #endregion + /// + /// Moves the and resize with the same function entry point, the direction give the kind of move or resize + /// + /// mouse delta on the X axis + /// mouse delta on the Y axis + /// Current Direction of the operation, none for moving, other value for resizing in the given direction + public void MoveAndResize (int XDelta, int YDelta, Direction currentDirection = (Direction)0) { + int currentLeft = this.Left; + int currentTop = this.Top; + int currentWidth, currentHeight; + + if (currentLeft == 0) { + currentLeft = this.Slot.Left; + this.Left = currentLeft; + } + if (currentTop == 0) { + currentTop = this.Slot.Top; + this.Top = currentTop; + } + if (this.Width.IsFixed) + currentWidth = this.Width; + else + currentWidth = this.Slot.Width; + + if (this.Height.IsFixed) + currentHeight = this.Height; + else + currentHeight = this.Slot.Height; + + switch (currentDirection) { + case Direction.None: + this.Left = currentLeft + XDelta; + this.Top = currentTop + YDelta; + break; + case Direction.N: + this.Height = currentHeight - YDelta; + if (this.Height == currentHeight - YDelta) + this.Top = currentTop + YDelta; + break; + case Direction.S: + this.Height = currentHeight + YDelta; + break; + case Direction.W: + this.Width = currentWidth - XDelta; + if (this.Width == currentWidth - XDelta) + this.Left = currentLeft + XDelta; + break; + case Direction.E: + this.Width = currentWidth + XDelta; + break; + case Direction.NW: + this.Height = currentHeight - YDelta; + if (this.Height == currentHeight - YDelta) + this.Top = currentTop + YDelta; + this.Width = currentWidth - XDelta; + if (this.Width == currentWidth - XDelta) + this.Left = currentLeft + XDelta; + break; + case Direction.NE: + this.Height = currentHeight - YDelta; + if (this.Height == currentHeight - YDelta) + this.Top = currentTop + YDelta; + this.Width = currentWidth + XDelta; + break; + case Direction.SW: + this.Width = currentWidth - XDelta; + if (this.Width == currentWidth - XDelta) + this.Left = currentLeft + XDelta; + this.Height = currentHeight + YDelta; + break; + case Direction.SE: + this.Height = currentHeight + YDelta; + this.Width = currentWidth + XDelta; + break; + } + } + #region GraphicObject Overrides public override void onMouseMove (object sender, MouseMoveEventArgs e) { @@ -211,74 +288,7 @@ namespace Crow if (this.HasFocus && _movable) { if (e.Mouse.IsButtonDown (MouseButton.Left)) { - int currentLeft = this.Left; - int currentTop = this.Top; - int currentWidth, currentHeight; - - if (currentLeft == 0) { - currentLeft = this.Slot.Left; - this.Left = currentLeft; - } - if (currentTop == 0) { - currentTop = this.Slot.Top; - this.Top = currentTop; - } - if (this.Width.IsFixed) - currentWidth = this.Width; - else - currentWidth = this.Slot.Width; - - if (this.Height.IsFixed) - currentHeight = this.Height; - else - currentHeight = this.Slot.Height; - - switch (currentDirection) { - case Direction.None: - this.Left = currentLeft + e.XDelta; - this.Top = currentTop + e.YDelta; - break; - case Direction.N: - this.Height = currentHeight - e.YDelta; - if (this.Height == currentHeight - e.YDelta) - this.Top = currentTop + e.YDelta; - break; - case Direction.S: - this.Height = currentHeight + e.YDelta; - break; - case Direction.W: - this.Width = currentWidth - e.XDelta; - if (this.Width == currentWidth - e.XDelta) - this.Left = currentLeft + e.XDelta; - break; - case Direction.E: - this.Width = currentWidth + e.XDelta; - break; - case Direction.NW: - this.Height = currentHeight - e.YDelta; - if (this.Height == currentHeight - e.YDelta) - this.Top = currentTop + e.YDelta; - this.Width = currentWidth - e.XDelta; - if (this.Width == currentWidth - e.XDelta) - this.Left = currentLeft + e.XDelta; - break; - case Direction.NE: - this.Height = currentHeight - e.YDelta; - if (this.Height == currentHeight - e.YDelta) - this.Top = currentTop + e.YDelta; - this.Width = currentWidth + e.XDelta; - break; - case Direction.SW: - this.Width = currentWidth - e.XDelta; - if (this.Width == currentWidth - e.XDelta) - this.Left = currentLeft + e.XDelta; - this.Height = currentHeight + e.YDelta; - break; - case Direction.SE: - this.Height = currentHeight + e.YDelta; - this.Width = currentWidth + e.XDelta; - break; - } + MoveAndResize (e.XDelta, e.YDelta, currentDirection); return; } } @@ -360,9 +370,6 @@ namespace Crow } Maximized.Raise (sender, e); - - - } protected void onUnmaximized (object sender, EventArgs e){ lock (CurrentInterface.LayoutMutex) {