Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 11:48:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Settings][ColorPicker]Fix issues related to custom color formats (#22493)

Browse Source 
* ColorPicker fixing problem settings not sent to CP module (when newly created formats change)

* ColorPicker fixing problem Move Up button diabled for the 2nd element of the color formats list after creating a new color format.
This commit is contained in:
Laszlo Nemeth
2022-12-05 18:22:32 +01:00
committed by GitHub
parent df0a14403c
commit 5c01e3a826
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/settings-ui/Settings.UI.Library/ColorFormatModel.cs
View File

@@ -86,8 +86,11 @@ namespace Microsoft.PowerToys.Settings.UI.Library
set set
{ {
_canMoveUp = value; if (value != _canMoveUp)
OnPropertyChanged(nameof(CanMoveUp)); {
_canMoveUp = value;
OnPropertyChanged(nameof(CanMoveUp));
}
} }
} }
@@ -100,8 +103,11 @@ namespace Microsoft.PowerToys.Settings.UI.Library
set set
{ {
_canMoveDown = value; if (value != _canMoveDown)
OnPropertyChanged(nameof(CanMoveDown)); {
_canMoveDown = value;
OnPropertyChanged(nameof(CanMoveDown));
}
} }
} }

4
src/settings-ui/Settings.UI/ViewModels/ColorPickerViewModel.cs
View File

@@ -336,7 +336,9 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
ColorFormats[0].CanMoveUp = true; ColorFormats[0].CanMoveUp = true;
} }
ColorFormats.Insert(0, new ColorFormatModel(newColorName, newColorFormat, isShown)); ColorFormatModel newModel = new ColorFormatModel(newColorName, newColorFormat, isShown);
newModel.PropertyChanged += ColorFormat_PropertyChanged;
ColorFormats.Insert(0, newModel);
SetPreviewSelectedIndex(); SetPreviewSelectedIndex();
} }

4
src/settings-ui/Settings.UI/Views/ColorPickerPage.xaml
View File

@@ -189,7 +189,7 @@
<MenuFlyoutItem <MenuFlyoutItem
x:Uid="MoveUp" x:Uid="MoveUp"
Click="ReorderButtonUp_Click" Click="ReorderButtonUp_Click"
IsEnabled="{x:Bind CanMoveUp}"> IsEnabled="{x:Bind CanMoveUp, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
<MenuFlyoutItem.Icon> <MenuFlyoutItem.Icon>
<FontIcon Glyph="&#xE74A;" /> <FontIcon Glyph="&#xE74A;" />
</MenuFlyoutItem.Icon> </MenuFlyoutItem.Icon>
@@ -197,7 +197,7 @@
<MenuFlyoutItem <MenuFlyoutItem
x:Uid="MoveDown" x:Uid="MoveDown"
Click="ReorderButtonDown_Click" Click="ReorderButtonDown_Click"
IsEnabled="{x:Bind CanMoveDown}"> IsEnabled="{x:Bind CanMoveDown, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
<MenuFlyoutItem.Icon> <MenuFlyoutItem.Icon>
<FontIcon Glyph="&#xE74B;" /> <FontIcon Glyph="&#xE74B;" />
</MenuFlyoutItem.Icon> </MenuFlyoutItem.Icon>