Title: [143701] trunk/Source/WebCore
Revision
143701
Author
[email protected]
Date
2013-02-22 00:59:11 -0800 (Fri, 22 Feb 2013)

Log Message

Web Inspector: allow opting out from vertical split in the dock-to-right mode
https://bugs.webkit.org/show_bug.cgi?id=110564

Reviewed by Vsevolod Vlasov.

* English.lproj/localizedStrings.js:
* inspector/front-end/ElementsPanel.js:
(WebInspector.ElementsPanel.prototype._splitVertically):
* inspector/front-end/ScriptsPanel.js:
* inspector/front-end/Settings.js:
(WebInspector.Settings):
* inspector/front-end/SettingsScreen.js:
(WebInspector.GenericSettingsTab):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (143700 => 143701)


--- trunk/Source/WebCore/ChangeLog	2013-02-22 08:55:18 UTC (rev 143700)
+++ trunk/Source/WebCore/ChangeLog	2013-02-22 08:59:11 UTC (rev 143701)
@@ -1,3 +1,19 @@
+2013-02-22  Pavel Feldman  <[email protected]>
+
+        Web Inspector: allow opting out from vertical split in the dock-to-right mode
+        https://bugs.webkit.org/show_bug.cgi?id=110564
+
+        Reviewed by Vsevolod Vlasov.
+
+        * English.lproj/localizedStrings.js:
+        * inspector/front-end/ElementsPanel.js:
+        (WebInspector.ElementsPanel.prototype._splitVertically):
+        * inspector/front-end/ScriptsPanel.js:
+        * inspector/front-end/Settings.js:
+        (WebInspector.Settings):
+        * inspector/front-end/SettingsScreen.js:
+        (WebInspector.GenericSettingsTab):
+
 2013-02-21  Claudio Saavedra  <[email protected]>
 
         [GTK] Control+Shift+Up/Down selection works backwards

Modified: trunk/Source/WebCore/English.lproj/localizedStrings.js (143700 => 143701)


--- trunk/Source/WebCore/English.lproj/localizedStrings.js	2013-02-22 08:55:18 UTC (rev 143700)
+++ trunk/Source/WebCore/English.lproj/localizedStrings.js	2013-02-22 08:59:11 UTC (rev 143701)
@@ -871,3 +871,4 @@
 localizedStrings["Send WebSocket Handshake"] = "Send WebSocket Handshake";
 localizedStrings["Receive WebSocket Handshake"] = "Receive WebSocket Handshake";
 localizedStrings["Destroy WebSocket"] = "Destroy WebSocket";
+localizedStrings["Split panels vertically when docked to right"] = "Split panels vertically when docked to right";

Modified: trunk/Source/WebCore/inspector/front-end/ElementsPanel.js (143700 => 143701)


--- trunk/Source/WebCore/inspector/front-end/ElementsPanel.js	2013-02-22 08:55:18 UTC (rev 143700)
+++ trunk/Source/WebCore/inspector/front-end/ElementsPanel.js	2013-02-22 08:59:11 UTC (rev 143701)
@@ -96,6 +96,7 @@
     this.sidebarPanes.metrics.addEventListener("metrics edited", this._metricsPaneEdited, this);
 
     WebInspector.dockController.addEventListener(WebInspector.DockController.Events.DockSideChanged, this._dockSideChanged.bind(this));
+    WebInspector.settings.splitVerticallyWhenDockedToRight.addChangeListener(this._dockSideChanged.bind(this));
     this._dockSideChanged();
 
     this._popoverHelper = new WebInspector.PopoverHelper(this.element, this._getPopoverAnchor.bind(this), this._showPopover.bind(this));
@@ -1096,23 +1097,24 @@
     _dockSideChanged: function()
     {
         var dockSide = WebInspector.dockController.dockSide();
-        this._setVerticalSplit(dockSide !== WebInspector.DockController.State.DockedToRight);
+        var vertically = dockSide === WebInspector.DockController.State.DockedToRight && WebInspector.settings.splitVerticallyWhenDockedToRight.get();
+        this._splitVertically(vertically);
     },
 
     /**
-     * @param {boolean} vertical
+     * @param {boolean} vertically
      */
