Skip to content

Code Quality: Improved visual states for Properties Window #17099

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 4, 2025
Merged

Code Quality: Improved visual states for Properties Window #17099

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
c873d88
Code Quality: Improved visual states for properties nav
yaira2 May 4, 2025
076ffe4
Spacing
yaira2 May 4, 2025
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
14 changes: 14 additions & 0 deletions src/Files.App/Views/Properties/MainPropertiesPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,5 +191,19 @@

</NavigationView>

<VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="NavigationStates">
<VisualState x:Name="Narrow">
<VisualState.Setters>
<Setter Target="MainPropertiesWindowNavigationView.PaneDisplayMode" Value="LeftCompact" />
</VisualState.Setters>
</VisualState>
<VisualState x:Name="Wide">
<VisualState.Setters>
<Setter Target="MainPropertiesWindowNavigationView.PaneDisplayMode" Value="Left" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>
</Grid>
</vm:BasePropertiesPage>
26 changes: 11 additions & 15 deletions src/Files.App/Views/Properties/MainPropertiesPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
// Copyright (c) Files Community
// Licensed under the MIT License.

using Windows.Graphics;
using Files.App.ViewModels.Properties;
using Microsoft.UI;
using Microsoft.UI.Input;
using Microsoft.UI.Windowing;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Input;
using Microsoft.UI.Xaml.Navigation;
using Windows.Graphics;
using Windows.System;
using Windows.UI;
using Microsoft.UI.Input;

namespace Files.App.Views.Properties
{
Expand All @@ -33,7 +30,7 @@ public MainPropertiesPage()
FlowDirection = FlowDirection.RightToLeft;
}


// Navigates to specified properties page
public bool TryNavigateToPage(PropertiesNavigationViewItemType pageType)
{
Expand Down Expand Up @@ -62,7 +59,7 @@ private void Page_Loaded(object sender, RoutedEventArgs e)
Window.Closed += Window_Closed;

AppThemeModeService.ApplyResources();
UpdatePageLayout();
UpdatePageLayout(this.Width);
Window.RaiseSetTitleBarDragRegion(SetTitleBarDragRegion);
Window.AppWindow.Changed += AppWindow_Changed;
}
Expand All @@ -74,24 +71,23 @@ private int SetTitleBarDragRegion(InputNonClientPointerSource source, SizeInt32
}

private void Page_SizeChanged(object sender, SizeChangedEventArgs e)
=> UpdatePageLayout();
=> UpdatePageLayout(e.NewSize.Width);

private void Page_KeyDown(object sender, KeyRoutedEventArgs e)
{
if (e.Key.Equals(VirtualKey.Escape))
Window.Close();
}

private void UpdatePageLayout()
private void UpdatePageLayout(double pageWidth)
{
// NavigationView Pane Mode
MainPropertiesWindowNavigationView.PaneDisplayMode =
ActualWidth <= 600
? NavigationViewPaneDisplayMode.LeftCompact
: NavigationViewPaneDisplayMode.Left;
if (pageWidth < 600)
VisualStateManager.GoToState(this, "Narrow", true);
else
VisualStateManager.GoToState(this, "Wide", true);

// Collapse NavigationViewItem Content text
if (ActualWidth <= 600)
if (ActualWidth < 600)
foreach (var item in MainPropertiesViewModel.NavigationViewItems) item.IsCompact = true;
else
foreach (var item in MainPropertiesViewModel.NavigationViewItems) item.IsCompact = false;
Expand Down
Loading