diff options
| author | Jean-Philippe Bruyère <jp_bruyere@hotmail.com> | 2018-03-05 08:46:03 +0100 |
|---|---|---|
| committer | Jean-Philippe Bruyère <jp_bruyere@hotmail.com> | 2018-03-05 08:46:03 +0100 |
| commit | 3726ed97fabc1d4614ef2adc5592d21ef1147e9f (patch) | |
| tree | cb0b690bc04c43f4e6c851a13b459d0001b6c47f /src | |
| parent | 8a535547c868dfeb38143e5836b02f9ac4f56354 (diff) | |
first test with docker in CrowIDE
Diffstat (limited to 'src')
| -rw-r--r-- | src/GraphicObjects/DockStack.cs | 27 | ||||
| -rw-r--r-- | src/GraphicObjects/Docker.cs | 6 | ||||
| -rw-r--r-- | src/GraphicObjects/Splitter.cs | 2 |
3 files changed, 12 insertions, 23 deletions
diff --git a/src/GraphicObjects/DockStack.cs b/src/GraphicObjects/DockStack.cs index 79643b47..c06be42a 100644 --- a/src/GraphicObjects/DockStack.cs +++ b/src/GraphicObjects/DockStack.cs @@ -29,10 +29,8 @@ using Crow.IML; namespace Crow { public class DockStack : GenericStack - { - internal static Instantiator instStack, instSplit;//, instSpacer; - - int dockingDiv = 5; + { + int dockingDiv = 6; GraphicObject subStack = null; Docker rootDock { get { return LogicalParent as Docker; }} @@ -47,14 +45,6 @@ namespace Crow public DockStack (Interface iface) : base (iface) {} #endregion - protected override void onInitialized (object sender, EventArgs e) - { - base.onInitialized (sender, e); - instStack = IFace.CreateITorFromIMLFragment (@"<DockStack/>"); - instSplit = IFace.CreateITorFromIMLFragment (@"<Splitter/>"); - //instSpacer = IFace.CreateITorFromIMLFragment (@"<GraphicObject Background='Transparent' IsEnabled='false'/>"); - } - public override void AddChild (GraphicObject g) { base.AddChild (g); @@ -236,8 +226,7 @@ namespace Crow dsp.SubStack = SubStack; return; } - public void Dock(DockWindow dw){ - Splitter splitter = instSplit.CreateInstance<Splitter> (); + public void Dock(DockWindow dw){ Rectangle r = ClientRectangle; int vTreshold = r.Height / dockingDiv; @@ -249,7 +238,7 @@ namespace Crow activeStack = this; Orientation = dw.DockingPosition.GetOrientation (); }else if (dw.DockingPosition.GetOrientation() != Orientation) { - activeStack = instStack.CreateInstance<DockStack> (); + activeStack = new DockStack (IFace); int ci = Children.IndexOf (rootDock.CenterDockedObj); if (ci <0 ){ DockStack dsp = Parent as DockStack; @@ -284,24 +273,24 @@ namespace Crow dw.Height = vTreshold; dw.Width = Measure.Stretched; activeStack.InsertChild (0, dw); - activeStack.InsertChild (1, splitter); + activeStack.InsertChild (1, new Splitter(IFace)); break; case Alignment.Bottom: dw.Height = vTreshold; dw.Width = Measure.Stretched; - activeStack.AddChild (splitter); + activeStack.AddChild (new Splitter(IFace)); activeStack.AddChild (dw); break; case Alignment.Left: dw.Width = hTreshold; dw.Height = Measure.Stretched; activeStack.InsertChild (0, dw); - activeStack.InsertChild (1, splitter); + activeStack.InsertChild (1, new Splitter(IFace)); break; case Alignment.Right: dw.Width = hTreshold; dw.Height = Measure.Stretched; - activeStack.AddChild (splitter); + activeStack.AddChild (new Splitter(IFace)); activeStack.AddChild (dw); break; case Alignment.Center: diff --git a/src/GraphicObjects/Docker.cs b/src/GraphicObjects/Docker.cs index 3803d8dd..6c55e34e 100644 --- a/src/GraphicObjects/Docker.cs +++ b/src/GraphicObjects/Docker.cs @@ -71,9 +71,9 @@ namespace Crow } public override void RemoveChild (GraphicObject child) { - lock (IFace.UpdateMutex) { - RegisterClip (ScreenCoordinates (LastPaintedSlot)); - } +// lock (IFace.UpdateMutex) { +// RegisterClip (ScreenCoordinates (LastPaintedSlot)); +// } base.RemoveChild (child); } diff --git a/src/GraphicObjects/Splitter.cs b/src/GraphicObjects/Splitter.cs index e8aa60f8..59a70d25 100644 --- a/src/GraphicObjects/Splitter.cs +++ b/src/GraphicObjects/Splitter.cs @@ -43,7 +43,7 @@ namespace Crow int thickness; - [XmlAttributeAttribute][DefaultValue(1)] + [XmlAttributeAttribute][DefaultValue(3)] public virtual int Thickness { get { return thickness; } set { |