undo/redo, hscrollbar

diff --git a/Crow.csproj b/Crow.csproj
index 9e474f586f9110b61f3af9d36ca5b8b04a5769ab..f14b185af0869dc9e9ed68a328aa92291f6a2bbb 100644 (file)
--- a/Crow.csproj
+++ b/Crow.csproj
@@ -386,6 +386,9 @@
     <EmbeddedResource Include="Templates\DockWindow.template">
       <LogicalName>Crow.DockWindow.template</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="Templates\HScrollBar.template">
+      <LogicalName>Crow.HScrollBar.template</LogicalName>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <None Include="Crow.dll.config">

diff --git a/CrowIDE/CrowIDE.csproj b/CrowIDE/CrowIDE.csproj
index 1779b1d22b912b68fe1b1eef2994421065bbdeef..4f48ad0eda19d19f9dbc17872ee73701ac4e0a9e 100644 (file)
--- a/CrowIDE/CrowIDE.csproj
+++ b/CrowIDE/CrowIDE.csproj
@@ -253,6 +253,8 @@
     <EmbeddedResource Include="icons\compile.svg" />
     <EmbeddedResource Include="icons\edit.svg" />
     <EmbeddedResource Include="icons\text-file.svg" />
+    <EmbeddedResource Include="icons\undo.svg" />
+    <EmbeddedResource Include="icons\redo.svg" />
     <EmbeddedResource Include="ui\SourceEditor.crow" />
   </ItemGroup>
   <ItemGroup>

diff --git a/CrowIDE/icons/expand-arrows-1.svg b/CrowIDE/icons/expand-arrows-1.svg
new file mode 100644 (file)
index 0000000..d96d2ec
--- /dev/null
+++ b/CrowIDE/icons/expand-arrows-1.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generated by IcoMoon.io -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
+<path fill="#444444" d="M5.3 6.7l1.4-1.4-3-3 1.3-1.3h-4v4l1.3-1.3z"></path>
+<path fill="#444444" d="M6.7 10.7l-1.4-1.4-3 3-1.3-1.3v4h4l-1.3-1.3z"></path>
+<path fill="#444444" d="M10.7 9.3l-1.4 1.4 3 3-1.3 1.3h4v-4l-1.3 1.3z"></path>
+<path fill="#444444" d="M11 1l1.3 1.3-3 3 1.4 1.4 3-3 1.3 1.3v-4z"></path>
+</svg>

diff --git a/CrowIDE/icons/redo.svg b/CrowIDE/icons/redo.svg
new file mode 100644 (file)
index 0000000..5c177f0
--- /dev/null
+++ b/CrowIDE/icons/redo.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generated by IcoMoon.io -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
+<path fill="#444444" d="M16 7.9l-6-4.9v3c-0.5 0-1.1 0-2 0-8 0-8 8-8 8s1-4 7.8-4c1.1 0 1.8 0 2.2 0v2.9l6-5z"></path>
+</svg>

diff --git a/CrowIDE/icons/undo.svg b/CrowIDE/icons/undo.svg
new file mode 100644 (file)
index 0000000..955b767
--- /dev/null
+++ b/CrowIDE/icons/undo.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generated by IcoMoon.io -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
+<path fill="#444444" d="M0 7.9l6-4.9v3c0 0 1.1 0 2 0 8 0 8 8 8 8s-1-4-7.8-4c-1.1 0-1.8 0-2.2 0v2.9l-6-5z"></path>
+</svg>

diff --git a/CrowIDE/src/ProjectNodes.cs b/CrowIDE/src/ProjectNodes.cs
index 1524b3d22553a1faf804358eeac62aebf687b1d0..f96ec5cd1fb78cd2daad4e55da2ba35a3550fbc5 100644 (file)
--- a/CrowIDE/src/ProjectNodes.cs
+++ b/CrowIDE/src/ProjectNodes.cs
@@ -191,19 +191,30 @@ namespace Crow.Coding
                internal ReaderWriterLockSlim srcEditMtx = new ReaderWriterLockSlim();
 
                public Dictionary<object, bool> RegisteredEditors = new Dictionary<object, bool>();
