Title: [194939] branches/safari-601-branch/Source/WebInspectorUI
- Revision
- 194939
- Author
- [email protected]
- Date
- 2016-01-12 17:41:18 -0800 (Tue, 12 Jan 2016)
Log Message
Merge r193858. rdar://problem/24101282
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (194938 => 194939)
--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2016-01-13 01:41:16 UTC (rev 194938)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2016-01-13 01:41:18 UTC (rev 194939)
@@ -1,3 +1,20 @@
+2016-01-12 Matthew Hanson <[email protected]>
+
+ Merge r193858. rdar://problem/24101282
+
+ 2015-12-09 Brian Burg <[email protected]>
+
+ Web Inspector: zoom with Ctrl +/- doesn't work correctly when inspector is docked
+ https://bugs.webkit.org/show_bug.cgi?id=152076
+
+ Reviewed by Timothy Hatcher.
+
+ When computing the new width or height of the inspector, take the zoom level into
+ account. window.inner{Width,Height} are in document pixels, but we need to specify
+ device pixels to InspectorFrontendHost.
+
+ * UserInterface/Base/Main.js:
+
2015-12-05 Dana Burkart <[email protected]>
Merge r190564. rdar://problem/23769747
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Main.js (194938 => 194939)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Main.js 2016-01-13 01:41:16 UTC (rev 194938)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Main.js 2016-01-13 01:41:18 UTC (rev 194939)
@@ -1526,7 +1526,10 @@
if (delta < 0 && clientPosition > firstClientPosition)
return;
- var dimension = Math.max(0, window[windowProperty] - delta);
+ let dimension = Math.max(0, window[windowProperty] - delta);
+ // If zoomed in/out, there be greater/fewer document pixels shown, but the inspector's
+ // width or height should be the same in device pixels regardless of the document zoom.
+ dimension *= InspectorFrontendHost.zoomFactor();
if (this._dockSide === "bottom")
InspectorFrontendHost.setAttachedWindowHeight(dimension);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
