Title: [267031] trunk/Source
Revision
267031
Author
[email protected]
Date
2020-09-14 12:54:19 -0700 (Mon, 14 Sep 2020)

Log Message

Web Inspector: docking buttons don't work when already docked if window is too small
https://bugs.webkit.org/show_bug.cgi?id=216488
<rdar://problem/68242717>

Reviewed by Timothy Hatcher.

Source/WebInspectorUI:

* UserInterface/Base/Main.js:
(WI.updateDockingAvailability):
(WI.updateDockedState):
(WI._updateDockNavigationItems):
Always be sure to update the docking navigation items when docking becomes unavailable
instead of just forcing Web Inspector to undock as if Web Inspector is already undocked
then none of the docking navigation items will be updated. This makes it so that the
docking navigation items are hidden when docking becomes unavailable while undocked.

Source/WebKit:

* UIProcess/Inspector/WebInspectorProxy.cpp:
(WebKit::WebInspectorProxy::attach):
(WebKit::WebInspectorProxy::attachAvailabilityChanged):
If Web Inspector is already attached, it can re-attach with a different configuration.

Modified Paths

Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (267030 => 267031)


--- trunk/Source/WebInspectorUI/ChangeLog	2020-09-14 19:50:06 UTC (rev 267030)
+++ trunk/Source/WebInspectorUI/ChangeLog	2020-09-14 19:54:19 UTC (rev 267031)
@@ -1,3 +1,20 @@
+2020-09-14  Devin Rousso  <[email protected]>
+
+        Web Inspector: docking buttons don't work when already docked if window is too small
+        https://bugs.webkit.org/show_bug.cgi?id=216488
+        <rdar://problem/68242717>
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Base/Main.js:
+        (WI.updateDockingAvailability):
+        (WI.updateDockedState):
+        (WI._updateDockNavigationItems):
+        Always be sure to update the docking navigation items when docking becomes unavailable
+        instead of just forcing Web Inspector to undock as if Web Inspector is already undocked
+        then none of the docking navigation items will be updated. This makes it so that the
+        docking navigation items are hidden when docking becomes unavailable while undocked.
+
 2020-09-12  Carlos Garcia Campos  <[email protected]>
 
         [GTK] REGRESSION(r266815): Several GTK API tests are timing out

Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (267030 => 267031)


--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js	2020-09-14 19:50:06 UTC (rev 267030)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js	2020-09-14 19:54:19 UTC (rev 267031)
@@ -828,12 +828,10 @@
 {
     WI._dockingAvailable = available;
 
-    if (!WI._dockingAvailable) {
+    WI._updateDockNavigationItems();
+
+    if (!WI._dockingAvailable)
         WI.updateDockedState(WI.DockConfiguration.Undocked);
-        return;
-    }
-
-    WI._updateDockNavigationItems();
 };
 
 WI.updateDockedState = function(side)
@@ -875,8 +873,6 @@
 
     WI._updateDockNavigationItems();
 
-    WI.tabBar.resetCachedWidths();
-
     if (!WI.dockedConfigurationSupportsSplitContentBrowser() && !WI.doesCurrentTabSupportSplitContentBrowser())
         WI.hideSplitConsole();
 
@@ -1901,6 +1897,8 @@
     }
 
     WI._updateTabBarDividers();
+
+    WI.tabBar.resetCachedWidths();
 };
 
 WI._tabBrowserSizeDidChange = function()

Modified: trunk/Source/WebKit/ChangeLog (267030 => 267031)


--- trunk/Source/WebKit/ChangeLog	2020-09-14 19:50:06 UTC (rev 267030)
+++ trunk/Source/WebKit/ChangeLog	2020-09-14 19:54:19 UTC (rev 267031)
@@ -1,3 +1,16 @@
+2020-09-14  Devin Rousso  <[email protected]>
+
+        Web Inspector: docking buttons don't work when already docked if window is too small
+        https://bugs.webkit.org/show_bug.cgi?id=216488
+        <rdar://problem/68242717>
+
+        Reviewed by Timothy Hatcher.
+
+        * UIProcess/Inspector/WebInspectorProxy.cpp:
+        (WebKit::WebInspectorProxy::attach):
+        (WebKit::WebInspectorProxy::attachAvailabilityChanged):
+        If Web Inspector is already attached, it can re-attach with a different configuration.
+
 2020-09-14  Dean Jackson  <[email protected]>
 
         Enable WebGL2 by default

Modified: trunk/Source/WebKit/UIProcess/Inspector/WebInspectorProxy.cpp (267030 => 267031)


--- trunk/Source/WebKit/UIProcess/Inspector/WebInspectorProxy.cpp	2020-09-14 19:50:06 UTC (rev 267030)
+++ trunk/Source/WebKit/UIProcess/Inspector/WebInspectorProxy.cpp	2020-09-14 19:54:19 UTC (rev 267031)
@@ -290,7 +290,7 @@
 void WebInspectorProxy::attach(AttachmentSide side)
 {
     ASSERT(m_inspectorPage);
-    if (!m_inspectedPage || !m_inspectorPage || !platformCanAttach(canAttach()))
+    if (!m_inspectedPage || !m_inspectorPage || (!m_isAttached && !platformCanAttach(m_canAttach)))
         return;
 
     m_isAttached = true;
@@ -589,7 +589,7 @@
 {
     bool previousCanAttach = m_canAttach;
 
-    m_canAttach = platformCanAttach(available);
+    m_canAttach = m_isAttached || platformCanAttach(available);
 
     if (previousCanAttach == m_canAttach)
         return;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to