Changeset 223807 in webkit

Timestamp:

Oct 20, 2017 10:04:28 PM (7 years ago)

Author:

Matt Baker

Message:

Web Inspector: scrolling the editor while debugging shouldn't trigger popovers
​https://bugs.webkit.org/show_bug.cgi?id=178325

Reviewed by Devin Rousso.

Ignore the next "mousemove" event immediately following a "mousewheel",
when determining the hovered item for purposes of triggering a popover.

• UserInterface/Controllers/CodeMirrorTokenTrackingController.js:

(WI.CodeMirrorTokenTrackingController):
(WI.CodeMirrorTokenTrackingController.prototype._startTracking):
(WI.CodeMirrorTokenTrackingController.prototype._stopTracking):
(WI.CodeMirrorTokenTrackingController.prototype.handleEvent):
(WI.CodeMirrorTokenTrackingController.prototype._mouseMovedOverEditor):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Controllers/CodeMirrorTokenTrackingController.js (modified) (6 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2017-10-20  Matt Baker  <mattbaker@apple.com>
+
+        Web Inspector: scrolling the editor while debugging shouldn't trigger popovers
+        https://bugs.webkit.org/show_bug.cgi?id=178325
+
+        Reviewed by Devin Rousso.
+
+        Ignore the next "mousemove" event immediately following a "mousewheel",
+        when determining the hovered item for purposes of triggering a popover.
+
+        * UserInterface/Controllers/CodeMirrorTokenTrackingController.js:
+        (WI.CodeMirrorTokenTrackingController):
+        (WI.CodeMirrorTokenTrackingController.prototype._startTracking):
+        (WI.CodeMirrorTokenTrackingController.prototype._stopTracking):
+        (WI.CodeMirrorTokenTrackingController.prototype.handleEvent):
+        (WI.CodeMirrorTokenTrackingController.prototype._mouseMovedOverEditor):
+
 2017-10-20  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorTokenTrackingController.js

@@ -44 +44 @@
         this._previousTokenInfo = null;
         this._hoveredMarker = null;
+        this._ignoreNextMouseMove = false;
 
         const hidePopover = this._hidePopover.bind(this);
@@ -199 +200 @@
 
         this._tracking = true;
+        this._ignoreNextMouseMove = false;
 
         var wrapper = this._codeMirror.getWrapperElement();
@@ -205 +207 @@
         wrapper.addEventListener("mousedown", this, false);
         wrapper.addEventListener("mouseup", this, false);
+        wrapper.addEventListener("mousewheel", this, false);
         window.addEventListener("blur", this, true);
     }
@@ -221 +224 @@
         wrapper.removeEventListener("mousedown", this, false);
         wrapper.removeEventListener("mouseup", this, false);
+        wrapper.removeEventListener("mousewheel", this, false);
         window.removeEventListener("blur", this, true);
         window.removeEventListener("mousemove", this, true);
@@ -253 +257 @@
             this._mouseButtonWasReleasedOverEditor(event);
             break;
+        case "mousewheel":
+            this._ignoreNextMouseMove = true;
+            break;
         case "blur":
             this._windowLostFocus(event);
@@ -319 +326 @@
     _mouseMovedOverEditor(event)
     {
+        if (this._ignoreNextMouseMove) {
+            this._ignoreNextMouseMove = false;
+            return;
+        }
+
         this._updateHoveredTokenInfo({left: event.pageX, top: event.pageY});
     }