Skip to content

Added the ability to use the escape key to exit the properties window #1504

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 6 commits into from
Jul 19, 2020
Merged

Added the ability to use the escape key to exit the properties window #1504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ae1baa6
Added the ability to use the escape key to exit the properties window
winston-de Jul 19, 2020
df34bc2
Moved escape key code from Interaction.cs to Properties.xaml.cs
winston-de Jul 19, 2020
ebf42ea
Merge branch 'master' into master
winston-de Jul 19, 2020
d4dbdeb
Added a check for the UniversalApiContract
winston-de Jul 19, 2020
e7c3556
Merge branch 'master' of https://github.com/winiston2212/files-uwp
winston-de Jul 19, 2020
81ca8ac
Merge branch 'master' into master
winston-de Jul 19, 2020
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
2 changes: 2 additions & 0 deletions Files/Interacts/Interaction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,10 +535,12 @@ private async Task OpenPropertiesWindow(object item)
{
if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8))
{

AppWindow appWindow = await AppWindow.TryCreateAsync();
Frame frame = new Frame();
appWindow.TitleBar.ExtendsContentIntoTitleBar = true;
frame.Navigate(typeof(Properties), item, new SuppressNavigationTransitionInfo());

WindowManagementPreview.SetPreferredMinSize(appWindow, new Size(400, 500));

appWindow.RequestSize(new Size(400, 475));
Expand Down
2 changes: 1 addition & 1 deletion Files/Views/Pages/Properties.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
Loaded="Properties_Loaded"
RequestedTheme="{x:Bind local1:ThemeHelper.RootTheme}"
Unloaded="Properties_Unloaded"
mc:Ignorable="d">
mc:Ignorable="d" KeyDown="Page_KeyDown">
<Page.Background>
<AcrylicBrush
Windows10version1903:TintLuminosityOpacity="0.9"
Expand Down
10 changes: 10 additions & 0 deletions Files/Views/Pages/Properties.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@
using System.Threading;
using Windows.Foundation.Metadata;
using Windows.Storage;
using Windows.System;
using Windows.UI;
using Windows.UI.WindowManagement;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Input;
using Windows.UI.Xaml.Navigation;

namespace Files
Expand Down Expand Up @@ -131,5 +133,13 @@ private async void Button_Click(object sender, RoutedEventArgs e)
propertiesDialog.Hide();
}
}

async void Page_KeyDown(object sender, KeyRoutedEventArgs e)
{
if (e.Key.Equals(VirtualKey.Escape) && ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8))
{
await propWindow.CloseAsync();
}
}
}
}