Skip to content

Feature: Added horizontal layout to the preview pane #12496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 31, 2023
Merged

Feature: Added horizontal layout to the preview pane #12496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49de0f7
Feature: Added horizontal layout to the preview pane
yaira2 May 30, 2023
5423f41
Update PreviewPane.xaml
yaira2 May 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions src/Files.App/UserControls/Pane/PreviewPane.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,16 @@
<RowDefinition Height="2*" MinHeight="100" />
<RowDefinition x:Name="PropertiesRow" Height="3*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*" MinWidth="100" />
<ColumnDefinition x:Name="PropertiesColumn" Width="3*" />
</Grid.ColumnDefinitions>

<!-- Panes -->
<StackPanel
Grid.Row="0"
Grid.Column="0"
Grid.ColumnSpan="2"
Padding="12"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Expand All @@ -147,6 +153,8 @@
<Grid
x:Name="RootPreviewGrid"
Grid.Row="1"
Grid.Column="0"
Grid.ColumnSpan="2"
Margin="8"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Expand Down Expand Up @@ -186,6 +194,8 @@
<ScrollViewer
x:Name="RootPropertiesScrollViewer"
Grid.Row="2"
Grid.Column="0"
Grid.ColumnSpan="2"
AutomationProperties.Name="{helpers:ResourceString Name=PreviewPaneFileDetails/AutomationProperties/Name}"
Visibility="Visible">
<StackPanel Orientation="Vertical">
Expand Down Expand Up @@ -300,6 +310,11 @@
<VisualState.StateTriggers>
<triggers:IsEqualStateTrigger Value="{x:Bind PaneSettingsService.ShowPreviewOnly, Mode=OneWay}" To="False" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="RootPropertiesScrollViewer.Visibility" Value="Visible" />
<Setter Target="PropertiesRow.Height" Value="3*" />
<Setter Target="PropertiesColumn.Width" Value="3*" />
</VisualState.Setters>
</VisualState>
<VisualState>
<VisualState.StateTriggers>
Expand All @@ -308,6 +323,31 @@
<VisualState.Setters>
<Setter Target="RootPropertiesScrollViewer.Visibility" Value="Collapsed" />
<Setter Target="PropertiesRow.Height" Value="0" />
<Setter Target="PropertiesColumn.Width" Value="0" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>

<!-- Orientations -->
<VisualStateGroup x:Name="Orientation">
<VisualState x:Name="Vertical">
<VisualState.Setters>
<Setter Target="RootPreviewGrid.(Grid.Column)" Value="0" />
<Setter Target="RootPropertiesScrollViewer.Column" Value="0" />
<Setter Target="RootPropertiesScrollViewer.(Grid.RowSpan)" Value="1" />
<Setter Target="RootPropertiesScrollViewer.(Grid.ColumnSpan)" Value="2" />
<Setter Target="RootPreviewGrid.(Grid.ColumnSpan)" Value="2" />
<Setter Target="RootPreviewGrid.(Grid.RowSpan)" Value="1" />
</VisualState.Setters>
</VisualState>
<VisualState x:Name="Horizontal">
<VisualState.Setters>
<Setter Target="RootPropertiesScrollViewer.(Grid.Column)" Value="1" />
<Setter Target="RootPropertiesScrollViewer.(Grid.RowSpan)" Value="2" />
<Setter Target="RootPropertiesScrollViewer.(Grid.ColumnSpan)" Value="1" />
<Setter Target="RootPreviewGrid.(Grid.ColumnSpan)" Value="1" />
<Setter Target="RootPreviewGrid.(Grid.RowSpan)" Value="2" />
<Setter Target="RootPropertiesScrollViewer.(Grid.Row)" Value="1" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
Expand Down
2 changes: 2 additions & 0 deletions src/Files.App/UserControls/Pane/PreviewPane.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,13 @@ public void UpdatePosition(double panelWidth, double panelHeight)
{
Position = PreviewPanePositions.Right;
(MinWidth, MinHeight) = (150, 0);
VisualStateManager.GoToState(this, "Vertical", true);
}
else
{
Position = PreviewPanePositions.Bottom;
(MinWidth, MinHeight) = (0, 140);
VisualStateManager.GoToState(this, "Horizontal", true);
}
}

Expand Down