diff options
| author | j-p <jp.bruyere@live.be> | 2018-04-14 12:15:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-14 12:15:08 +0200 |
| commit | 907358fed63b4a89e8dee5184cc9901a7107ab9f (patch) | |
| tree | 18c473a86b553dbe9f08cfe345b6278c71e9594e /src/GraphicObjects/Wrapper.cs | |
| parent | 7c735fa149bf23223eda734f19d5547797ca8ac2 (diff) | |
| parent | 5a06966fd4be89263988d0838556b78a7988b5a9 (diff) | |
Merge pull request #40 from jpbruyere/devel
Devel
Diffstat (limited to 'src/GraphicObjects/Wrapper.cs')
| -rw-r--r-- | src/GraphicObjects/Wrapper.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/GraphicObjects/Wrapper.cs b/src/GraphicObjects/Wrapper.cs index 4fff17ff..a7f5f73b 100644 --- a/src/GraphicObjects/Wrapper.cs +++ b/src/GraphicObjects/Wrapper.cs @@ -104,7 +104,7 @@ namespace Crow this.RegisterForLayouting (LayoutingType.Width); break; case LayoutingType.Height: - if (Orientation == Orientation.Vertical && go.Height.Units == Unit.Percent) { + if (Orientation == Orientation.Vertical && go.Height.IsRelativeToParent) { go.Height = Measure.Fit; return; } @@ -137,7 +137,7 @@ namespace Crow foreach (GraphicObject c in Children) { if (!c.Visible) continue; - if (c.Height.Units == Unit.Percent && + if (c.Height.IsRelativeToParent && c.RegisteredLayoutings.HasFlag (LayoutingType.Height)) { childrenRWLock.ExitReadLock(); return -1; @@ -172,7 +172,7 @@ namespace Crow foreach (GraphicObject c in Children) { if (!c.Visible) continue; - if (c.Width.Units == Unit.Percent && + if (c.Width.IsRelativeToParent && c.RegisteredLayoutings.HasFlag (LayoutingType.Width)) { childrenRWLock.ExitReadLock(); return -1; @@ -207,7 +207,7 @@ namespace Crow //if no layouting remains in queue for item, registre for redraw if (RegisteredLayoutings == LayoutingType.None && IsDirty) - CurrentInterface.EnqueueForRepaint (this); + IFace.EnqueueForRepaint (this); return true; } @@ -217,13 +217,13 @@ namespace Crow public override void OnLayoutChanges (LayoutingType layoutType) { #if DEBUG_LAYOUTING - CurrentInterface.currentLQI.Slot = LastSlots; - CurrentInterface.currentLQI.Slot = Slot; + IFace.currentLQI.Slot = LastSlots; + IFace.currentLQI.Slot = Slot; #endif switch (layoutType) { case LayoutingType.Width: foreach (GraphicObject c in Children) { - if (c.Width.Units == Unit.Percent) + if (c.Width.IsRelativeToParent) c.RegisterForLayouting (LayoutingType.Width); } if (Height == Measure.Fit) @@ -232,7 +232,7 @@ namespace Crow break; case LayoutingType.Height: foreach (GraphicObject c in Children) { - if (c.Height.Units == Unit.Percent) + if (c.Height.IsRelativeToParent) c.RegisterForLayouting (LayoutingType.Height); } if (Width == Measure.Fit) |