+               List<String> undoStack = new List<string>();
+               List<String> redoStack = new List<string>();
 
-               Crow.Command cmdSave, cmdOpen;
+               public Crow.Command cmdSave, cmdSaveAs, cmdOpen, cmdUndo, cmdRedo;
 
                public ProjectFile (ProjectItem pi)
                        : base (pi.Project, pi.node) {
 
                        cmdSave = new Crow.Command (new Action (() => Save ()))
-                               { Caption = "Save", Icon = new SvgPicture ("#Crow.Coding.ui.icons.inbox.svg"), CanExecute = true };
+                       { Caption = "Save", Icon = new SvgPicture ("#Crow.Coding.ui.icons.inbox.svg"), CanExecute = false };
+                       cmdSave = new Crow.Command (new Action (() => SaveAs ()))
+                       { Caption = "Save As ..", Icon = new SvgPicture ("#Crow.Coding.ui.icons.inbox.svg"), CanExecute = false };
                        cmdOpen = new Crow.Command (new Action (() => Open ())) 
                                { Caption = "Open", Icon = new SvgPicture ("#Crow.Coding.ui.icons.outbox.svg"), CanExecute = false };
-
+                       cmdUndo = new Crow.Command (new Action (() => Undo (null))) 
+                       { Caption = "Undo", Icon = new SvgPicture ("#Crow.Coding.icons.undo.svg"), CanExecute = false };
+                       cmdRedo = new Crow.Command (new Action (() => Redo (null))) 
+                       { Caption = "Redo", Icon = new SvgPicture ("#Crow.Coding.icons.redo.svg"), CanExecute = false };
+                               
                        Commands.Insert (0, cmdOpen);
                        Commands.Insert (1, cmdSave);
+
+                       //Commands.Add (cmdUndo);
+                       //Commands.Add (cmdRedo);
                }
 
                public string ResourceID {
@@ -233,6 +244,9 @@ namespace Crow.Coding
                public void UpdateSource (object sender, string newSrc){
                        System.Diagnostics.Debug.WriteLine ("update source by {0}", sender);
                        Source = newSrc;
+                       signalOtherRegisteredEditors (sender);
+               }
+               void signalOtherRegisteredEditors (object sender) {
                        lock (RegisteredEditors) {
                                object[] keys = RegisteredEditors.Keys.ToArray ();
                                foreach (object editor in keys) {
@@ -259,11 +273,16 @@ namespace Crow.Coding
                                
                                srcEditMtx.EnterWriteLock ();
 
+                               undoStack.Add (source);
+                               cmdUndo.CanExecute = true;
+                               redoStack.Clear ();
+                               cmdRedo.CanExecute = false;
                                source = value;
+
                                NotifyValueChanged ("Source", source);
                                NotifyValueChanged ("IsDirty", IsDirty);
 
-                               cmdSave.CanExecute = IsDirty;
+                               cmdSave.CanExecute = cmdSaveAs.CanExecute = IsDirty;
 
                                srcEditMtx.ExitWriteLock ();
                        }
@@ -327,11 +346,69 @@ namespace Crow.Coding
                        origSource = source;
                        NotifyValueChanged ("IsDirty", false);
                }
+               public void SaveAs () {
+                       if (!IsDirty)
+                               return;
+                       using (StreamWriter sw = new StreamWriter (AbsolutePath)) {
+                               sw.Write (source);
+                       }
+                       origSource = source;
+                       NotifyValueChanged ("IsDirty", false);
+               }
                public void Close () {
                        origSource = null;
                        isOpened = false;
                        Project.solution.CloseItem (this);
                }
+               public void Undo(object sender){
+                       undo();
+                       signalOtherRegisteredEditors (sender);
+               }
+               public void Redo(object sender){
+                       redo();
+                       signalOtherRegisteredEditors (sender);
+               }
+
+               void undo () {                  
+                       if (undoStack.Count == 0)
+                               return;
+                       
+                       srcEditMtx.EnterWriteLock ();
+                       string step = undoStack [undoStack.Count -1];
+                       redoStack.Add (source);
+                       cmdRedo.CanExecute = true;
+                       undoStack.RemoveAt(undoStack.Count -1);
+
+                       source = step;
+
+                       NotifyValueChanged ("Source", source);
+                       NotifyValueChanged ("IsDirty", IsDirty);
+                       cmdSave.CanExecute = IsDirty;
+
+                       if (undoStack.Count == 0)
+                               cmdUndo.CanExecute = false;
+                       srcEditMtx.ExitWriteLock ();
+               }
+
+               void redo () {
+                       if (redoStack.Count == 0)
+                               return;
+                       srcEditMtx.EnterWriteLock ();
+                       string step = redoStack [redoStack.Count -1];
+                       undoStack.Add (source);
+                       cmdUndo.CanExecute = true;
+                       redoStack.RemoveAt(redoStack.Count -1);
+                       source = step;
+                       NotifyValueChanged ("Source", source);
+                       NotifyValueChanged ("IsDirty", IsDirty);
+                       cmdSave.CanExecute = IsDirty;
+
+                       if (redoStack.Count == 0)
+                               cmdRedo.CanExecute = false;
+                       srcEditMtx.ExitWriteLock ();
+
+               }
+
 
                public void OnQueryClose (object sender, EventArgs e){
                        if (IsDirty) {

diff --git a/CrowIDE/src/SourceEditor/SourceEditor.cs b/CrowIDE/src/SourceEditor/SourceEditor.cs
index 22666f53372b13dd3eaa7f683d7b8d169ce761ed..14538135419528b38a9497748023cc0864981590 100644 (file)
--- a/CrowIDE/src/SourceEditor/SourceEditor.cs
+++ b/CrowIDE/src/SourceEditor/SourceEditor.cs
@@ -208,9 +208,13 @@ namespace Crow.Coding
                        buffer.ToogleFolding (line);
                }
 
+               #region Editor overrides
                protected override void updateEditorFromProjFile ()
                {
+                       buffer.editMutex.EnterWriteLock ();
                        loadSource ();
+                       buffer.editMutex.ExitWriteLock ();
+
                        isDirty = false;
                        oldSource = projFile.Source;
                        CurrentLine = requestedLine;
@@ -231,6 +235,7 @@ namespace Crow.Coding
                protected override bool IsReady {
                        get { return buffer != null; }
                }
+               #endregion
 
                #region Buffer events handlers
                void Buffer_BufferCleared (object sender, EventArgs e)
@@ -830,6 +835,8 @@ namespace Crow.Coding
                        Foreground.SetAsSource (gr);
 
                        buffer.editMutex.EnterReadLock ();
+                       editorMutex.EnterReadLock ();
+
                        #region draw text cursor
                        if (buffer.SelectionInProgress){
                                selStartCol = getTabulatedColumn (buffer.SelectionStart);
@@ -843,8 +850,6 @@ namespace Crow.Coding
                        }
                        #endregion
 
-                       editorMutex.EnterReadLock ();
-
                        if (PrintedLines != null) {                             
                                int unfoldedLines = buffer.UnfoldedLines;
                                currentNode = null;
@@ -1001,6 +1006,17 @@ namespace Crow.Coding
                                case Key.S:
                                        projFile.Save ();
                                        break;
+                               case Key.W:
+                                       editorMutex.EnterWriteLock ();
+                                       if (e.Shift)
+                                               projFile.Redo (null);
+                                       else
+                                               projFile.Undo (null);
+                                       editorMutex.ExitWriteLock ();
+                                       break;
+                               default:
+                                       Console.WriteLine ("");
+                                       break;
                                }
                        }
 

diff --git a/CrowIDE/src/SvgEditor.cs b/CrowIDE/src/SvgEditor.cs
index dba622ead256f11f536c34596951b9a1c3591ea1..219eea67f263b46c241452feb0faa23c66d4b99a 100644 (file)
--- a/CrowIDE/src/SvgEditor.cs
+++ b/CrowIDE/src/SvgEditor.cs
@@ -33,18 +33,49 @@ namespace Crow.Coding
        {
                SvgPicture _pic = new SvgPicture();
 
+               int zoom;
+
+               [DefaultValue(100)]
+               public int Zoom {
+                       get { return zoom; }
+                       set {
+                               if (zoom == value)
+                                       return;
+                               zoom = value;
+                               NotifyValueChanged ("Zoom", zoom);
+                               updateMaxScrolls ();
+                               RegisterForGraphicUpdate ();
+                       }
+               }
+
+               void updateMaxScrolls() {                       
+                       MaxScrollX = Math.Max(0, _pic.Dimensions.Width * zoom / 100 - Slot.Width);
+                       MaxScrollY = Math.Max(0, _pic.Dimensions.Height * zoom / 100 - Slot.Height);
+
+                       if (Slot.Width + MaxScrollX > 0)
+                               NotifyValueChanged ("ChildWidthRatio", Slot.Width * Slot.Width / (Slot.Width + MaxScrollX));
+                       else
+                               NotifyValueChanged ("ChildWidthRatio", 0);
+                       
+                       if (Slot.Height + MaxScrollY > 0)
+                               NotifyValueChanged ("ChildHeightRatio", Slot.Height * Slot.Height / (Slot.Height + MaxScrollY));
+                       else
+                               NotifyValueChanged ("ChildHeightRatio", 0);
+               }
+               #region editor overrides
                protected override void updateEditorFromProjFile ()
                {
                        Error = null;
                        try {
                                editorMutex.EnterWriteLock();
                                _pic.LoadSvgFragment (projFile.Source);
-                               _pic.Scaled = false;
+                               _pic.Scaled = true;
                                _pic.KeepProportions = true;
                        } catch (Exception ex) {
                                Error = ex;
                        }
                        editorMutex.ExitWriteLock ();
+                       updateMaxScrolls ();
                        RegisterForGraphicUpdate ();
                }
                protected override void updateProjFileFromEditor ()
@@ -57,6 +88,7 @@ namespace Crow.Coding
                                throw new NotImplementedException ();
                        }
                }
+               #endregion
 
                #region GraphicObject overrides
                protected override int measureRawSize (LayoutingType lt)
@@ -74,10 +106,30 @@ namespace Crow.Coding
                {
                        base.onDraw (gr);
 
+                       Rectangle r = ClientRectangle;
+                       Foreground.SetAsSource (gr, r);
+                       gr.Rectangle (r, 0.1);
+                       gr.Stroke ();
+
+                       r.Width = _pic.Dimensions.Width * zoom / 100;
+                       r.Height = _pic.Dimensions.Height * zoom / 100;
+
+                       gr.Save ();
+
                        editorMutex.EnterReadLock ();
+
+                       gr.Translate (-ScrollX, -ScrollY);
                        if (_pic != null)
-                               _pic.Paint (gr, ClientRectangle);
+                               _pic.Paint (gr, r);
                        editorMutex.ExitReadLock ();
+
+                       gr.Restore ();
+               }
+               public override void OnLayoutChanges (LayoutingType layoutType)
+               {
+                       base.OnLayoutChanges (layoutType);
+                       if ((layoutType | LayoutingType.Sizing) > 0)
+                               updateMaxScrolls ();
                }
                #endregion
        }

diff --git a/CrowIDE/ui/CrowIDE.crow b/CrowIDE/ui/CrowIDE.crow
index 6d0565364890d3b857531b8b5dec9f4bf6c30f9f..02aa6fd8855414ee6d861ab2b1b3650d171aaab3 100644 (file)
--- a/CrowIDE/ui/CrowIDE.crow
+++ b/CrowIDE/ui/CrowIDE.crow
@@ -2,16 +2,16 @@
 <Window Height="Stretched" Width="Stretched" >
        <VerticalStack>
                <Menu>
-                       <MenuItem Caption="File" Width="Fit" PopWidth="120">
+                       <MenuItem Caption="File" Width="Fit" PopWidth="120" DataSource="{CurrentSolution}">
                                <MenuItem Command="{CMDNew}" />
                                <MenuItem Command="{CMDOpen}" />
-                               <MenuItem Command="{CMDSave}" />
-                               <MenuItem Command="{CMDSaveAs}" />
+                               <MenuItem DataSource="{SelectedItem}" Command="{cmdSave}" />
+                               <MenuItem DataSource="{SelectedItem}" Command="{cmdSaveAs}" />
                                <MenuItem Command="{CMDQuit}" />
                        </MenuItem>
-                       <MenuItem Caption="Edit" Name="edit" Width="Fit" PopWidth="100">
-                               <MenuItem Command="{CMDUndo}" />
-                               <MenuItem Command="{CMDRedo}" />
+                       <MenuItem Caption="Edit" Name="edit" Width="Fit" PopWidth="100" DataSource="{CurrentSolution}">
+                               <MenuItem DataSource="{SelectedItem}" Command="{cmdUndo}" />
+                               <MenuItem DataSource="{SelectedItem}" Command="{cmdRedo}" />
                                <MenuItem Command="{CMDCut}" />
                                <MenuItem Command="{CMDCopy}" />
                                <MenuItem Command="{CMDPaste}" />

diff --git a/CrowIDE/ui/EditPaneItems.template b/CrowIDE/ui/EditPaneItems.template
index 1279af9ee594d4da4da08dfcae1f796cd5cb9eba..d0c0922fbc8968af45928a601b35dfc327af5381 100644 (file)
--- a/CrowIDE/ui/EditPaneItems.template
+++ b/CrowIDE/ui/EditPaneItems.template
@@ -8,18 +8,25 @@
        <TabItem Caption="{DisplayName}" QueryClose="OnQueryClose">
                <VerticalStack>
                        <HorizontalStack Height="50%" >
-                               <SvgEditor ProjectNode="{}" Focusable="true" Name="editor"/>
+                               <SvgEditor Margin="10" ProjectNode="{}" Focusable="true" Name="editor" MouseWheelSpeed="20" Foreground="Black"/>
                                <ScrollBar Name="scrollbarY" Value="{²../editor.ScrollY}"
-                                                  LargeIncrement="{../editor.VisibleLines}"
+                                                  LargeIncrement="10"
                                                   CursorSize="{../editor.ChildHeightRatio}"
                                        Maximum="{../editor.MaxScrollY}" Orientation="Vertical"
                                        Width="14" />
                        </HorizontalStack>
-                       <ScrollBar Name="scrollbarX" Value="{²../editor.ScrollX}"
+                       <ScrollBar Style="HScrollBar" Name="scrollbarX" Value="{²../editor.ScrollX}"
                                        Maximum="{../editor.MaxScrollX}" Orientation="Horizontal"
-                                       LargeIncrement="{../editor.VisibleColumns}"
+                                       LargeIncrement="10"
                                        CursorSize="{../editor.ChildWidthRatio}"
-                                       Height="14" />  
+                                       Height="14" />
+                       <HorizontalStack Height="Fit" Margin="3">
+                               <Label Text="Zoom:"/>
+                               <Label Text="{../../editor.Zoom}" Fit="true"/>
+                               <!--<Spinner Name="sldZoom" Value="{²../../editor.Zoom}" Maximum="800" Minimum="1" SmallIncrement="10" LargeIncrement="50" Width="40" />-->
+                               <Slider Value="{²../../editor.Zoom}" CursorSize="2" Height="8" Maximum="800" Minimum="1" SmallIncrement="1" LargeIncrement="10" Width="100" />
+                       </HorizontalStack>
+
                        <Splitter/>
                        <IMLContainer Path="#Crow.Coding.ui.SourceEditor.crow"/>
                        <Label DataSource="{../editor.Error}" Text="{Message}"

diff --git a/CrowIDE/ui/SourceEditor.crow b/CrowIDE/ui/SourceEditor.crow
index 3d364efb07a01027a276669909726ecd39235a79..75136ef23b89dcdce4ed4db7448b5277542c98d4 100644 (file)
--- a/CrowIDE/ui/SourceEditor.crow
+++ b/CrowIDE/ui/SourceEditor.crow
@@ -11,7 +11,7 @@
                        Maximum="{../editor.MaxScrollY}" Orientation="Vertical"
                        Width="14" />
        </HorizontalStack>
-       <ScrollBar Name="scrollbarX" Value="{²../editor.ScrollX}"
+       <ScrollBar Style="HScrollBar" Name="scrollbarX" Value="{²../editor.ScrollX}"
                        Maximum="{../editor.MaxScrollX}" Orientation="Horizontal"
                        LargeIncrement="{../editor.VisibleColumns}"
                        CursorSize="{../editor.ChildWidthRatio}"

diff --git a/Default.style b/Default.style
index 5cb1aad68a0c766fdbe70379740736e5130d7cdd..0c9fe38f17279cc5c9118b8e76750afb26ab3335 100644 (file)
--- a/Default.style
+++ b/Default.style
@@ -148,6 +148,11 @@ ScrollBar {
        Maximum = "0";
        Value = "0";
 }
+HScrollBar {
+       Template = "#Crow.HScrollBar.template";
+       Maximum = "0";
+       Value = "0";
+}
 Scroller {
        CacheEnabled = "false";
 }
@@ -193,4 +198,16 @@ ArrowBut {
        MouseUp="{Background=hgradient|0:Gray|1:Jet}";
        MouseEnter="{Foreground=Black}";
        MouseLeave="{Foreground=Jet}";
+}
+HArrowBut {
+       MouseRepeat="true";
+       Height="Fit";
+       Width="Fit";
+       Focusable="true";
+       Foreground="Jet";
+       Background="vgradient|0:Gray|1:Jet";
+       MouseDown="{Background=vgradient|0:White|0.4:BlueCrayola|1:Jet}";
+       MouseUp="{Background=vgradient|0:Gray|1:Jet}";
+       MouseEnter="{Foreground=Black}";
+       MouseLeave="{Foreground=Jet}";
 }
\ No newline at end of file

diff --git a/Templates/HScrollBar.template b/Templates/HScrollBar.template
new file mode 100755 (executable)
index 0000000..57f575c
--- /dev/null
+++ b/Templates/HScrollBar.template
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<Border BorderWidth="1" Foreground="Jet">
+       <GenericStack Orientation="{./Orientation}" Spacing="0">
+               <Shape Style="HArrowBut"        MouseDown="./onScrollBack" Path="M 0.5,5.5 L 10.5,0.5 L 10.5,10.5 Z"/>
+               <Slider Name="Slider"                   
+                       Orientation="{./Orientation}"
+                       Value="{²./Value}"
+                       Maximum="{./Maximum}"
+                       CursorSize="{./CursorSize}"
+                       Height="{./HeightPolicy}" Width="{./WidthPolicy}"
+                       LargeIncrement="{./LargeIncrement}"
+                       SmallIncrement="{./SmallIncrement}"
+                       CursorColor="vgradient|0:Gray|1:Jet"
+                       Foreground="Jet"
+                       Background="vgradient|0:DimGray|0.1:Gray|0.95:Gray|1:White"/>
+               <Shape Style="HArrowBut" MouseDown="./onScrollForth" Path="M 0.5,0.5 L 10.5,5.5 L 0.5,10.5 Z"/>
+       </GenericStack>
+</Border>
\ No newline at end of file

diff --git a/src/GraphicObjects/FileDialog.cs b/src/GraphicObjects/FileDialog.cs
index 8f1a0830e675afd5b2e62315a7fa40505eb0fcfb..8069b8a7607acee43dd26591858f9a513dfdb9dc 100644 (file)
--- a/src/GraphicObjects/FileDialog.cs
+++ b/src/GraphicObjects/FileDialog.cs
@@ -149,6 +149,7 @@ namespace Crow
                void onCancel(object sender, MouseButtonEventArgs e){
                        IFace.DeleteWidget (this);
                }
+
        }
 }
 

