From d3ffc6c7f0ba9aed91af246f90b7f787d10178ec Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jean-Philippe=20Bruy=C3=A8re?= Date: Thu, 1 Feb 2018 07:46:27 +0100 Subject: [PATCH] debug after rebase --- src/GraphicObjects/GraphicObject.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs index dfb00e06..c002c865 100644 --- a/src/GraphicObjects/GraphicObject.cs +++ b/src/GraphicObjects/GraphicObject.cs @@ -1054,7 +1054,7 @@ namespace Crow isDragged = value; if (isDragged) { - currentInterface.HoverWidget = null; + CurrentInterface.HoverWidget = null; onStartDrag (this, null); } @@ -1533,14 +1533,14 @@ namespace Crow if (CurrentInterface.ActiveWidget == null) CurrentInterface.ActiveWidget = this; - if (this.Focusable && !(Interface.FocusOnHover || currentInterface.focusGiven)) { + if (this.Focusable && !(Interface.FocusOnHover || CurrentInterface.focusGiven)) { CurrentInterface.FocusedWidget = this; CurrentInterface.ActiveWidget = this; - currentInterface.focusGiven = true; + CurrentInterface.focusGiven = true; if (CurrentInterface.eligibleForDoubleClick == this && CurrentInterface.clickTimer.ElapsedMilliseconds < Interface.DoubleClick) onMouseDoubleClick (this, e); else - currentInterface.clickTimer.Restart(); + CurrentInterface.clickTimer.Restart(); CurrentInterface.eligibleForDoubleClick = null; } //bubble event to the top @@ -1553,8 +1553,8 @@ namespace Crow public virtual void onMouseUp(object sender, MouseButtonEventArgs e){ if (IsDragged){ bool dropOK = false; - if (currentInterface.HoverWidget!=null) { - if (currentInterface.HoverWidget.AllowDrop) + if (CurrentInterface.HoverWidget!=null) { + if (CurrentInterface.HoverWidget.AllowDrop) dropOK = true; } if (dropOK) -- 2.47.3