Skip to content

Commit ed091ab

Browse files
committed
Revert "Switch status bar with terminal"
This reverts commit 248347a.
1 parent 248347a commit ed091ab

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

src/Files.App/Views/MainPage.xaml

+11-11
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@
200200
MinHeight="100" />
201201
<RowDefinition Height="Auto" />
202202
<RowDefinition x:Name="PaneRow" Height="Auto" />
203-
<RowDefinition Height="Auto" MinHeight="8" />
204203
<RowDefinition x:Name="TerminalRow" Height="0" />
204+
<RowDefinition Height="Auto" MinHeight="8" />
205205
</Grid.RowDefinitions>
206206
<Grid.ColumnDefinitions>
207207
<ColumnDefinition
@@ -255,24 +255,24 @@
255255
Loaded="PreviewPane_Loaded"
256256
Unloaded="PreviewPane_Unloaded" />
257257

258+
<!-- Terminal -->
259+
<ContentPresenter
260+
x:Name="TerminalControl"
261+
Grid.Row="4"
262+
Grid.ColumnSpan="3"
263+
Margin="0,4,0,4"
264+
Content="{x:Bind ViewModel.ActiveTerminal, Mode=OneWay}"
265+
Visibility="{x:Bind ViewModel.IsTerminalViewOpen, Mode=OneWay}" />
266+
258267
<!-- Status Bar -->
259268
<uc:StatusBar
260269
x:Name="StatusBar"
261-
Grid.Row="4"
270+
Grid.Row="5"
262271
Grid.ColumnSpan="3"
263272
x:Load="False"
264273
ShowInfoText="{x:Bind SidebarAdaptiveViewModel.PaneHolder.ActivePaneOrColumn.InstanceViewModel.IsPageTypeNotHome, Mode=OneWay}"
265274
Visibility="{x:Bind SidebarAdaptiveViewModel.PaneHolder.ActivePaneOrColumn.InstanceViewModel.IsPageTypeNotHome, Mode=OneWay}" />
266275

267-
<!-- Terminal -->
268-
<ContentPresenter
269-
x:Name="TerminalControl"
270-
Grid.Row="5"
271-
Grid.ColumnSpan="3"
272-
Margin="0,0,0,8"
273-
Content="{x:Bind ViewModel.ActiveTerminal, Mode=OneWay}"
274-
Visibility="{x:Bind ViewModel.IsTerminalViewOpen, Mode=OneWay}" />
275-
276276
<i:Interaction.Behaviors>
277277
<icore:DataTriggerBehavior
278278
Binding="{x:Bind ViewModel.IsTerminalViewOpen, Mode=OneWay}"

0 commit comments

Comments
 (0)