diff --git a/src/GraphicObjects/Slider.cs b/src/GraphicObjects/Slider.cs
index 2e4a5fef73fcc0a2a2ec25c3ebc23faf543a30d2..59eb99ece0b24ae2bd7729c9d0eddf28529768e9 100644 (file)
--- a/src/GraphicObjects/Slider.cs
+++ b/src/GraphicObjects/Slider.cs
@@ -68,7 +68,7 @@ namespace Crow
                protected double unity;
 
                #region Public properties
-               [XmlAttributeAttribute()][DefaultValue("vgradient|0:White|0,1:LightGray|0,9:LightGray|1:DimGray")]
+               [DefaultValue("vgradient|0:White|0,1:LightGray|0,9:LightGray|1:DimGray")]
                public virtual Fill CursorColor {
                        get { return _cursorColor; }
                        set {
@@ -79,7 +79,7 @@ namespace Crow
                                NotifyValueChanged ("CursorColor", _cursorColor);
                        }
                }
-               [XmlAttributeAttribute()][DefaultValue(20)]
+               [DefaultValue(20)]
                public virtual int CursorSize {
                        get { return _cursorSize; }
                        set {
@@ -90,7 +90,7 @@ namespace Crow
                                NotifyValueChanged ("CursorSize", _cursorSize);
                        }
                }
