Live Preview Resize ruler feature

docs/API-Reference/view/WorkspaceManager.md

@@ -190,7 +190,8 @@ Returns true if visible else false.
 ### view/WorkspaceManager.setPluginPanelWidth(width)
 Programmatically sets the plugin panel content width to the given value in pixels.
 The total toolbar width is adjusted to account for the plugin icons bar.
-Width is clamped to respect panel minWidth and max size (75% of window).
+If the requested width doesn't fit, the sidebar is progressively shrunk
+(and collapsed if necessary) before clamping.
 No-op if no panel is currently visible.
 
 **Kind**: inner method of [<code>view/WorkspaceManager</code>](#module_view/WorkspaceManager)  

src/extensions/default/Git/styles/git-styles.less

@@ -1203,24 +1203,25 @@
 
 /* Toolbar icon */
 #git-toolbar-icon {
-    width: 24px;
-    height: 24px;
+    width: 28px;
+    height: 28px;
     display: inline-block;
     background: url("git-icon.svg") no-repeat 0 0;
+    background-size: 56px auto;
     &.dirty {
-        background-position: -24px 0;
+        background-position: -28px 0;
     }
     &.on {
-        background-position: 0 -24px;
+        background-position: 0 -28px;
     }
     &.on.dirty {
-        background-position: -24px -24px;
+        background-position: -28px -28px;
     }
     &.ok {
-        background-position: 0 -48px;
+        background-position: 0 -56px;
     }
     &.ok.dirty {
-        background-position: -24px -48px;
+        background-position: -28px -56px;
     }
 }
 

src/extensionsIntegrated/NavigationAndHistory/NavigationProvider.js

@@ -52,8 +52,7 @@
     let $navback = null,
         $navForward = null,
         $searchNav = null,
-        $newProject = null,
-        $showInTree = null;
+        $newProject = null;
 
    /**
     * Contains list of most recently known cursor positions.
@@ -712,14 +711,48 @@
         MainViewManager.focusActivePane();
     }
 
-    function _showInFileTreeClicked() {
-        Metrics.countEvent(Metrics.EVENT_TYPE.UI, "fileNavBar", "showInFileTree");
-        CommandManager.execute(Commands.NAVIGATE_SHOW_IN_FILE_TREE);
+    function _getFindBarClass() {
+        return require("search/FindBar").FindBar;
+    }
+
+    function _updateSearchNavActive() {
+        const FB = _getFindBarClass();
+        const bars = FB._bars;
+        const hasMultifileBar = bars && bars.some(function (bar) {
+            return bar._options && bar._options.multifile;
+        });
+        if ($searchNav) {
+            $searchNav.toggleClass("active", !!hasMultifileBar);
+        }
     }
 
     function _findInFiles() {
         Metrics.countEvent(Metrics.EVENT_TYPE.UI, "fileNavBar", "search");
-        CommandManager.execute(Commands.CMD_FIND_IN_FILES);
+        const FB = _getFindBarClass();
+        const bars = FB._bars;
+        const multiBar = bars && bars.find(function (bar) {
+            return bar._options && bar._options.multifile;
+        });
+        if (multiBar) {
+            const FindInFilesUI = require("search/FindInFilesUI");
+            FindInFilesUI.closeResultsPanel();
+        } else {
+            CommandManager.execute(Commands.CMD_FIND_IN_FILES);
+        }
+    }
+
+    function _initSearchNavTracking() {
+        const FB = _getFindBarClass();
+        const origAdd = FB._addFindBar;
+        const origRemove = FB._removeFindBar;
+        FB._addFindBar = function (findBar) {
+            origAdd.call(FB, findBar);
+            _updateSearchNavActive();
+        };
+        FB._removeFindBar = function (findBar) {
+            origRemove.call(FB, findBar);
+            _updateSearchNavActive();
+        };
     }
 
     function _newProjectClicked() {
@@ -738,15 +771,13 @@
     function updateTooltips() {
         $navback.attr("title", _getShortcutDisplay(Strings.CMD_NAVIGATE_BACKWARD, NAVIGATION_JUMP_BACK));
         $navForward.attr("title", _getShortcutDisplay(Strings.CMD_NAVIGATE_FORWARD, NAVIGATION_JUMP_FWD));
-        $showInTree.attr("title", _getShortcutDisplay(Strings.CMD_SHOW_IN_TREE, Commands.NAVIGATE_SHOW_IN_FILE_TREE));
         $searchNav.attr("title", _getShortcutDisplay(Strings.CMD_FIND_IN_FILES, Commands.CMD_FIND_IN_FILES));
         // new project extension is not yet loaded, so we cant show keyboard shortcut here.
         $newProject.attr("title", Strings.CMD_PROJECT_NEW);
     }
 
     function _setupNavigationButtons() {
         let $mainNavBarLeft = $("#mainNavBarLeft");
-        $showInTree = $("#showInfileTree");
         $navback = $("#navBackButton");
         $navForward = $("#navForwardButton");
         $searchNav = $("#searchNav");
@@ -755,14 +786,12 @@
         updateTooltips();
         CommandManager.get(NAVIGATION_JUMP_BACK).on(KeyBindingManager.EVENT_KEY_BINDING_ADDED, updateTooltips);
         CommandManager.get(NAVIGATION_JUMP_FWD).on(KeyBindingManager.EVENT_KEY_BINDING_ADDED, updateTooltips);
-        CommandManager.get(Commands.NAVIGATE_SHOW_IN_FILE_TREE).on(KeyBindingManager.EVENT_KEY_BINDING_ADDED, updateTooltips);
         CommandManager.get(Commands.CMD_FIND_IN_FILES).on(KeyBindingManager.EVENT_KEY_BINDING_ADDED, updateTooltips);
 
         $navback.on("click", _navigateBackClicked);
         $navForward.on("click", _navigateForwardClicked);
         $("#navBackButton").contextmenu(_navigateBackClicked);
         $("#navForwardButton").contextmenu(_navigateForwardClicked);
-        $showInTree.on("click", _showInFileTreeClicked);
         $searchNav.on("click", _findInFiles);
         $newProject.on("click", _newProjectClicked);
     }
@@ -772,6 +801,7 @@
         _initNavigationCommands();
         _initHandlers();
         _setupNavigationButtons();
+        _initSearchNavTracking();
     }
 
     exports.init = init;