Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-06 03:07:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FZ Editor] Switch between zone and dialog with Ctrl + Tab (#11435)

Browse Source 
* focus zone by ctrl + tab
* focus back
This commit is contained in:
Seraphima Zykova
2021-05-25 07:59:34 +03:00
committed by GitHub
parent b79ab9cd5d
commit 6821c50ffe
4 changed files with 62 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/modules/fancyzones/editor/FancyZonesEditor/Overlay.cs
View File

@@ -14,7 +14,8 @@ namespace FancyZonesEditor
{
private MainWindow _mainWindow;
private LayoutPreview _layoutPreview;
private UserControl _editor;
private UserControl _editorLayout;
private EditorWindow _editorWindow;
public List<Monitor> Monitors { get; private set; }
@@ -228,34 +229,32 @@ namespace FancyZonesEditor
_layoutPreview = null;
if (CurrentDataContext is GridLayoutModel)
{
_editor = new GridEditor();
_editorLayout = new GridEditor();
}
else if (CurrentDataContext is CanvasLayoutModel)
{
_editor = new CanvasEditor();
_editorLayout = new CanvasEditor();
}
CurrentLayoutWindow.Content = _editor;
EditorWindow window;
CurrentLayoutWindow.Content = _editorLayout;
if (model is GridLayoutModel)
{
window = new GridEditorWindow();
_editorWindow = new GridEditorWindow();
}
else
{
window = new CanvasEditorWindow();
_editorWindow = new CanvasEditorWindow();
}
window.Owner = Monitors[App.Overlay.CurrentDesktop].Window;
window.DataContext = model;
window.Show();
_editorWindow.Owner = Monitors[App.Overlay.CurrentDesktop].Window;
_editorWindow.DataContext = model;
_editorWindow.Show();
}
public void CloseEditor()
{
_editor = null;
_editorLayout = null;
_layoutPreview = new LayoutPreview
{
IsActualSize = true,
@@ -267,6 +266,22 @@ namespace FancyZonesEditor
OpenMainWindow();
}
public void FocusEditor()
{
if (_editorLayout != null && _editorLayout is CanvasEditor canvasEditor)
{
canvasEditor.FocusZone();
}
}
public void FocusEditorWindow()
{
if (_editorWindow != null)
{
_editorWindow.Focus();
}
}
public void CloseLayoutWindow()
{
for (int i = 0; i < DesktopsCount; i++)