Title: [102901] branches/chromium/963/Source/WebCore/inspector/front-end
- Revision
- 102901
- Author
- [email protected]
- Date
- 2011-12-15 01:12:57 -0800 (Thu, 15 Dec 2011)
Log Message
Merge 102756 - Web Inspector: [Regression] Scripts panel debug sidebar toolbar should not be scrolled out of the screen.
https://bugs.webkit.org/show_bug.cgi?id=74447
Reviewed by Pavel Feldman.
* inspector/front-end/ScriptsPanel.js:
(WebInspector.ScriptsPanel.prototype.wasShown):
* inspector/front-end/scriptsPanel.css:
(#scripts-debug-toolbar):
(#scripts-debug-sidebar-contents):
[email protected]
BUG=107420
Review URL: http://codereview.chromium.org/8949013
Modified Paths
Diff
Modified: branches/chromium/963/Source/WebCore/inspector/front-end/ScriptsPanel.js (102900 => 102901)
--- branches/chromium/963/Source/WebCore/inspector/front-end/ScriptsPanel.js 2011-12-15 09:09:35 UTC (rev 102900)
+++ branches/chromium/963/Source/WebCore/inspector/front-end/ScriptsPanel.js 2011-12-15 09:12:57 UTC (rev 102901)
@@ -53,7 +53,7 @@
this.splitView.minimalSidebarWidth = Preferences.minScriptsSidebarWidth;
this.splitView.minimalMainWidthPercent = minimalViewsContainerWidthPercent;
- this.splitView.sidebarElement.appendChild(this.debugToolbar);
+ this.sidebarElement.appendChild(this.debugToolbar);
this.splitView.mainElement.appendChild(this.editorToolbar);
this.viewsContainerElement = this.splitView.mainElement;
@@ -80,8 +80,12 @@
} else
this.sidebarPanes.workers = new WebInspector.WorkersSidebarPane();
+ this._debugSidebarContentsElement = document.createElement("div");
+ this._debugSidebarContentsElement.id = "scripts-debug-sidebar-contents";
+ this.sidebarElement.appendChild(this._debugSidebarContentsElement);
+
for (var pane in this.sidebarPanes)
- this.sidebarElement.appendChild(this.sidebarPanes[pane].element);
+ this._debugSidebarContentsElement.appendChild(this.sidebarPanes[pane].element);
this.sidebarPanes.callstack.expanded = true;
@@ -178,7 +182,7 @@
{
WebInspector.Panel.prototype.wasShown.call(this);
if (Capabilities.nativeInstrumentationEnabled)
- this.sidebarElement.insertBefore(this.sidebarPanes.domBreakpoints.element, this.sidebarPanes.xhrBreakpoints.element);
+ this._debugSidebarContentsElement.insertBefore(this.sidebarPanes.domBreakpoints.element, this.sidebarPanes.xhrBreakpoints.element);
this.sidebarPanes.watchExpressions.show();
},
Modified: branches/chromium/963/Source/WebCore/inspector/front-end/scriptsPanel.css (102900 => 102901)
--- branches/chromium/963/Source/WebCore/inspector/front-end/scriptsPanel.css 2011-12-15 09:09:35 UTC (rev 102900)
+++ branches/chromium/963/Source/WebCore/inspector/front-end/scriptsPanel.css 2011-12-15 09:12:57 UTC (rev 102901)
@@ -50,9 +50,18 @@
#scripts-debug-toolbar {
position: relative;
margin-top: -1px;
- height: 23px;
+ height: 24px;
}
+#scripts-debug-sidebar-contents {
+ position: absolute;
+ top: 22px;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ overflow: auto;
+}
+
#scripts-editor-toolbar {
position: relative;
margin-top: -1px;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
