Skip to content

Commit

Permalink
Revert "Switch status bar with terminal"
Browse files Browse the repository at this point in the history
This reverts commit 248347a.
  • Loading branch information
yaira2 committed Jun 26, 2024
1 parent 248347a commit ed091ab
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions src/Files.App/Views/MainPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,8 @@
MinHeight="100" />
<RowDefinition Height="Auto" />
<RowDefinition x:Name="PaneRow" Height="Auto" />
<RowDefinition Height="Auto" MinHeight="8" />
<RowDefinition x:Name="TerminalRow" Height="0" />
<RowDefinition Height="Auto" MinHeight="8" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition
Expand Down Expand Up @@ -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="4"
Grid.Row="5"
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}"
Expand Down

0 comments on commit ed091ab

Please sign in to comment.