]> O.S.I.I.S - jp/crow.git/commitdiff
first try with simple docking view
authorjpbruyere <jp.bruyere@hotmail.com>
Mon, 24 Apr 2017 08:25:22 +0000 (10:25 +0200)
committerJean-Philippe Bruyère <jp_bruyere@hotmail.com>
Thu, 1 Feb 2018 06:41:06 +0000 (07:41 +0100)
Crow.csproj
Templates/DockingView.template [new file with mode: 0755]
Tests/Interfaces/Divers/welcome.crow
src/GraphicObjects/DockingView.cs [new file with mode: 0644]
src/GraphicObjects/DocksView.cs [new file with mode: 0644]
src/GraphicObjects/Window.cs

index 4edb707b05714f81a3ecb9c5411f78e77024b426..4ca2f5d006b4cf1b666a4a268c0e7a7888d68fac 100644 (file)
     <Compile Include="src\Mono.Cairo\Win32Surface.cs" />
     <Compile Include="src\Mono.Cairo\XcbSurface.cs" />
     <Compile Include="src\Mono.Cairo\XlibSurface.cs" />
+    <Compile Include="src\GraphicObjects\DocksView.cs" />
+    <Compile Include="src\GraphicObjects\DockingView.cs" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
     <EmbeddedResource Include="Icons\folder.svg" />
     <EmbeddedResource Include="Icons\file.svg" />
     <EmbeddedResource Include="Icons\level-up.svg" />
+    <EmbeddedResource Include="Templates\DockingView.template">
+      <LogicalName>Crow.DockingView.template</LogicalName>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <None Include="Crow.dll.config">
diff --git a/Templates/DockingView.template b/Templates/DockingView.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>
index c4ec889f11bd47b92949ea2d2ce2baeecdeb948f..4a38c4330f81fb75a0702855acac81b2dfe496a9 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<VerticalStack Fit="true" VerticalAlignment="Top" Background="0.7,0.7,0.7,0.5"
-       Margin="10" CornerRadius="10">
-       <Label Font="20" Text="Press &lt;F3&gt; to cycle into the examples"/>
-       <Label Font="20" Text="Those are basic tests used to validate changes"/>
-       <Label Font="20" Text="{fps}"/>
-</VerticalStack>
\ No newline at end of file
+<DocksView Background="Jet" Margin = "0">
+       <DockingView Focusable="true" Caption="View 1" Width="100" Height="100"/>
+       <DockingView Focusable="true" Resizable = "true" Caption="View 2" Width="100" Height="100"/>
+       <DockingView Focusable="true" Resizable = "true" Caption="View 3" Width="100" Height="100"/>
+       <DockingView Focusable="true" Resizable = "true" Caption="View 4" Width="100" Height="100"/>
+</DocksView>
\ No newline at end of file
diff --git a/src/GraphicObjects/DockingView.cs b/src/GraphicObjects/DockingView.cs
new file mode 100644 (file)
index 0000000..b0fe294
--- /dev/null
@@ -0,0 +1,200 @@
+//
+// 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 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 (file)
index 0000000..6c4d32d
--- /dev/null
@@ -0,0 +1,55 @@
+//
+// 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 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);
+
+                       }
+               } 
+       }
+}
+
index 336784e29fba7ad51f5a76b5e17942ad40eb496b..d1f3437483c4f7a550572667fde44014b3d846d3 100644 (file)
@@ -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;
                }