Bug 1027537 - Project Editor: allow scrolling in the file list;r=paul
authorBrian Grinstead <bgrinstead@mozilla.com>
Mon, 23 Jun 2014 10:29:11 -0500
changeset 190176 c5148c587ba88c950eba3a152c6005642cf3c537
parent 190175 c4388b880938e9e86ff5d3cd2c740d29e89dea2b
child 190177 39f91b682025ce64f3ad15ecb94790449a3265d6
push id27002
push userkwierso@gmail.com
push dateTue, 24 Jun 2014 00:56:44 +0000
treeherdermozilla-central@fa6a7a2f476c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerspaul
bugs1027537
milestone33.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1027537 - Project Editor: allow scrolling in the file list;r=paul
browser/devtools/projecteditor/chrome/content/projecteditor.xul
browser/devtools/projecteditor/lib/projecteditor.js
browser/themes/shared/devtools/projecteditor/projecteditor.css
--- a/browser/devtools/projecteditor/chrome/content/projecteditor.xul
+++ b/browser/devtools/projecteditor/chrome/content/projecteditor.xul
@@ -59,18 +59,18 @@
   <popupset>
     <menupopup id="directory-menu-popup">
     </menupopup>
   </popupset>
 
   <deck id="main-deck" flex="1">
     <vbox flex="1" id="source-deckitem">
       <hbox id="sources-body" flex="1">
-        <vbox width="250">
-          <vbox id="sources" flex="1">
+        <vbox width="250" id="sources">
+          <vbox flex="1">
           </vbox>
           <toolbar id="project-toolbar" class="devtools-toolbar" hidden="true"></toolbar>
         </vbox>
         <splitter id="source-editor-splitter" class="devtools-side-splitter"/>
         <vbox id="shells" flex="4">
           <toolbar id="projecteditor-toolbar" class="devtools-toolbar">
             <hbox id="plugin-toolbar-left"/>
             <spacer flex="1"/>
--- a/browser/devtools/projecteditor/lib/projecteditor.js
+++ b/browser/devtools/projecteditor/lib/projecteditor.js
@@ -166,17 +166,17 @@ var ProjectEditor = Class({
   _buildSidebar: function() {
     this.projectTree = new ProjectTreeView(this.document, {
       resourceVisible: this.resourceVisible.bind(this),
       resourceFormatter: this.resourceFormatter.bind(this)
     });
     on(this, this.projectTree, "selection", this._onTreeSelected);
     on(this, this.projectTree, "resource-removed", this._onTreeResourceRemoved);
 
-    let sourcesBox = this.document.querySelector("#sources");
+    let sourcesBox = this.document.querySelector("#sources > vbox");
     sourcesBox.appendChild(this.projectTree.elt);
   },
 
   /**
    * Set up listeners for commands to dispatch to all of the plugins
    */
   _initCommands: function() {
     this.commands = this.document.querySelector("#projecteditor-commandset");
--- a/browser/themes/shared/devtools/projecteditor/projecteditor.css
+++ b/browser/themes/shared/devtools/projecteditor/projecteditor.css
@@ -34,16 +34,20 @@
 #projecteditor-toolbar,
 #projecteditor-toolbar-bottom {
   display: none; /* For now don't show the status bars */
   min-height: 22px;
   height: 22px;
   background: rgb(237, 237, 237);
 }
 
+#sources {
+  overflow: auto;
+}
+
 .sources-tree {
   overflow:auto;
   overflow-x: hidden;
   -moz-user-focus: normal;
 
   /* Allows this to expand inside of parent xul element, while
      still supporting child flexbox elements, including ellipses. */
   -moz-box-flex: 1;