Switch status bar with terminal

files-community · Jun 26, 2024 · 8d793ed · 8d793ed
1 parent 00ca8ca
commit 8d793ed
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/src/Files.App/UserControls/StatusBar.xaml b/src/Files.App/UserControls/StatusBar.xaml
@@ -403,7 +403,7 @@
 			Orientation="Horizontal"
 			Spacing="4">
 
-			<Button
+			<!--<Button
 				x:Name="SyncFolderUp"
 				Height="24"
 				Padding="8,0,8,0"
@@ -429,7 +429,7 @@
 				<Button.Content>
 					<FontIcon FontSize="12" Glyph="&#xE74B;" />
 				</Button.Content>
-			</Button>
+			</Button>-->
 
 			<SplitButton
 				x:Name="ToggleTerminal"

diff --git a/src/Files.App/Views/MainPage.xaml b/src/Files.App/Views/MainPage.xaml
@@ -200,8 +200,8 @@
 							MinHeight="100" />
 						<RowDefinition Height="Auto" />
 						<RowDefinition x:Name="PaneRow" Height="Auto" />
-						<RowDefinition x:Name="TerminalRow" Height="0" />
 						<RowDefinition Height="Auto" MinHeight="8" />
+						<RowDefinition x:Name="TerminalRow" Height="0" />
 					</Grid.RowDefinitions>
 					<Grid.ColumnDefinitions>
 						<ColumnDefinition
@@ -255,24 +255,24 @@
 						Loaded="PreviewPane_Loaded"
 						Unloaded="PreviewPane_Unloaded" />
 
-					<!--  Terminal  -->
-					<ContentPresenter
-						x:Name="TerminalControl"
-						Grid.Row="4"
-						Grid.ColumnSpan="3"
-						Margin="0,4,0,4"
-						Content="{x:Bind ViewModel.ActiveTerminal, Mode=OneWay}"
-						Visibility="{x:Bind ViewModel.IsTerminalViewOpen, Mode=OneWay}" />
-
 					<!--  Status Bar  -->
 					<uc:StatusBar
 						x:Name="StatusBar"
-						Grid.Row="5"
+						Grid.Row="4"
 						Grid.ColumnSpan="3"
 						x:Load="False"
 						ShowInfoText="{x:Bind SidebarAdaptiveViewModel.PaneHolder.ActivePaneOrColumn.InstanceViewModel.IsPageTypeNotHome, Mode=OneWay}"
 						Visibility="{x:Bind SidebarAdaptiveViewModel.PaneHolder.ActivePaneOrColumn.InstanceViewModel.IsPageTypeNotHome, Mode=OneWay}" />
 
+					<!--  Terminal  -->
+					<ContentPresenter
+						x:Name="TerminalControl"
+						Grid.Row="5"
+						Grid.ColumnSpan="3"
+						Margin="0,0,0,8"
+						Content="{x:Bind ViewModel.ActiveTerminal, Mode=OneWay}"
+						Visibility="{x:Bind ViewModel.IsTerminalViewOpen, Mode=OneWay}" />
+
 					<i:Interaction.Behaviors>
 						<icore:DataTriggerBehavior
 							Binding="{x:Bind ViewModel.IsTerminalViewOpen, Mode=OneWay}"