DYN-9654: : When the Extensions panel has been resized to its minimum (near invisible or 0 px) width, clicking the Sidebar button expands it to the extension panel default width. (DynamoDS#16858)

Author: CustomBuildingConfigurators-Balaji

src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs

@@ -66,6 +66,7 @@ public partial class DynamoView : Window, IDisposable
     {
         public const string BackgroundPreviewName = "BackgroundPreview";
         private const int SideBarCollapseThreshold = 20;
+        private const int RightSideBarCollapseThreshold = 30;
         private const int navigationInterval = 100;
         private const string GraphMetadataExtensionId = "28992e1d-abb9-417f-8b1b-05e053bee670";
         // This is used to determine whether ESC key is being held down
@@ -111,7 +112,8 @@ public partial class DynamoView : Window, IDisposable
 
         internal ShortcutToolbar ShortcutBar { get { return shortcutBar; } }
 
-        internal PreferencesView PreferencesWindow {
+        internal PreferencesView PreferencesWindow
+        {
             get { return preferencesWindow; }
         }
 
@@ -151,7 +153,7 @@ public DynamoView(DynamoViewModel dynamoViewModel)
             _timer = new Stopwatch();
             _timer.Start();
 
-            InitializeComponent();  
+            InitializeComponent();
 
             Loaded += DynamoView_Loaded;
             Unloaded += DynamoView_Unloaded;
@@ -174,7 +176,7 @@ public DynamoView(DynamoViewModel dynamoViewModel)
                 {
                     leftLimit += screen.Bounds.Width;
                     topLimit += screen.Bounds.Height;
-                }   
+                }
 
                 Left = dynamoViewModel.Model.PreferenceSettings.WindowX;
                 Top = dynamoViewModel.Model.PreferenceSettings.WindowY;
@@ -374,12 +376,12 @@ private void AddPythonEngineToMainMenu()
         }
 
         private void OnWorkspaceHidden(WorkspaceModel workspace)
-        {            
+        {
             CalculateWindowMinWidth();
         }
 
         private void OnWorkspaceAdded(WorkspaceModel workspace)
-        {            
+        {
             CalculateWindowMinWidth();
         }
 
@@ -388,7 +390,7 @@ private void OnRequestExportWorkSpaceAsImage(object parameter)
             var workspace = this.ChildOfType<WorkspaceView>();
             WorkspaceView.ExportImageResult isCurrentWorkSpaceValidForImage = workspace.IsWorkSpaceRenderValidAsImage(true);
 
-            if (isCurrentWorkSpaceValidForImage== WorkspaceView.ExportImageResult.IsValidAsImage)
+            if (isCurrentWorkSpaceValidForImage == WorkspaceView.ExportImageResult.IsValidAsImage)
             {
                 dynamoViewModel.ShowSaveImageDialogAndSave(parameter);
             }
@@ -421,7 +423,7 @@ private void DynamoViewModel_RequestEnableShortcutBarItems(bool enable)
             {
                 exportMenu.IsEnabled = enable;
             }
-           
+
             if (!(shortcutBar is null))
             {
                 shortcutBar.IsNewButtonEnabled = enable;
@@ -465,12 +467,12 @@ private void OnWorkspaceOpened(WorkspaceModel workspace)
             }
 
             if (!(workspace is HomeWorkspaceModel hws))
-            return;
-            
+                return;
+
             foreach (var extension in viewExtensionManager.StorageAccessViewExtensions)
             {
                 DynamoModel.RaiseIExtensionStorageAccessWorkspaceOpened(hws, extension, dynamoViewModel.Model.Logger);
-            }            
+            }
         }
 
         private void OnWorkspaceSaving(WorkspaceModel workspace, Graph.SaveContext saveContext)
@@ -594,7 +596,7 @@ private ExtensionWindow AddExtensionWindow(IViewExtension viewExtension, UIEleme
                     window.ShouldMaximize = true;
                 }
             }
-            
+
             // Setting the content of the undocked window
             // Icon is passed from DynamoView (respecting Host integrator icon)
             SetApplicationIcon();
@@ -748,7 +750,7 @@ internal void CloseExtensionControl(IViewExtension viewExtension)
             CloseRightSideBarTab(tabitem);
             CloseExtensionWindow(tabName);
         }
