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

[FZEditor]Don't automatically apply a layout after editing

Browse Source 
* "save" instead of "save and apply"

* fire property change
This commit is contained in:
Seraphima Zykova
2023-11-21 16:03:12 +01:00
committed by GitHub
parent afa72846b1
commit 06806ae283
4 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/fancyzones/editor/FancyZonesEditor/CanvasEditorWindow.xaml
View File

@@ -74,8 +74,8 @@
TabIndex="2" /> TabIndex="2" />
<Button <Button
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
Click="OnSaveApplyTemplate" Click="OnSave"
Content="{x:Static props:Resources.Save_Apply}" Content="{x:Static props:Resources.Save}"
Style="{StaticResource AccentButtonStyle}" Style="{StaticResource AccentButtonStyle}"
TabIndex="1" /> TabIndex="1" />
</Grid> </Grid>

9
src/modules/fancyzones/editor/FancyZonesEditor/EditorWindow.cs
View File

@@ -18,7 +18,7 @@ namespace FancyZonesEditor
EditingLayout = editingLayout; EditingLayout = editingLayout;
} }
protected void OnSaveApplyTemplate(object sender, RoutedEventArgs e) protected void OnSave(object sender, RoutedEventArgs e)
{ {
Logger.LogTrace(); Logger.LogTrace();
@@ -31,15 +31,8 @@ namespace FancyZonesEditor
EditingLayout.Persist(); EditingLayout.Persist();
MainWindowSettingsModel settings = ((App)Application.Current).MainWindowSettings;
settings.SetAppliedModel(EditingLayout);
App.Overlay.Monitors[App.Overlay.CurrentDesktop].SetLayoutSettings(EditingLayout);
App.FancyZonesEditorIO.SerializeLayoutTemplates(); App.FancyZonesEditorIO.SerializeLayoutTemplates();
App.FancyZonesEditorIO.SerializeCustomLayouts(); App.FancyZonesEditorIO.SerializeCustomLayouts();
App.FancyZonesEditorIO.SerializeAppliedLayouts();
App.FancyZonesEditorIO.SerializeDefaultLayouts();
App.FancyZonesEditorIO.SerializeLayoutHotkeys();
Close(); Close();
} }

4
src/modules/fancyzones/editor/FancyZonesEditor/GridEditorWindow.xaml
View File

@@ -72,8 +72,8 @@
TabIndex="1" /> TabIndex="1" />
<Button <Button
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
Click="OnSaveApplyTemplate" Click="OnSave"
Content="{x:Static props:Resources.Save_Apply}" Content="{x:Static props:Resources.Save}"
Style="{StaticResource AccentButtonStyle}" Style="{StaticResource AccentButtonStyle}"
TabIndex="0" /> TabIndex="0" />
</Grid> </Grid>

1
src/modules/fancyzones/editor/FancyZonesEditor/Models/LayoutModel.cs
View File

@@ -377,6 +377,7 @@ namespace FancyZonesEditor.Models
public void Persist() public void Persist()
{ {
PersistData(); PersistData();
FirePropertyChanged(nameof(PersistData));
} }
public void LayoutHotkeys_PropertyChanged(object sender, PropertyChangedEventArgs e) public void LayoutHotkeys_PropertyChanged(object sender, PropertyChangedEventArgs e)