-               [XmlAttributeAttribute()][DefaultValue(Orientation.Horizontal)]
+               [DefaultValue(Orientation.Horizontal)]
                public virtual Orientation Orientation
                {
                        get { return _orientation; }
@@ -105,7 +105,7 @@ namespace Crow
                }
                #endregion
 
-               [XmlAttributeAttribute()][DefaultValue(10.0)]
+               [DefaultValue(10.0)]
                public override double Maximum {
                        get { return base.Maximum; }
                        set {                           

diff --git a/src/Interface.cs b/src/Interface.cs
index eb4caefaaf5beafc7702515fd9fc53c8b27dd6e2..f17ac89515b54581b08b7eb32b385dd72490b1b2 100644 (file)
--- a/src/Interface.cs
+++ b/src/Interface.cs
@@ -1131,15 +1131,16 @@ namespace Crow
                MenuItem ctxMenuContainer;
                protected void initContextMenus (){
                        ctxMenuContainer = Load  ("#Crow.ContextMenu.template") as MenuItem;
+                       ctxMenuContainer.LayoutChanged += CtxMenuContainer_LayoutChanged;
                }
 
                void CtxMenuContainer_LayoutChanged (object sender, LayoutingEventArgs e)
                {
                        Rectangle r = ctxMenuContainer.ScreenCoordinates (ctxMenuContainer.Slot);
-                       if (e.LayoutType == LayoutingType.Width) {
+                       if (e.LayoutType == LayoutingType.Width || e.LayoutType == LayoutingType.X) {
                                if (r.Right > this.clientRectangle.Right)
                                        ctxMenuContainer.Left = this.clientRectangle.Right - ctxMenuContainer.Slot.Width;
-                       }else if (e.LayoutType == LayoutingType.Width) {
+                       }else if (e.LayoutType == LayoutingType.Width || e.LayoutType == LayoutingType.Y) {
                                if (r.Bottom > this.clientRectangle.Bottom)
                                        ctxMenuContainer.Top = this.clientRectangle.Bottom - ctxMenuContainer.Slot.Height;
                        }