-    _setVerticalSplit: function(vertical)
+    _splitVertically: function(vertically)
     {
-        if (this.sidebarPaneView && vertical === this.splitView.isVertical())
+        if (this.sidebarPaneView && vertically === !this.splitView.isVertical())
             return;
 
         if (this.sidebarPaneView)
             this.sidebarPaneView.detach();
 
-        this.splitView.setVertical(vertical);
+        this.splitView.setVertical(!vertically);
 
-        if (vertical) {
+        if (!vertically) {
             this.sidebarPaneView = new WebInspector.SidebarPaneStack();
             for (var pane in this.sidebarPanes)
                 this.sidebarPaneView.addPane(this.sidebarPanes[pane]);

Modified: trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js (143700 => 143701)


--- trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js	2013-02-22 08:55:18 UTC (rev 143700)
+++ trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js	2013-02-22 08:59:11 UTC (rev 143701)
@@ -150,6 +150,7 @@
     this._installDebuggerSidebarController();
 
     WebInspector.dockController.addEventListener(WebInspector.DockController.Events.DockSideChanged, this._dockSideChanged.bind(this));
+    WebInspector.settings.splitVerticallyWhenDockedToRight.addChangeListener(this._dockSideChanged.bind(this));
     this._dockSideChanged();
 
     this._sourceFramesByUISourceCode = new Map();
@@ -1150,23 +1151,24 @@
     _dockSideChanged: function()
     {
         var dockSide = WebInspector.dockController.dockSide();
-        this._setVerticalSplit(dockSide !== WebInspector.DockController.State.DockedToRight);
+        var vertically = dockSide === WebInspector.DockController.State.DockedToRight && WebInspector.settings.splitVerticallyWhenDockedToRight.get();
+        this._splitVertically(vertically);
     },
 
     /**
-     * @param {boolean} vertical
+     * @param {boolean} vertically
      */
-    _setVerticalSplit: function(vertical)
+    _splitVertically: function(vertically)
     {
-        if (this.sidebarPaneView && vertical === this.splitView.isVertical())
+        if (this.sidebarPaneView && vertically === !this.splitView.isVertical())
             return;
 
         if (this.sidebarPaneView)
             this.sidebarPaneView.detach();
 
-        this.splitView.setVertical(vertical);
+        this.splitView.setVertical(!vertically);
 
-        if (vertical) {
+        if (!vertically) {
             this.sidebarPaneView = new WebInspector.SidebarPaneStack();
             for (var pane in this.sidebarPanes)
                 this.sidebarPaneView.addPane(this.sidebarPanes[pane]);

Modified: trunk/Source/WebCore/inspector/front-end/Settings.js (143700 => 143701)


--- trunk/Source/WebCore/inspector/front-end/Settings.js	2013-02-22 08:55:18 UTC (rev 143700)
+++ trunk/Source/WebCore/inspector/front-end/Settings.js	2013-02-22 08:59:11 UTC (rev 143701)
@@ -123,6 +123,7 @@
     this.workerInspectorWidth = this.createSetting("workerInspectorWidth", 600);
     this.workerInspectorHeight = this.createSetting("workerInspectorHeight", 600);
     this.messageURLFilters = this.createSetting("messageURLFilters", {});
+    this.splitVerticallyWhenDockedToRight = this.createSetting("splitVerticallyWhenDockedToRight", true);
 }
 
 WebInspector.Settings.prototype = {

Modified: trunk/Source/WebCore/inspector/front-end/SettingsScreen.js (143700 => 143701)


--- trunk/Source/WebCore/inspector/front-end/SettingsScreen.js	2013-02-22 08:55:18 UTC (rev 143700)
+++ trunk/Source/WebCore/inspector/front-end/SettingsScreen.js	2013-02-22 08:59:11 UTC (rev 143701)
@@ -276,6 +276,7 @@
 
     p = this._appendSection(WebInspector.UIString("Appearance"));
     p.appendChild(this._createCheckboxSetting(WebInspector.UIString("Show toolbar icons"), WebInspector.settings.showToolbarIcons));
+    p.appendChild(this._createCheckboxSetting(WebInspector.UIString("Split panels vertically when docked to right"), WebInspector.settings.splitVerticallyWhenDockedToRight));
 
     p = this._appendSection(WebInspector.UIString("Elements"));
     p.appendChild(this._createRadioSetting(WebInspector.UIString("Color format"), [
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to