folding level

diff --git a/Images/screenshot.png b/Images/screenshot.png
index 23be2ad432154ac8c29f222ca54b1e09284375a3..e2f802f2f7177c4fc6b361d80196cb89e6a84cde 100644 (file)
Binary files a/Images/screenshot.png and b/Images/screenshot.png differ

diff --git a/Templates/DockWindow.template b/Templates/DockWindow.template
index 3e5b499adecc306530e2fa2fd6afee1582c59cc6..56afd3ebd8460e81afa36889f96bb4f94dc8d7a3 100755 (executable)
--- a/Templates/DockWindow.template
+++ b/Templates/DockWindow.template
@@ -1,15 +1,16 @@
 <?xml version="1.0"?>
 <!--<GraphicObject Background="{./Background}"/>-->
-<Border BorderWidth="1" Foreground="White" CornerRadius="{./CornerRadius}"
+<Border BorderWidth="1" Foreground="Black" CornerRadius="{./CornerRadius}"
                                Background="{./Background}"
                                MouseEnter="./onBorderMouseEnter"
                                MouseLeave="./onBorderMouseLeave">
        <VerticalStack Spacing="0">
+               <Label Visible="{./IsDocked}" Width="Stretched" Foreground="White" Margin="0" TextAlignment="Left" Text="{./Caption}" />
                <HorizontalStack Background="vgradient|0:0.5,0.6,0.5,0.5|1:0.2,0.3,0.3,0.7"
-                               Name="hs" Margin="0" Spacing="0" Height="Fit">
+                               Name="hs" Margin="0" Spacing="0" Height="Fit" Visible="{./IsFloating}">
                        <GraphicObject Width="5"/>
                        <Image Margin="1" Width="10" Height="10" Path="{./Icon}"/>
-                       <Label Width="Stretched" Foreground="White" Margin="1" TextAlignment="Center" Text="{./Caption}" />
+                       <Label Width="Stretched" Foreground="White" Margin="1" TextAlignment="Left" Text="{./Caption}" />
                        <Border CornerRadius="6" BorderWidth="1" Foreground="Transparent"  Height="10" Width="10"
                                MouseEnter="{Foreground=White}" MouseLeave="{Foreground=Transparent}">
                                <Image Focusable="true" Name="Image" Margin="0" Width="Stretched" Height="Stretched" Path="#Crow.Images.Icons.exit2.svg"

diff --git a/src/GraphicObjects/DockWindow.cs b/src/GraphicObjects/DockWindow.cs
index 34290a2e613a0a2b0dbfb7eb07936ba25941b914..e3dc2b9fbe156f3a4c5027ab961d08575fb3d153 100644 (file)
--- a/src/GraphicObjects/DockWindow.cs
+++ b/src/GraphicObjects/DockWindow.cs
@@ -24,6 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
+using System.Xml.Serialization;
 
 namespace Crow
 {
@@ -52,8 +53,11 @@ namespace Crow
                                        return;
                                isDocked = value;
                                NotifyValueChanged ("IsDocked", isDocked);
+                               NotifyValueChanged ("IsFloating", !isDocked);
                        }
                }
+               [XmlIgnore] public bool IsFloating { get { return !isDocked; }}
+
                public Alignment DockingPosition {
                        get { return docking; }
                        set {
@@ -125,7 +129,7 @@ namespace Crow
                protected override void onDrop (object sender, DragDropEventArgs e)
                {
                        if (!isDocked && DockingPosition != Alignment.Undefined)
-                               dock (e.DropTarget as DockStack);
+                               Dock (e.DropTarget as DockStack);
                        base.onDrop (sender, e);
                }
                public void Undock () {
@@ -146,7 +150,7 @@ namespace Crow
                        }
                }
 
-               void dock (DockStack target){
+               public void Dock (DockStack target){
                        lock (IFace.UpdateMutex) {
                                IsDocked = true;
                                //undockingMousePosOrig = lastMousePos;