]> O.S.I.I.S - jp/crow.git/commitdiff
docking
authorJean-Philippe Bruyère <jp_bruyere@hotmail.com>
Mon, 19 Feb 2018 13:02:08 +0000 (14:02 +0100)
committerJean-Philippe Bruyère <jp_bruyere@hotmail.com>
Mon, 19 Feb 2018 13:02:08 +0000 (14:02 +0100)
Crow.csproj
Default.style
Templates/DockWindow.template [new file with mode: 0755]
Tests/Interfaces/Divers/testDock.crow [new file with mode: 0644]
Tests/Tests.csproj
src/GraphicObjects/DockWindow.cs [new file with mode: 0644]
src/GraphicObjects/Docker.cs [new file with mode: 0644]
src/GraphicObjects/Window.cs

index bb4a9bbec2419c4165a262fc209fa7779dadeba4..f9c42c852c99cc8f62346f39e3a5abe89c607375 100644 (file)
     <Compile Include="src\ObservableList.cs" />
     <Compile Include="src\GraphicObjects\IMLContainer.cs" />
     <Compile Include="src\DragDropEventArgs.cs" />
+    <Compile Include="src\GraphicObjects\Docker.cs" />
+    <Compile Include="src\GraphicObjects\DockWindow.cs" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
     <EmbeddedResource Include="Icons\compiler_error.svg" />
     <EmbeddedResource Include="Icons\project.svg" />
     <EmbeddedResource Include="Icons\projectRef.svg" />
+    <EmbeddedResource Include="Templates\DockWindow.template">
+      <LogicalName>Crow.DockWindow.template</LogicalName>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <None Include="Crow.dll.config">
index 887ecc9fd8fa28fefa5d041dea2bc47212a81bfb..11a221917fd7b7c978928b515049e907d69e5bf2 100644 (file)
@@ -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 (executable)
index 0000000..0a3b4e0
--- /dev/null
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<Border BorderWidth="1" Foreground="White" CornerRadius="{./CornerRadius}"
+                               Background="{./Background}"
+                               MouseEnter="./onBorderMouseEnter"
+                               MouseLeave="./onBorderMouseLeave">
+       <VerticalStack Spacing="0">
+<!--           <Border Name="TitleBar" BorderWidth="1" Foreground="White" Width="{./WidthPolicy}" Height="Fit"
+                               Background="vgradient|0:0.4,0.6,0.0,0.5|1:0.0,0.8,0.8,0.9">-->
+                       <HorizontalStack Background="vgradient|0:0.5,0.6,0.5,0.5|1:0.2,0.3,0.3,0.7"
+                                       Name="hs" Margin="2" Spacing="0" Height="Fit">
+                               <GraphicObject Width="5"/>
+                               <Image Margin="1" Width="12" Height="12" Path="{./Icon}"/>
+                               <Label Width="Stretched" Foreground="White" Margin="1" TextAlignment="Center" Text="{./Caption}" />
+                               <Border CornerRadius="6" BorderWidth="1" Foreground="Transparent"  Height="12" Width="12"
+                                       MouseEnter="{Foreground=White}" MouseLeave="{Foreground=Transparent}">
+                                       <Image Focusable="true" Name="Image" Margin="0" Width="Stretched" Height="Stretched" Path="#Crow.Images.Icons.exit2.svg"
+                                                MouseClick="./butQuitPress"/>
+                               </Border>
+                               <GraphicObject Width="5"/>
+                       </HorizontalStack>
+<!--           </Border>-->
+               <Container Name="Content" MinimumSize="50,50" Background="0.5,0.5,0.5,0.5"/>
+       </VerticalStack>
+</Border>
diff --git a/Tests/Interfaces/Divers/testDock.crow b/Tests/Interfaces/Divers/testDock.crow
new file mode 100644 (file)
index 0000000..3dc9a6e
--- /dev/null
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<Docker Background="Jet" Margin = "0" Focusable="true" >
+       <DockWindow Focusable="true" Caption="View 1" Width="100" Height="100"><GraphicObject Background="Green"/></DockWindow>
+       <DockWindow Focusable="true" Caption="View 2" Resizable = "true" Width="100" Height="100"><GraphicObject Background="Blue"/></DockWindow>
+       <DockWindow Focusable="true" Caption="View 3" Resizable = "true" Width="100" Height="100"><GraphicObject Background="Yellow"/></DockWindow>
+       <DockWindow Focusable="true" Caption="View 4" Resizable = "true" Width="100" Height="100"><GraphicObject Background="Black"/></DockWindow>
+</Docker>
\ No newline at end of file
index e5cccb5c931f54302a1b3303873bfda37f8a798f..9a63b7d075ff828acbb0f3e4c0fbfa8914bef8f7 100644 (file)
     <None Include="Interfaces\Divers\3.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="Interfaces\Divers\testDock.crow">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="Interfaces\TemplatedContainer\0.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
diff --git a/src/GraphicObjects/DockWindow.cs b/src/GraphicObjects/DockWindow.cs
new file mode 100644 (file)
index 0000000..5e066f3
--- /dev/null
@@ -0,0 +1,208 @@
+//
+// DockingView.cs
+//
+// Author:
+//       Jean-Philippe Bruyère <jp.bruyere@hotmail.com>
+//
+// 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 (file)
index 0000000..57b4939
--- /dev/null
@@ -0,0 +1,67 @@
+//
+// DocksView.cs
+//
+// Author:
+//       Jean-Philippe Bruyère <jp.bruyere@hotmail.com>
+//
+// 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);
+               }
+       }
+}
+
index cb9498ff8c2779760e162968fe05ee8b8fbef1c6..b4a5f4c4e647b0c905f24ddba46fad5322e816a8 100644 (file)
@@ -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
 
+               /// <summary>
+               /// Moves the and resize with the same function entry point, the direction give the kind of move or resize
+               /// </summary>
+               /// <param name="XDelta">mouse delta on the X axis</param>
+               /// <param name="YDelta">mouse delta on the Y axis</param>
+               /// <param name="currentDirection">Current Direction of the operation, none for moving, other value for resizing in the given direction</param>
+               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) {