- 
+
         /// <summary>
         /// Event handler for the CloseButton.
         /// This method triggers the close operation on the selected tab.
@@ -923,7 +925,8 @@ internal void UndockWindow(TabItem tabItem)
                 {
                     pythonNode.OnNodeEdited(textEditor.Text);
                 }
-                else {
+                else
+                {
                     pythonNode.OnNodeEdited(null);
                 }
 
@@ -1028,7 +1031,7 @@ private void OnRequestPaste()
 
             var locatableModels = clipBoard.Where(item => item is NoteModel || item is NodeModel);
             var modelsExcludingConnectorPins = locatableModels.Where(model => !(model is ConnectorPinModel));
-            if(modelsExcludingConnectorPins is null || modelsExcludingConnectorPins.Count()<1) { return; }
+            if (modelsExcludingConnectorPins is null || modelsExcludingConnectorPins.Count() < 1) { return; }
 
             var modelBounds = modelsExcludingConnectorPins.Select(lm =>
                 new Rect { X = lm.X, Y = lm.Y, Height = lm.Height, Width = lm.Width });
@@ -1202,7 +1205,7 @@ private void DynamoView_SizeChanged(object sender, SizeChangedEventArgs e)
             }
 
             UpdateGeometryScalingPopupLocation();
-            
+
             CalculateWindowThreshold();
         }
 
@@ -1220,8 +1223,8 @@ internal double GetSumOfControlsWidth()
         /// <summary>
         /// Calculates the Window threshold to display the text or only icons in the shortcut toolbar
         internal void CalculateWindowThreshold()
-        {            
-            dynamoViewModel.OnWindowResized(dynamoViewModel.Model.PreferenceSettings.WindowW <= GetSumOfControlsWidth());            
+        {
+            dynamoViewModel.OnWindowResized(dynamoViewModel.Model.PreferenceSettings.WindowW <= GetSumOfControlsWidth());
         }
 
         /// <summary>
@@ -1247,7 +1250,7 @@ private void UpdateGeometryScalingPopupLocation()
             if (workspaceView != null && workspaceView.GeoScalingPopup != null)
             {
                 workspaceView.GeoScalingPopup.UpdatePopupLocation();
-            }               
+            }
         }
 
         private void InitializeShortcutBar()
@@ -1314,7 +1317,7 @@ private void InitializeShortcutBar()
             shortcutBar.ShortcutBarItems.Add(saveButton);
             shortcutBar.ShortcutBarItems.Add(undoButton);
             shortcutBar.ShortcutBarItems.Add(redoButton);
-            
+
             shortcutBarGrid.Children.Add(shortcutBar);
         }
 
@@ -1427,7 +1430,7 @@ private void DynamoView_Loaded(object sender, EventArgs e)
 
             // If first run, Collect Info Prompt will appear
             UsageReportingManager.Instance.CheckIsFirstRun(this, dynamoViewModel.BrandingResourceProvider);
-            
+
 
             WorkspaceTabs.SelectedIndex = 0;
             dynamoViewModel = (DataContext as DynamoViewModel);
@@ -1576,7 +1579,7 @@ private void onRequestShorcutToolbarLoaded(double rightMenuActualWidth)
 
         private void GuideFlowEvents_GuidedTourStart(GuidedTourStateEventArgs args)
         {
-            if(sidebarGrid.Visibility != Visibility.Visible || sidebarGrid.ActualWidth < 2)
+            if (sidebarGrid.Visibility != Visibility.Visible || sidebarGrid.ActualWidth < 2)
             {
                 OnCollapsedLeftSidebarClick(null, null);
             }
@@ -1875,7 +1878,7 @@ private void DynamoViewModelRequestSave3DImage(object sender, ImageSaveEventArgs
                 dpiX = 96;
                 dpiY = 96;
             }
-            
+
             var bitmapSource = BackgroundPreview.View.RenderBitmap();
             // this image only really needs 24bits per pixel but to match previous implementation we'll use 32bit images.
             var rtBitmap = new RenderTargetBitmap(bitmapSource.PixelWidth, bitmapSource.PixelHeight, dpiX, dpiY, PixelFormats.Pbgra32);
@@ -2181,7 +2184,7 @@ private void WindowClosed(object sender, EventArgs e)
 
             // Force application shutdown when dynamo (in standalone mode) is closed, to prevent process hanging
             bool isStandaloneMode = string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName);
