Tweaks to TabView Margin Resizing

Author: lukeblevins

Files/UserControls/ModernSidebar.xaml.cs

@@ -38,15 +38,11 @@ public INavigationControlItem SelectedSidebarItem
             }
             set
             {
-                if(!(value as INavigationControlItem).Equals(null))
+                if (value != _SelectedSidebarItem)
                 {
-                    if (value != _SelectedSidebarItem)
-                    {
-                        _SelectedSidebarItem = value;
-                        NotifyPropertyChanged("SelectedSidebarItem");
-                    }
+                    _SelectedSidebarItem = value;
+                    NotifyPropertyChanged("SelectedSidebarItem");
                 }
-                
             }
         }
 

Files/View Models/InteractionViewModel.cs

@@ -16,11 +16,11 @@ public Thickness TabsLeftMargin
             set => Set(ref _TabsLeftMargin, value);
         }
 
-        private double _DragAreaWidth = 200;
-        public double DragAreaWidth
+        private bool _LeftMarginLoaded = true;
+        public bool LeftMarginLoaded
         {
-            get => _DragAreaWidth;
-            set => Set(ref _DragAreaWidth, value);
+            get => _LeftMarginLoaded;
+            set => Set(ref _LeftMarginLoaded, value);
         }
 
         private bool _PermanentlyDelete = false;

Files/Views/InstanceTabsView.xaml

@@ -25,15 +25,14 @@
                 <StaticResource x:Key="TabViewItemHeaderBackgroundSelected" ResourceKey="RibbonBackgroundColor" />
                 <Thickness x:Key="TabViewHeaderPadding">0,0,0,0</Thickness>
             </muxc:TabView.Resources>
-            <muxc:TabView.TabStripHeaderTemplate>
-                <DataTemplate>
+            <muxc:TabView.TabStripHeader>
                     <Grid
                         x:Name="DragArea2"
                         Background="Transparent"
-                        Width="{x:Bind local:App.InteractionViewModel.DragAreaWidth, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                        Width="200"
+                        Visibility="{x:Bind local:App.InteractionViewModel.LeftMarginLoaded, Mode=OneWay}"
                         />
-                </DataTemplate>
-            </muxc:TabView.TabStripHeaderTemplate>
+            </muxc:TabView.TabStripHeader>
             <muxc:TabView.TabStripFooterTemplate>
                 <DataTemplate>
                     <Grid>

Files/Views/InstanceTabsView.xaml.cs

@@ -391,12 +391,12 @@ public void TabStrip_SelectionChanged(object sender, SelectionChangedEventArgs e
                 if ((tabView.SelectedItem as TabViewItem).Header.ToString() == "Settings")
                 {
                     App.InteractionViewModel.TabsLeftMargin = new Thickness(0, 0, 0, 0);
-                    App.InteractionViewModel.DragAreaWidth = 0;
+                    App.InteractionViewModel.LeftMarginLoaded = false;
                 }
                 else
                 {
                     App.InteractionViewModel.TabsLeftMargin = new Thickness(200, 0, 0, 0);
-                    App.InteractionViewModel.DragAreaWidth = 200;
+                    App.InteractionViewModel.LeftMarginLoaded = true;
                 }
 
                 Microsoft.UI.Xaml.Controls.FontIconSource icon = new Microsoft.UI.Xaml.Controls.FontIconSource();