Skip to content

Commit 8d793ed

Browse files
committed
Switch status bar with terminal
1 parent 00ca8ca commit 8d793ed

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

src/Files.App/UserControls/StatusBar.xaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@
403403
Orientation="Horizontal"
404404
Spacing="4">
405405

406-
<Button
406+
<!--<Button
407407
x:Name="SyncFolderUp"
408408
Height="24"
409409
Padding="8,0,8,0"
@@ -429,7 +429,7 @@
429429
<Button.Content>
430430
<FontIcon FontSize="12" Glyph="&#xE74B;" />
431431
</Button.Content>
432-
</Button>
432+
</Button>-->
433433

434434
<SplitButton
435435
x:Name="ToggleTerminal"

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 x:Name="TerminalRow" Height="0" />
204203
<RowDefinition Height="Auto" MinHeight="8" />
204+
<RowDefinition x:Name="TerminalRow" Height="0" />
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-
267258
<!-- Status Bar -->
268259
<uc:StatusBar
269260
x:Name="StatusBar"
270-
Grid.Row="5"
261+
Grid.Row="4"
271262
Grid.ColumnSpan="3"
272263
x:Load="False"
273264
ShowInfoText="{x:Bind SidebarAdaptiveViewModel.PaneHolder.ActivePaneOrColumn.InstanceViewModel.IsPageTypeNotHome, Mode=OneWay}"
274265
Visibility="{x:Bind SidebarAdaptiveViewModel.PaneHolder.ActivePaneOrColumn.InstanceViewModel.IsPageTypeNotHome, Mode=OneWay}" />
275266

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)