-            
+
             if (!DynamoModel.IsTestMode && isStandaloneMode && Application.Current != null)
             {
                 try
@@ -2222,7 +2225,7 @@ private void WindowClosed(object sender, EventArgs e)
 
             dynamoViewModel.RequestPythonEngineChangeNotice -= DynamoViewModel_RequestPythonEngineChangeNotice;
             dynamoViewModel.PythonEngineUpgradeToastRequested -= OnPythonEngineUpgradeToastRequested;
-            
+
             if (graphPropsExtensionMenuItem != null)
             {
                 graphPropsExtensionMenuItem.Checked -= OnGraphMetadataChecked;
@@ -2258,10 +2261,10 @@ private void WindowClosed(object sender, EventArgs e)
                 }
                 catch (Exception exc)
                 {
-                    Log($"{ext.Name} :  {exc.Message} during shutdown" );
+                    Log($"{ext.Name} :  {exc.Message} during shutdown");
                 }
             }
-          
+
 
             viewExtensionManager.MessageLogged -= Log;
             BackgroundPreview = null;
@@ -2869,6 +2872,8 @@ private void OnlineStatusGrid_MouseEnter(object sender, MouseEventArgs e)
 
         // Default side bar width
         private const int defaultSideBarWidth = 200;
+        //By default the extension bar width in px;
+        private const int defaultRightSideBarWidth = 455;
         // By default the extension bar over canvas size ratio is 2/5
         private const int DefaultExtensionBarWidthMultiplier = 2;
 
@@ -2906,7 +2911,7 @@ public bool ExtensionsCollapsed
                 }
                 else
                 {
-                    extensionsCollapsed = RightExtensionsViewColumn.Width.Value < SideBarCollapseThreshold;
+                    extensionsCollapsed = RightExtensionsViewColumn.Width.Value < RightSideBarCollapseThreshold;
                 }
 
                 return extensionsCollapsed;
