Changeset 31128 in webkit

Timestamp:

Mar 18, 2008 9:40:30 AM (16 years ago)

Author:

Adam Roben

Message:

Fix Bug 14276: Element highlight also covers Web inspector

<​http://bugs.webkit.org/show_bug.cgi?id=14276>
<rdar://5712796>

Also fixes <rdar://5622837> Browser window comes to front when node
highlight appears, potentially blocking Inspector

Reviewed by Mitz.

• WebCoreSupport/WebInspectorClient.cpp: (WebInspectorClient::highlight): After showing the highlight, reposition it just behind the Inspector's window.
• WebNodeHighlight.cpp: (WebNodeHighlight::show):
  • Changed flags passed to CreateWindowEx to not specify WS_VISIBLE. This is not needed because we'll show the window later in this function.
  • Removed call to SetWindowPos that tried to position the overlay just in front of the WebView. This is now handled by WebInspectorClient.
  • Changed call to ShowWindow to use SetWindowPos so that we can pass SWP_NOACTIVATE. This prevents the highlight from jumping in front of the Inspector every time it's shown.
• WebNodeHighlight.h: Added a method to get the highlight's HWND.

Location:

trunk/WebKit/win

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/WebInspectorClient.cpp (modified) (1 diff)
• WebNodeHighlight.cpp (modified) (3 diffs)
• WebNodeHighlight.h (modified) (1 diff)

trunk/WebKit/win/ChangeLog

@@ +1 @@
+2008-03-18  Adam Roben  <aroben@apple.com>
+
+        Fix Bug 14276: Element highlight also covers Web inspector
+
+        <http://bugs.webkit.org/show_bug.cgi?id=14276>
+        <rdar://5712796>
+
+        Also fixes <rdar://5622837> Browser window comes to front when node
+        highlight appears, potentially blocking Inspector
+
+        Reviewed by Mitz.
+
+        * WebCoreSupport/WebInspectorClient.cpp:
+        (WebInspectorClient::highlight): After showing the highlight,
+        reposition it just behind the Inspector's window.
+        * WebNodeHighlight.cpp:
+        (WebNodeHighlight::show):
+          - Changed flags passed to CreateWindowEx to not specify WS_VISIBLE.
+            This is not needed because we'll show the window later in this
+            function.
+          - Removed call to SetWindowPos that tried to position the overlay
+            just in front of the WebView. This is now handled by
+            WebInspectorClient.
+          - Changed call to ShowWindow to use SetWindowPos so that we can pass
+            SWP_NOACTIVATE. This prevents the highlight from jumping in front
+            of the Inspector every time it's shown.
+        * WebNodeHighlight.h: Added a method to get the highlight's HWND.
+
 2008-03-14  Steve Falkenburg  <sfalken@apple.com>
 

trunk/WebKit/win/WebCoreSupport/WebInspectorClient.cpp

@@ -274 +274 @@
 
     m_highlight->show();
+
+    if (IsWindowVisible(m_hwnd)) {
+        // Make sure the highlight is behind us.
+        SetWindowPos(m_highlight->window(), m_hwnd, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
+    }
 }
 

trunk/WebKit/win/WebNodeHighlight.cpp

@@ -74 +74 @@
         registerOverlayClass();
 
-        m_overlay = ::CreateWindowEx(WS_EX_LAYERED | WS_EX_TOOLWINDOW, kOverlayWindowClassName, 0, WS_POPUP | WS_VISIBLE,
+        m_overlay = ::CreateWindowEx(WS_EX_LAYERED | WS_EX_TOOLWINDOW, kOverlayWindowClassName, 0, WS_POPUP,
                                      0, 0, 0, 0,
                                      m_inspectedWebViewWindow, 0, 0, 0);
@@ -81 +81 @@
 
         ::SetProp(m_overlay, kWebNodeHighlightPointerProp, reinterpret_cast<HANDLE>(this));
-        ::SetWindowPos(m_overlay, m_inspectedWebViewWindow, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
 
         m_observedWindow = GetAncestor(m_inspectedWebViewWindow, GA_ROOT);
@@ -89 +88 @@
 
     updateWindow();
-    ::ShowWindow(m_overlay, SW_SHOW);
+    SetWindowPos(m_overlay, 0, 0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE);
 }
 

trunk/WebKit/win/WebNodeHighlight.h

@@ -49 +49 @@
     bool visible() const;
 
+    HWND window() const { return m_overlay; }
+
 private:
     virtual void windowReceivedMessage(HWND, UINT message, WPARAM, LPARAM);