Changeset 247855 in webkit

Timestamp:

Jul 25, 2019 11:15:38 PM (5 years ago)

Author:

Fujii Hironori

Message:

[Win][WK1] The inspected webview window is misplaced after changing Web Inspector frontend window height
​https://bugs.webkit.org/show_bug.cgi?id=200152

Reviewed by Brent Fulgham.

In WebInspectorFrontendClient::setAttachedWindowHeight, the size
of m_inspectedWebViewHwnd was changed to the whole host window
size. But, it's too tall because MiniBrowser's host window has a
toolbar. The toolbar height should be taken into account.

Change to the height of m_inspectedWebViewHwnd to the sum of
inspected WebView and inspector frontend WebView heights.

• WebCoreSupport/WebInspectorClient.cpp:

(WebInspectorFrontendClient::setAttachedWindowHeight):

Location:

trunk/Source/WebKitLegacy/win

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/WebInspectorClient.cpp (modified) (1 diff)

trunk/Source/WebKitLegacy/win/ChangeLog

@@ +1 @@
+2019-07-25  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [Win][WK1] The inspected webview window is misplaced after changing Web Inspector frontend window height
+        https://bugs.webkit.org/show_bug.cgi?id=200152
+
+        Reviewed by Brent Fulgham.
+
+        In WebInspectorFrontendClient::setAttachedWindowHeight, the size
+        of m_inspectedWebViewHwnd was changed to the whole host window
+        size. But, it's too tall because MiniBrowser's host window has a
+        toolbar. The toolbar height should be taken into account.
+
+        Change to the height of m_inspectedWebViewHwnd to the sum of
+        inspected WebView and inspector frontend WebView heights.
+
+        * WebCoreSupport/WebInspectorClient.cpp:
+        (WebInspectorFrontendClient::setAttachedWindowHeight):
+
 2019-07-23  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKitLegacy/win/WebCoreSupport/WebInspectorClient.cpp

@@ -328 +328 @@
     GetClientRect(hostWindow, &hostWindowRect);
 
+    RECT frontendRect;
+    GetClientRect(m_frontendWebViewHwnd, &frontendRect);
+
     RECT inspectedRect;
     GetClientRect(m_inspectedWebViewHwnd, &inspectedRect);
 
-    int totalHeight = hostWindowRect.bottom - hostWindowRect.top;
+    int hostWindowHeight = hostWindowRect.bottom;
     int webViewWidth = inspectedRect.right - inspectedRect.left;
-
-    SetWindowPos(m_frontendWebViewHwnd, 0, 0, totalHeight - height, webViewWidth, height, SWP_NOZORDER);
+    int webViewHeight = frontendRect.bottom + inspectedRect.bottom;
+
+    SetWindowPos(m_frontendWebViewHwnd, 0, 0, hostWindowHeight - height, webViewWidth, height, SWP_NOZORDER);
 
     // We want to set the inspected web view height to the totalHeight, because the height adjustment
     // of the inspected web view happens in onWebViewWindowPosChanging, not here.
-    SetWindowPos(m_inspectedWebViewHwnd, 0, 0, 0, webViewWidth, totalHeight, SWP_NOZORDER);
+    SetWindowPos(m_inspectedWebViewHwnd, 0, 0, hostWindowHeight - webViewHeight, webViewWidth, webViewHeight, SWP_NOZORDER);
 
     RedrawWindow(m_frontendWebViewHwnd, 0, 0, RDW_INVALIDATE | RDW_ALLCHILDREN | RDW_UPDATENOW);