@@ -2944,7 +2949,8 @@ private void HideOrShowRightSideBar()
         {
             if (dynamoViewModel.SideBarTabItems.Count == 0)
             {
-                if (RightExtensionsViewColumn.Width.Value != 0)
+                if (RightExtensionsViewColumn.Width.Value != 0
+                    && RightExtensionsViewColumn.ActualWidth > RightSideBarCollapseThreshold)
                 {
                     extensionsColumnWidth = RightExtensionsViewColumn.Width;
                 }
@@ -2957,7 +2963,7 @@ private void HideOrShowRightSideBar()
                 // 1. It allows the resized width to be remembered which is nice to have.
                 // 2. It allows to avoid a slider glitch which sets the panels size in pixel amount but using star,
                 // changing the proportions so that the initial value is counted as pixels after the first resize.
-                if (extensionsColumnWidth == null)
+                if (extensionsColumnWidth == null || extensionsColumnWidth.Value.Value < RightSideBarCollapseThreshold)
                 {
                     RightExtensionsViewColumn.Width = new GridLength(DefaultExtensionBarWidthMultiplier, GridUnitType.Star);
                 }
@@ -2997,23 +3003,20 @@ internal void ToggleExtensionBarCollapseStatus()
             if (ExtensionsCollapsed)
             {
                 if (extensionsColumnWidth == null)
-                {
                     RightExtensionsViewColumn.Width = new GridLength(DefaultExtensionBarWidthMultiplier, GridUnitType.Star);
+                else if (extensionsColumnWidth.Value.Value <= RightSideBarCollapseThreshold &&
+                    !extensionsColumnWidth.Value.Equals(new GridLength(DefaultExtensionBarWidthMultiplier, GridUnitType.Star)))
+                {
+                    RightExtensionsViewColumn.Width = new GridLength(defaultRightSideBarWidth, GridUnitType.Star);
                 }
                 else
-                {
                     RightExtensionsViewColumn.Width = extensionsColumnWidth.Value;
-                }
             }
             else
             {
-                if (RightExtensionsViewColumn.Width.Value != 0)
-                {
-                    extensionsColumnWidth = RightExtensionsViewColumn.Width;
-                }
+                extensionsColumnWidth = RightExtensionsViewColumn.Width;
                 RightExtensionsViewColumn.Width = new GridLength(0, GridUnitType.Star);
             }
-
             // TODO: Maynot need this depending on tab design
             UpdateLibraryCollapseIcon();
         }
@@ -3122,7 +3125,7 @@ private void Window_PreviewMouseUp(object sender, MouseButtonEventArgs e)
         private void WorkspaceTabs_TargetUpdated(object sender, DataTransferEventArgs e)
         {
             if (WorkspaceTabs.SelectedIndex >= 0)
-            ToggleWorkspaceTabVisibility(WorkspaceTabs.SelectedIndex);
+                ToggleWorkspaceTabVisibility(WorkspaceTabs.SelectedIndex);
             UpdateWorkspaceTabSizes();
         }
 
@@ -3148,10 +3151,10 @@ private void WorkspaceTabs_SizeChanged(object sender, SizeChangedEventArgs e)
         /// </summary>
         private void UpdateWorkspaceTabSizes()
         {
-            
+
             // We measure the full library width at runtime.
             int fullLibraryWidth = dynamoViewModel.LibraryWidth + LibraryScrollBarWidth;
-            
+
             // Difference between the full library width (at runtime) and the minimum offset required
             // by the TabItems to not overlap the 5 icon buttons.
             int difference = fullLibraryWidth - FirstTabItemMinimumLeftMarginOffset;
@@ -3211,13 +3214,13 @@ private void Log(string message)
         }
         private void LogNotification(NotificationMessage notification)
         {
-            dynamoViewModel.Model.Logger.LogNotification(notification.Sender, notification.Title,notification.ShortMessage, notification.DetailedMessage);
+            dynamoViewModel.Model.Logger.LogNotification(notification.Sender, notification.Title, notification.ShortMessage, notification.DetailedMessage);
         }
 
         private void Window_PreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
         {
             //if original sender was scroll bar(i.e Thumb) don't close the popup.
-            if(!(e.OriginalSource is Thumb) && !(e.OriginalSource is TextBox))
+            if (!(e.OriginalSource is Thumb) && !(e.OriginalSource is TextBox))
             {
                 HidePopupWhenWindowDeactivated(sender);
             }
@@ -3245,7 +3248,7 @@ private void ShowGetStartedGuidedTour()
         {
             //We pass the root UIElement to the GuidesManager so we can found other child UIElements
             try
-            {                
+            {
                 dynamoViewModel.MainGuideManager.LaunchTour(GuidesManager.GetStartedGuideName);
             }
             catch (Exception)
@@ -3256,15 +3259,16 @@ private void ShowGetStartedGuidedTour()
 
         private void RightExtensionSidebar_DragCompleted(object sender, DragCompletedEventArgs e)
         {
-            //Setting the width of right extension after resize to
+            //Setting the width of right extension after resize to only if extension bar widht is greater than threshold value.
+            if (RightExtensionsViewColumn.ActualWidth > defaultRightSideBarWidth)
             extensionsColumnWidth = RightExtensionsViewColumn.Width;
         }
 
         private void PackagesMenuGuide_Click(object sender, RoutedEventArgs e)
         {
             try
             {
-                dynamoViewModel.MainGuideManager.LaunchTour(GuidesManager.PackagesGuideName);                
+                dynamoViewModel.MainGuideManager.LaunchTour(GuidesManager.PackagesGuideName);
             }
             catch (Exception)
             {
@@ -3280,7 +3284,7 @@ private void FileTrustWarning_Click(object sender, RoutedEventArgs e)
         }
 
         private void DynamoView_Activated(object sender, EventArgs e)
-        {            
+        {
             if (fileTrustWarningPopup != null && dynamoViewModel.ViewingHomespace)
             {
                 fileTrustWarningPopup.ManagePopupActivation(true);
@@ -3289,7 +3293,7 @@ private void DynamoView_Activated(object sender, EventArgs e)
 
         private void DynamoView_Deactivated(object sender, EventArgs e)
         {
-            if(fileTrustWarningPopup != null)
+            if (fileTrustWarningPopup != null)
                 fileTrustWarningPopup.ManagePopupActivation(false);
         }