Skip to content

[FZ Editor] Pressing Esc closes dialogues.#9301

Merged
SeraphimaZykova merged 1 commit intomicrosoft:users/niels9001/fz-editorUXoverhaulfrom
SeraphimaZykova:editor/esc_close_dialog
Jan 27, 2021
Merged

[FZ Editor] Pressing Esc closes dialogues.#9301
SeraphimaZykova merged 1 commit intomicrosoft:users/niels9001/fz-editorUXoverhaulfrom
SeraphimaZykova:editor/esc_close_dialog

Conversation

@SeraphimaZykova
Copy link
Copy Markdown
Contributor

Summary of the Pull Request

What is this about:

If any dialog window is opened, Esc should close a dialog and shouldn't close the app.

What is include in the PR:

How does someone test / validate:

  • Open "Create new layout" dialog, press Esc. The dialog should be closed, the main window should remain open.
  • Open "Edit layout" dialog, press Esc. The dialog should be closed, the main window should remain open.
  • Press Esc without dialogs. Main window should be closed.

Quality Checklist

Contributor License Agreement (CLA)

A CLA must be signed. If not, go over here and sign the CLA.

Copy link
Copy Markdown
Contributor

@enricogior enricogior left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested, he worked as expected.
One minor side effect that we can fix after the release, is that after closing the dialog, the icon is highlighted:
image

@SeraphimaZykova SeraphimaZykova merged commit ab1486e into microsoft:users/niels9001/fz-editorUXoverhaul Jan 27, 2021
@SeraphimaZykova SeraphimaZykova deleted the editor/esc_close_dialog branch January 27, 2021 10:20
SeraphimaZykova added a commit that referenced this pull request Jan 27, 2021
enricogior pushed a commit that referenced this pull request Jan 27, 2021
* Removed MetroWindow, added theming support and modernWPF

* Rmoved MahApps refs

* Removed MahApps

* Updated canvas zones

* Updated GridEditor

* Fixes

* UI updates

* New layout type selection dialog

* New editor UI

* Updates

* Fix

* UI enhancements

* Updated UI

* Added styles to layoutpreview

* Accesibility improvements

* Accesibility and styling improvements

* Fix

* Cleaned up brushes

* Updated UX

* Updated UI

* Added no layouts description

* Fix

* UI fixes

* [FZ Editor] Serialize/deserialize settings (#8615)

* conflicts fix

* [FZ Editor] Parse json file instead of command line args (#8649)

* [FZ Editor] Serialize/deserialize settings fix (#8707)

* [FZ Editor] Hide unsupported settings in custom layouts flyouts (#8716)

* [FZ Editor] Duplicate custom layouts (#8718)

* [FZ Editor] Duplicate layout behavior (#8720)

* New UX proposal

* Updated spacing

* Switching to toggleswitches

* Revert toggleswitch

* Updated colorbrush

* Updated string for saving label

* Updated UI

* Dark theme color fixes

* Removed space

* [FZ Editor] Bind dialog properties (#9199)

* Resize editor window to fit the content in single-monitor mode (#9203)

* Editor opening fix (#9207)

* Disable "Create" button if the Name textbox is empty (#9212)

* [FZ Editor] Changed edit dialog for template layouts. (#9233)

* [FZ Editor] Small fixes and refactoring. (#9236)

* new layout creation refactoring
* "Save and apply" applies the layout
* number of zones header hide

* [FZ Editor] Empty layout template. (#9237)

* [FZ Editor] Move "Duplicate" and "Delete" buttons to the Edit dialog. (#9272)

* [FZ Editor] Preview the applied layout after editing another layout. (#9278)

* Fixed "Save and apply" button behavior (#9286)

* [FZ Editor] Save template layouts in the settings. (#9283)

* Added default custom layout name (#9291)

* close dialog before opening zones editor (#9302)

* Pressing Esc closes dialogs (#9301)

* [FZ Editor] Reset applied layout to "No layout" if it was deleted. (#9315)

* [FZ Editor] Dark theme colors (#9317)

* "Number of zones" buttons colors. (#9321)

* rebase fix

* added ModernWpf.dll

* address PR comments: updated colors

* added comments, replaced magic numbers

* refactoring

* merge zones crash fix

* removed redundant using directive

Co-authored-by: Niels Laute <niels9001@hotmail.com>
Co-authored-by: Niels Laute <niels.laute@live.nl>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants