aboutsummaryrefslogtreecommitdiffstatsci
path: root/src/GraphicObjects
diff options
context:
space:
mode:
Diffstat (limited to 'src/GraphicObjects')
-rw-r--r--src/GraphicObjects/GraphicObject.cs26
-rw-r--r--src/GraphicObjects/Group.cs4
-rw-r--r--src/GraphicObjects/ILayoutable.cs2
-rw-r--r--src/GraphicObjects/Popper.cs10
-rw-r--r--src/GraphicObjects/Splitter.cs6
-rw-r--r--src/GraphicObjects/TabView.cs4
-rw-r--r--src/GraphicObjects/Window.cs6
7 files changed, 25 insertions, 33 deletions
diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs
index 9f1bf811..56b50684 100644
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/GraphicObject.cs
@@ -128,9 +128,7 @@ namespace Crow
return cb;
}
}
- [XmlIgnore]public virtual IGOLibHost HostContainer {
- get { return Parent == null ? null : Parent.HostContainer; }
- }
+
public virtual Rectangle ContextCoordinates(Rectangle r){
GraphicObject go = Parent as GraphicObject;
if (go == null)
@@ -374,12 +372,12 @@ namespace Crow
_isVisible = value;
- if (HostContainer == null)
+ if (Interface.CurrentInterface == null)
return;
//ensure main win doesn't keep hidden childrens ref
- if (!_isVisible && this.Contains (HostContainer.hoverWidget))
- HostContainer.hoverWidget = null;
+ if (!_isVisible && this.Contains (Interface.CurrentInterface.hoverWidget))
+ Interface.CurrentInterface.hoverWidget = null;
if (Parent is GraphicObject)
Parent.RegisterForLayouting (LayoutingType.Sizing);
@@ -645,9 +643,9 @@ namespace Crow
{
if (IsQueuedForRedraw)
return;
- if (HostContainer == null)
+ if (Interface.CurrentInterface == null)
return;
- HostContainer.gobjsToRedraw.Add (this);
+ Interface.CurrentInterface.gobjsToRedraw.Add (this);
IsQueuedForRedraw = true;
}
@@ -957,9 +955,8 @@ namespace Crow
}
public virtual void checkHoverWidget(MouseMoveEventArgs e)
{
- IGOLibHost glh = HostContainer;
- if (glh.hoverWidget != this) {
- glh.hoverWidget = this;
+ if (Interface.CurrentInterface.hoverWidget != this) {
+ Interface.CurrentInterface.hoverWidget = this;
onMouseEnter (this, e);
}
@@ -975,14 +972,13 @@ namespace Crow
MouseMove.Raise (sender, e);
}
public virtual void onMouseDown(object sender, MouseButtonEventArgs e){
- IGOLibHost hc = HostContainer;
- if (hc.activeWidget == null)
- hc.activeWidget = this;
+ if (Interface.CurrentInterface.activeWidget == null)
+ Interface.CurrentInterface.activeWidget = this;
if (this.Focusable && !Interface.FocusOnHover) {
BubblingMouseButtonEventArg be = e as BubblingMouseButtonEventArg;
if (be.Focused == null) {
be.Focused = this;
- hc.FocusedWidget = this;
+ Interface.CurrentInterface.FocusedWidget = this;
}
}
//bubble event to the top
diff --git a/src/GraphicObjects/Group.cs b/src/GraphicObjects/Group.cs
index 887d9e22..869ec113 100644
--- a/src/GraphicObjects/Group.cs
+++ b/src/GraphicObjects/Group.cs
@@ -305,8 +305,8 @@ namespace Crow
#region Mouse handling
public override void checkHoverWidget (MouseMoveEventArgs e)
{
- if (HostContainer.hoverWidget != this) {
- HostContainer.hoverWidget = this;
+ if (Interface.CurrentInterface.hoverWidget != this) {
+ Interface.CurrentInterface.hoverWidget = this;
onMouseEnter (this, e);
}
for (int i = Children.Count - 1; i >= 0; i--) {
diff --git a/src/GraphicObjects/ILayoutable.cs b/src/GraphicObjects/ILayoutable.cs
index 51abc25d..a8df3ae0 100644
--- a/src/GraphicObjects/ILayoutable.cs
+++ b/src/GraphicObjects/ILayoutable.cs
@@ -17,8 +17,6 @@ namespace Crow
Rectangle getSlot();
Rectangle getBounds();
- IGOLibHost HostContainer { get; }
-
bool ArrangeChildren { get; }
LayoutingType RegisteredLayoutings { get; set; }
void RegisterForLayouting(LayoutingType layoutType);
diff --git a/src/GraphicObjects/Popper.cs b/src/GraphicObjects/Popper.cs
index 4c5ca11c..fdbed62c 100644
--- a/src/GraphicObjects/Popper.cs
+++ b/src/GraphicObjects/Popper.cs
@@ -174,22 +174,20 @@ namespace Crow
public virtual void onPop(object sender, EventArgs e)
{
- IGOLibHost tc = HostContainer;
- if (tc == null)
+ if (Interface.CurrentInterface == null)
return;
if (Content != null) {
Content.Visible = true;
if (Content.Parent == null)
- tc.AddWidget (Content);
- tc.PutOnTop (Content);
+ Interface.CurrentInterface.AddWidget (Content);
+ Interface.CurrentInterface.PutOnTop (Content);
_content_LayoutChanged (this, new LayoutingEventArgs (LayoutingType.Sizing));
}
Pop.Raise (this, e);
}
public virtual void onUnpop(object sender, EventArgs e)
{
- IGOLibHost tc = HostContainer;
- if (tc == null)
+ if (Interface.CurrentInterface == null)
return;
Content.Visible = false;
Unpop.Raise (this, e);
diff --git a/src/GraphicObjects/Splitter.cs b/src/GraphicObjects/Splitter.cs
index dbda87af..9372f1bc 100644
--- a/src/GraphicObjects/Splitter.cs
+++ b/src/GraphicObjects/Splitter.cs
@@ -62,14 +62,14 @@ namespace Crow
{
base.onMouseEnter (sender, e);
if ((Parent as GenericStack).Orientation == Orientation.Horizontal)
- this.HostContainer.MouseCursor = XCursor.H;
+ Interface.CurrentInterface.MouseCursor = XCursor.H;
else
- this.HostContainer.MouseCursor = XCursor.V;
+ Interface.CurrentInterface.MouseCursor = XCursor.V;
}
public override void onMouseLeave (object sender, MouseMoveEventArgs e)
{
base.onMouseLeave (sender, e);
- this.HostContainer.MouseCursor = XCursor.Default;
+ Interface.CurrentInterface.MouseCursor = XCursor.Default;
}
public override void onMouseMove (object sender, MouseMoveEventArgs e)
{
diff --git a/src/GraphicObjects/TabView.cs b/src/GraphicObjects/TabView.cs
index 7bf827d6..97ac4c64 100644
--- a/src/GraphicObjects/TabView.cs
+++ b/src/GraphicObjects/TabView.cs
@@ -183,8 +183,8 @@ namespace Crow
#region Mouse handling
public override void checkHoverWidget (MouseMoveEventArgs e)
{
- if (HostContainer.hoverWidget != this) {
- HostContainer.hoverWidget = this;
+ if (Interface.CurrentInterface.hoverWidget != this) {
+ Interface.CurrentInterface.hoverWidget = this;
onMouseEnter (this, e);
}
diff --git a/src/GraphicObjects/Window.cs b/src/GraphicObjects/Window.cs
index 617670fc..429d4269 100644
--- a/src/GraphicObjects/Window.cs
+++ b/src/GraphicObjects/Window.cs
@@ -83,7 +83,7 @@ namespace Crow
{
base.onMouseMove (sender, e);
- IGOLibHost otkgw = HostContainer;
+ Interface otkgw = Interface.CurrentInterface;
if (e.Mouse.IsButtonDown (MouseButton.Left)) {
if (!HasFocus)
@@ -210,7 +210,7 @@ namespace Crow
{
base.onMouseLeave (sender, e);
currentDirection = Direction.None;
- HostContainer.MouseCursor = XCursor.Default;
+ Interface.CurrentInterface.MouseCursor = XCursor.Default;
}
protected override void loadTemplate(GraphicObject template = null)
@@ -224,7 +224,7 @@ namespace Crow
ILayoutable parent = (sender as GraphicObject).Parent;
while(!(parent is Window))
parent = parent.Parent;
- HostContainer.DeleteWidget (parent as GraphicObject);
+ Interface.CurrentInterface.DeleteWidget (parent as GraphicObject);
}
public override void ResolveBindings ()
generated by cgit v1.3.1-4-g156e (git 2.54.0) at 2026-11-12 18:38:36 +0000