diff options
| author | Jean-Philippe Bruyère <jp_bruyere@hotmail.com> | 2018-02-18 07:14:00 +0100 |
|---|---|---|
| committer | Jean-Philippe Bruyère <jp_bruyere@hotmail.com> | 2018-02-18 07:14:00 +0100 |
| commit | 632bd63db115383da4216ee31ff0e9d39081e87b (patch) | |
| tree | 8d30dd2b85b2f23167634406829ccfe0b22d1faa /src/GraphicObjects | |
| parent | ce8c0dabfc960be91c36434ccd3ef7cdfe99fd74 (diff) | |
add some debug msg, prevent mouse evt on label not selectable
Diffstat (limited to 'src/GraphicObjects')
| -rw-r--r-- | src/GraphicObjects/GraphicObject.cs | 13 | ||||
| -rw-r--r-- | src/GraphicObjects/Label.cs | 7 |
2 files changed, 18 insertions, 2 deletions
diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs index 15730905..f0e8a04d 100644 --- a/src/GraphicObjects/GraphicObject.cs +++ b/src/GraphicObjects/GraphicObject.cs @@ -1553,6 +1553,9 @@ namespace Crow MouseMove.Raise (this, e); } public virtual void onMouseDown(object sender, MouseButtonEventArgs e){ + #if DEBUG_FOCUS + Debug.WriteLine("MOUSE DOWN => " + this.ToString()); + #endif if (CurrentInterface.eligibleForDoubleClick == this && CurrentInterface.clickTimer.ElapsedMilliseconds < Interface.DoubleClick) onMouseDoubleClick (this, e); else @@ -1578,6 +1581,10 @@ namespace Crow MouseDown.Raise (this, e); } public virtual void onMouseUp(object sender, MouseButtonEventArgs e){ + #if DEBUG_FOCUS + Debug.WriteLine("MOUSE UP => " + this.ToString()); + #endif + if (IsDragged){ bool dropOK = false; if (CurrentInterface.HoverWidget!=null) { @@ -1604,12 +1611,18 @@ namespace Crow } } public virtual void onMouseClick(object sender, MouseButtonEventArgs e){ + #if DEBUG_FOCUS + Debug.WriteLine("CLICK => " + this.ToString()); + #endif GraphicObject p = focusParent; if (p != null) p.onMouseClick(sender,e); MouseClick.Raise (this, e); } public virtual void onMouseDoubleClick(object sender, MouseButtonEventArgs e){ + #if DEBUG_FOCUS + Debug.WriteLine("DOUBLE CLICK => " + this.ToString()); + #endif GraphicObject p = focusParent; if (p != null) p.onMouseDoubleClick(sender,e); diff --git a/src/GraphicObjects/Label.cs b/src/GraphicObjects/Label.cs index de7b7f51..ea68fde0 100644 --- a/src/GraphicObjects/Label.cs +++ b/src/GraphicObjects/Label.cs @@ -740,7 +740,8 @@ namespace Crow public override void onMouseUp (object sender, MouseButtonEventArgs e) { base.onMouseUp (sender, e); - + if (!(this.HasFocus || _selectable)) + return; if (!SelectionInProgress) return; @@ -751,7 +752,9 @@ namespace Crow public override void onMouseDoubleClick (object sender, MouseButtonEventArgs e) { base.onMouseDoubleClick (sender, e); - + if (!(this.HasFocus || _selectable)) + return; + GotoWordStart (); SelBegin = CurrentPosition; GotoWordEnd (); |