Title: [114270] trunk/Source/WebCore
- Revision
- 114270
- Author
- ca...@chromium.org
- Date
- 2012-04-16 10:18:53 -0700 (Mon, 16 Apr 2012)
Log Message
Web Inspector: touch pad is pain to use in lower pane of Timeline panel due two two-axis scrolling
https://bugs.webkit.org/show_bug.cgi?id=83946
Reviewed by Pavel Feldman.
Remove delegation of mousewheel events from lower timeline pane to the timeline overview. This disables
support for moving overview window with horizontal swype over lower timeline pane, thus removing
an irritating situation when we try to both change overview window and scroll lower timeline pane
upon a single touchpad gesture. Those willing to move timeline window now would need to position
mouse over overview.
* inspector/front-end/TimelineOverviewPane.js:
(WebInspector.TimelineOverviewWindow.prototype._onMouseWheel):
(WebInspector.TimelineOverviewWindow.prototype._zoom):
* inspector/front-end/TimelinePanel.js:
(WebInspector.TimelinePanel):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (114269 => 114270)
--- trunk/Source/WebCore/ChangeLog 2012-04-16 17:14:12 UTC (rev 114269)
+++ trunk/Source/WebCore/ChangeLog 2012-04-16 17:18:53 UTC (rev 114270)
@@ -1,3 +1,22 @@
+2012-04-16 Andrey Kosyakov <ca...@chromium.org>
+
+ Web Inspector: touch pad is pain to use in lower pane of Timeline panel due two two-axis scrolling
+ https://bugs.webkit.org/show_bug.cgi?id=83946
+
+ Reviewed by Pavel Feldman.
+
+ Remove delegation of mousewheel events from lower timeline pane to the timeline overview. This disables
+ support for moving overview window with horizontal swype over lower timeline pane, thus removing
+ an irritating situation when we try to both change overview window and scroll lower timeline pane
+ upon a single touchpad gesture. Those willing to move timeline window now would need to position
+ mouse over overview.
+
+ * inspector/front-end/TimelineOverviewPane.js:
+ (WebInspector.TimelineOverviewWindow.prototype._onMouseWheel):
+ (WebInspector.TimelineOverviewWindow.prototype._zoom):
+ * inspector/front-end/TimelinePanel.js:
+ (WebInspector.TimelinePanel):
+
2012-04-11 Philippe Normand <pnorm...@igalia.com>
[GStreamer] HRTFDatabaseLoader conflicts with AudioFileReader
Modified: trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js (114269 => 114270)
--- trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js 2012-04-16 17:14:12 UTC (rev 114269)
+++ trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js 2012-04-16 17:18:53 UTC (rev 114270)
@@ -330,11 +330,6 @@
this._update();
},
- scrollWindow: function(event)
- {
- this._overviewWindow.scrollWindow(event);
- },
-
/**
* @param {WebInspector.TimelinePresentationModel.Record} record
*/
@@ -587,11 +582,16 @@
const zoomFactor = 1.1;
const mouseWheelZoomSpeed = 1 / 120;
- if (typeof event.wheelDeltaY === "number" && event.wheelDeltaY !== 0) {
+ if (typeof event.wheelDeltaY === "number" && event.wheelDeltaY) {
var referencePoint = event.pageX - this._parentElement.offsetLeft;
this._zoom(Math.pow(zoomFactor, -event.wheelDeltaY * mouseWheelZoomSpeed), referencePoint);
}
- this.scrollWindow(event);
+ if (typeof event.wheelDeltaX === "number" && event.wheelDeltaX) {
+ this._windowDragging(event.pageX + Math.round(event.wheelDeltaX * WebInspector.TimelineOverviewPane.WindowScrollSpeedFactor),
+ this._leftResizeElement.offsetLeft + WebInspector.TimelineOverviewPane.ResizerOffset,
+ this._rightResizeElement.offsetLeft + WebInspector.TimelineOverviewPane.ResizerOffset,
+ event);
+ }
},
/**
@@ -608,16 +608,6 @@
left = Math.max(0, referencePoint + (left - referencePoint) * factor);
right = Math.min(this._parentElement.clientWidth, referencePoint + (right - referencePoint) * factor);
this._setWindowPosition(left, right);
- },
-
- scrollWindow: function(event)
- {
- if (typeof event.wheelDeltaX === "number" && event.wheelDeltaX !== 0) {
- this._windowDragging(event.pageX + Math.round(event.wheelDeltaX * WebInspector.TimelineOverviewPane.WindowScrollSpeedFactor),
- this._leftResizeElement.offsetLeft + WebInspector.TimelineOverviewPane.ResizerOffset,
- this._rightResizeElement.offsetLeft + WebInspector.TimelineOverviewPane.ResizerOffset,
- event);
- }
}
}
Modified: trunk/Source/WebCore/inspector/front-end/TimelinePanel.js (114269 => 114270)
--- trunk/Source/WebCore/inspector/front-end/TimelinePanel.js 2012-04-16 17:14:12 UTC (rev 114269)
+++ trunk/Source/WebCore/inspector/front-end/TimelinePanel.js 2012-04-16 17:18:53 UTC (rev 114270)
@@ -76,7 +76,6 @@
this._timelineGrid = new WebInspector.TimelineGrid();
this._itemsGraphsElement = this._timelineGrid.itemsGraphsElement;
this._itemsGraphsElement.id = "timeline-graphs";
- this._itemsGraphsElement.addEventListener("mousewheel", this._overviewPane.scrollWindow.bind(this._overviewPane), true);
this._containerContentElement.appendChild(this._timelineGrid.element);
this._memoryStatistics.setMainTimelineGrid(this._timelineGrid);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
