aboutsummaryrefslogtreecommitdiffstatsci
path: root/src/GraphicObjects
diff options
context:
space:
mode:
authorjpbruyere <jp.bruyere@hotmail.com>2017-03-21 13:48:50 +0100
committerjpbruyere <jp.bruyere@hotmail.com>2017-03-21 13:48:50 +0100
commit280ee7ff8429342575b47eff4ab88872399047d3 (patch)
tree8733c3b9be774be6b8f3a667d626d70832c6134e /src/GraphicObjects
parent6b96a03d1ac087cbd8c0d7c69699770adf143245 (diff)
Simplify z ordering of root objects in GraphicTree
modifié : src/GraphicObjects/Group.cs modifié : src/GraphicObjects/Window.cs modifié : src/Interface.cs
Diffstat (limited to 'src/GraphicObjects')
-rw-r--r--src/GraphicObjects/Group.cs40
-rw-r--r--src/GraphicObjects/Window.cs7
2 files changed, 23 insertions, 24 deletions
diff --git a/src/GraphicObjects/Group.cs b/src/GraphicObjects/Group.cs
index d00449cb..d4b5b62e 100644
--- a/src/GraphicObjects/Group.cs
+++ b/src/GraphicObjects/Group.cs
@@ -102,26 +102,26 @@ namespace Crow
ChildrenCleared.Raise (this, new EventArgs ());
}
- public void putWidgetOnTop(GraphicObject w)
- {
- if (Children.Contains(w))
- {
- lock (children) {
- Children.Remove (w);
- Children.Add (w);
- }
- }
- }
- public void putWidgetOnBottom(GraphicObject w)
- {
- if (Children.Contains(w))
- {
- lock (children) {
- Children.Remove (w);
- Children.Insert (0, w);
- }
- }
- }
+// public void putWidgetOnTop(GraphicObject w)
+// {
+// if (Children.Contains(w))
+// {
+// lock (children) {
+// Children.Remove (w);
+// Children.Add (w);
+// }
+// }
+// }
+// public void putWidgetOnBottom(GraphicObject w)
+// {
+// if (Children.Contains(w))
+// {
+// lock (children) {
+// Children.Remove (w);
+// Children.Insert (0, w);
+// }
+// }
+// }
#region GraphicObject overrides
public override void OnDataSourceChanged (object sender, DataSourceChangeEventArgs e)
diff --git a/src/GraphicObjects/Window.cs b/src/GraphicObjects/Window.cs
index e2820528..8a6903f6 100644
--- a/src/GraphicObjects/Window.cs
+++ b/src/GraphicObjects/Window.cs
@@ -150,11 +150,10 @@ namespace Crow
if (alwaysOnTop == value)
return;
alwaysOnTop = value;
- if (alwaysOnTop) {
+
+ if (alwaysOnTop && Parent != null)
CurrentInterface.PutOnTop (this);
- CurrentInterface.TopWindows++;
- }else
- CurrentInterface.TopWindows--;
+
NotifyValueChanged ("AlwaysOnTop", alwaysOnTop);
}
}