Merge pull request #9149 from adobe/randy/issues-9137-9143

Hide Options button when Working Set hidden

Author: JeffryBooher

src/project/SidebarView.js

@@ -116,10 +116,25 @@ define(function (require, exports, module) {
     }
 
     /**
-     * Update state of splitview button icon and menu checkmarks
+     * Update state of working set
      * @private
      */
-    function _updateSplitViewButtonState() {
+    function _updateWorkingSetState() {
+        if (MainViewManager.getPaneCount() === 1 &&
+                MainViewManager.getWorkingSetSize(MainViewManager.ACTIVE_PANE) === 0) {
+            $workingSetViewsContainer.hide();
+            $gearMenu.hide();
+        } else {
+            $workingSetViewsContainer.show();
+            $gearMenu.show();
+        }
+    }
+    
+    /**
+     * Update state of splitview and option elements
+     * @private
+     */
+    function _updateUIStates() {
         var ypos, spriteIndex,
             layoutScheme = MainViewManager.getLayoutScheme();
 
@@ -131,14 +146,17 @@ define(function (require, exports, module) {
             spriteIndex = 0;
         }
 
-        // Icon
+        // SplitView Icon
         ypos  = SPRITE_BASE - (spriteIndex * SPRITE_OFFSET);
         $splitViewMenu.css("background-position-y", ypos);
 
-        // Menu
+        // SplitView Menu
         _cmdSplitNone.setChecked(spriteIndex === 0);
         _cmdSplitVertical.setChecked(spriteIndex === 1);
         _cmdSplitHorizontal.setChecked(spriteIndex === 2);
+        
+        // Options icon
+        _updateWorkingSetState();
     }
 
     /**
@@ -226,15 +244,19 @@ define(function (require, exports, module) {
         });
 
         $(MainViewManager).on("paneLayoutChange", function () {
-            _updateSplitViewButtonState();
+            _updateUIStates();
+        });
+        
+        $(MainViewManager).on("workingSetAdd workingSetAddList workingSetRemove workingSetRemoveList workingSetUpdate", function () {
+            _updateWorkingSetState();
         });
 
         // create WorkingSetViews for each pane already created
         _.forEach(MainViewManager.getPaneIdList(), function (paneId) {
             WorkingSetView.createWorkingSetViewForPane($workingSetViewsContainer, paneId);
         });
 
-        _updateSplitViewButtonState();
+        _updateUIStates();
 
         // Tooltips
         $gearMenu.attr("title", Strings.GEAR_MENU_TOOLTIP);

src/styles/brackets.less

@@ -709,7 +709,7 @@ a, img {
 
 .working-set-option-btn {
     position: absolute;
-    right: 4px;
+    right: 30px;
     top: 7px;
     padding: 4px 6px;
     .sprite-icon(0, 0, 13px, 13px, "images/topcoat-settings-13.svg");
@@ -720,12 +720,13 @@ a, img {
 
 .working-set-splitview-btn {
     position: absolute;
-    right: 30px;
+    right: 4px;
     top: 7px;
     padding: 4px 6px;
     .sprite-icon(0, 0, 13px, 13px, "images/split-view-icons.svg");
     background-position: center 5px;
     z-index: 1;
+    -webkit-filter: drop-shadow(0 1px 0 rgba(0,0,0,0.36));
 }
 
 #sidebar {