Skip to content
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

Jump to bottom

Feature: Updated the design for Dual Pane mode #15469

Merged
merged 16 commits into from
May 27, 2024
Merged

Feature: Updated the design for Dual Pane mode #15469

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
7c9f8b5
Init
0x5bfa May 25, 2024
cae1caf
Use VisualStates (attempt)
0x5bfa May 25, 2024
b57e016
Single shadow & removal of accent color
0x5bfa May 26, 2024
f013ef7
Shadow switching
0x5bfa May 26, 2024
24d03bc
Revert
0x5bfa May 26, 2024
ebbb0db
Revert 2
0x5bfa May 26, 2024
0cc5586
Update src/Files.App/Views/Shells/ModernShellPage.xaml
0x5bfa May 26, 2024
2585a09
Removed border
yaira2 May 26, 2024
e6ad531
Merge branch 'main' into 5bfa/Feature-PaneHolderDesignTweak
yaira2 May 26, 2024
90e4926
Fixed issue where panes were cut off
yaira2 May 26, 2024
070d504
Assign translation when left pane is loaded
yaira2 May 26, 2024
f74c049
Fixed the shadow
yaira2 May 27, 2024
0d877a4
Added App.Theme.FileArea.SecondaryBackgroundBrush
yaira2 May 27, 2024
dd0b4c3
Removed Receivers
yaira2 May 27, 2024
c96244a
Update to use secondary theme brush
0x5bfa May 27, 2024
5bd5477
Remove brackets
0x5bfa May 27, 2024
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
12 changes: 12 additions & 0 deletions src/Files.App/Views/Shells/BaseShellPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,18 @@ public bool IsCurrentInstance
_IsCurrentInstanceTCS = new();

NotifyPropertyChanged(nameof(IsCurrentInstance));

if (!IsColumnView)
yaira2 marked this conversation as resolved.
Show resolved Hide resolved
{
if (value)
{
VisualStateManager.GoToState(this, "ShellBackgroundFocusOnState", true);
}
yaira2 marked this conversation as resolved.
Show resolved Hide resolved
else
{
VisualStateManager.GoToState(this, "ShellBackgroundFocusOffState", true);
}
}
}
}
}
Expand Down
14 changes: 14 additions & 0 deletions src/Files.App/Views/Shells/ModernShellPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,5 +79,19 @@
x:FieldModifier="public"
Navigated="ItemDisplayFrame_Navigated" />

<VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="ShellBackgroundFocusState">
<VisualState x:Name="ShellBackgroundFocusOnState">
<VisualState.Setters>
<Setter Target="RootGrid.Background" Value="{ThemeResource App.Theme.FileArea.BackgroundBrush}" />
</VisualState.Setters>
</VisualState>
<VisualState x:Name="ShellBackgroundFocusOffState">
<VisualState.Setters>
<Setter Target="RootGrid.Background" Value="{ThemeResource App.Theme.FileArea.SecondaryBackgroundBrush}" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>
</Grid>
</local:BaseShellPage>
Loading