Removed extra controls from visual tree (#7949)

Author: yaira2

src/Files/UserControls/InnerNavigationToolbar.xaml

@@ -29,7 +29,6 @@
             <x:Boolean x:Key="True">True</x:Boolean>
             <x:Boolean x:Key="False">False</x:Boolean>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="/ResourceDictionaries/ToolbarButtonStyle.xaml" />
                 <ResourceDictionary Source="/ResourceDictionaries/PathIcons.xaml" />
                 <ResourceDictionary Source="/ResourceDictionaries/RightAlignedToggleSwitchStyle.xaml" />
             </ResourceDictionary.MergedDictionaries>

src/Files/UserControls/NavigationToolbar.xaml

@@ -514,54 +514,52 @@
                     </Button.KeyboardAccelerators>
                 </Button>
 
-                <Grid x:Name="OngoingTasksGrid" Visibility="{x:Bind OngoingTasksViewModel.AnyBannersPresent, Mode=OneWay}">
-                    <Button
-                        x:Name="OngoingTasks"
-                        Width="36"
-                        Height="32"
-                        Padding="0"
-                        AccessKey="T"
-                        AutomationProperties.Name="{helpers:ResourceString Name=OngoingTasks}"
-                        Background="Transparent"
-                        Style="{StaticResource ToolBarButtonStyle}"
-                        ToolTipService.ToolTip="{helpers:ResourceString Name=OngoingTasks}"
-                        Visibility="Visible">
-                        <Button.Content>
-                            <Grid>
-                                <FontIcon
-                                    x:Name="OngoingTasksFontIcon"
-                                    FontSize="16"
-                                    Glyph="&#xF16A;" />
-                                <muxc:ProgressRing
-                                    x:Name="MedianOperationProgressRing"
-                                    Width="28"
-                                    Height="28"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    x:Load="{x:Bind OngoingTasksViewModel.AnyOperationsOngoing, Mode=OneWay}"
-                                    IsIndeterminate="False"
-                                    Value="{x:Bind OngoingTasksViewModel.MedianOperationProgressValue, Mode=OneWay}" />
-                            </Grid>
-                        </Button.Content>
-                        <Button.Flyout>
-                            <Flyout contract8Present:ShouldConstrainToRootBounds="False" AutomationProperties.Name="{helpers:ResourceString Name=OngoingTasks}">
-                                <uc:OngoingTasksFlyout
-                                    x:Name="OngoingTasksControl"
-                                    Width="300"
-                                    MinHeight="300"
-                                    MaxHeight="400"
-                                    x:FieldModifier="public"
-                                    IsTabStop="True"
-                                    OngoingTasksViewModel="{x:Bind OngoingTasksViewModel}" />
-                            </Flyout>
-                        </Button.Flyout>
-                    </Button>
-                    <muxc:InfoBadge
-                        x:Name="StatusInfoBadge"
-                        HorizontalAlignment="Right"
-                        VerticalAlignment="Top"
-                        Value="{x:Bind OngoingTasksViewModel.InfoBadgeValue, Mode=OneWay}" />
-                </Grid>
+                <Button
+                    x:Name="OngoingTasks"
+                    Width="36"
+                    Height="32"
+                    Padding="0"
+                    AccessKey="T"
+                    AutomationProperties.Name="{helpers:ResourceString Name=OngoingTasks}"
+                    Background="Transparent"
+                    Style="{StaticResource ToolBarButtonStyle}"
+                    ToolTipService.ToolTip="{helpers:ResourceString Name=OngoingTasks}"
+                    Visibility="{x:Bind OngoingTasksViewModel.AnyBannersPresent, Mode=OneWay}">
+                    <Button.Content>
+                        <Grid>
+                            <FontIcon
+                                x:Name="OngoingTasksFontIcon"
+                                FontSize="16"
+                                Glyph="&#xF16A;" />
+                            <muxc:ProgressRing
+                                x:Name="MedianOperationProgressRing"
+                                Width="28"
+                                Height="28"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                x:Load="{x:Bind OngoingTasksViewModel.AnyOperationsOngoing, Mode=OneWay}"
+                                IsIndeterminate="False"
+                                Value="{x:Bind OngoingTasksViewModel.MedianOperationProgressValue, Mode=OneWay}" />
+                        </Grid>
+                    </Button.Content>
+                    <Button.Flyout>
+                        <Flyout contract8Present:ShouldConstrainToRootBounds="False" AutomationProperties.Name="{helpers:ResourceString Name=OngoingTasks}">
+                            <uc:OngoingTasksFlyout
+                                x:Name="OngoingTasksControl"
+                                Width="300"
+                                MinHeight="300"
+                                MaxHeight="400"
+                                x:FieldModifier="public"
+                                IsTabStop="True"
+                                OngoingTasksViewModel="{x:Bind OngoingTasksViewModel}" />
+                        </Flyout>
+                    </Button.Flyout>
+                </Button>
+                <muxc:InfoBadge
+                    x:Name="StatusInfoBadge"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Top"
+                    Value="{x:Bind OngoingTasksViewModel.InfoBadgeValue, Mode=OneWay}" />
 
                 <Button
                     x:Name="SettingsButton"

src/Files/Views/PaneHolderPage.xaml

@@ -53,15 +53,13 @@
                 MinWidth="0" />
         </Grid.ColumnDefinitions>
 
-        <Border x:Name="PaneLeftBorder">
-            <local:ModernShellPage
-                x:Name="PaneLeft"
-                ContentChanged="Pane_ContentChanged"
-                IsPageMainPane="True"
-                Loaded="PaneLeft_Loaded"
-                NavParams="{x:Bind NavParamsLeft, Mode=OneWay}"
-                PaneHolder="{x:Bind}" />
-        </Border>
+        <local:ModernShellPage
+            x:Name="PaneLeft"
+            ContentChanged="Pane_ContentChanged"
+            IsPageMainPane="True"
+            Loaded="PaneLeft_Loaded"
+            NavParams="{x:Bind NavParamsLeft, Mode=OneWay}"
+            PaneHolder="{x:Bind}" />
 
         <Border
             x:Name="PaneRightBorder"