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

Color picker tweaks (#5194)

Browse Source 
* Adjustments on default keystroke and removing key string whihc really didn't do anything

* moving color picker into alphabetical order

* removing removed property

* adjusting comment based on feedback from martin

Co-authored-by: Clint Rutkas <crutkas@microsoft.com>
This commit is contained in:
Clint Rutkas
2020-07-23 15:53:12 -07:00
committed by GitHub
parent 84018f5b61
commit b6e5a5e655
7 changed files with 51 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/Microsoft.PowerToys.Settings.UI/Controls/HotkeySettingsControl.xaml.cs
View File

@@ -126,7 +126,6 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
return;
default:
internalSettings.Code = matchValueCode;
internalSettings.Key = matchValueText;
break;
}
}

3
src/core/Microsoft.PowerToys.Settings.UI/ViewModels/FancyZonesViewModel.cs
View File

@@ -420,7 +420,8 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
{
if (value.IsEmpty())
{
_editorHotkey = new HotkeySettings(true, false, false, false, "'", 192);
_editorHotkey = FZConfigProperties.DefaultHotkeyValue;
}
else
{

7
src/core/Microsoft.PowerToys.Settings.UI/Views/ColorPickerPage.xaml
View File

@@ -69,10 +69,15 @@
<ComboBoxItem Content="RGB - RGB(100, 50, 75)"/>
</ComboBox>
<!--
Disabling this until we have a safer way to reset cursor as
we can hit a state where the cursor doesn't reset
<ToggleSwitch x:Uid="ColorPicker_ChangeCursor"
IsOn="{Binding ChangeCursor, Mode=TwoWay}"
Margin="{StaticResource MediumTopMargin}"
IsEnabled="{Binding IsEnabled}"/>
IsEnabled="{Binding IsEnabled}" />
-->
</StackPanel>
<StackPanel
x:Name="SidePanel"

13
src/core/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml
View File

@@ -46,6 +46,12 @@
</winui:NavigationViewItem.Icon>
</winui:NavigationViewItem>
<winui:NavigationViewItem x:Uid="Shell_ColorPicker" helpers:NavHelper.NavigateTo="views:ColorPickerPage">
<winui:NavigationViewItem.Icon>
<FontIcon Glyph="&#xEF3C;"/>
</winui:NavigationViewItem.Icon>
</winui:NavigationViewItem>
<!-- TO DO: Update icon -->
<winui:NavigationViewItem x:Uid="Shell_FancyZones" helpers:NavHelper.NavigateTo="views:FancyZonesPage">
<winui:NavigationViewItem.Icon>
@@ -93,13 +99,6 @@
<FontIcon Glyph="&#xEDA7;"/>
</winui:NavigationViewItem.Icon>
</winui:NavigationViewItem>
<winui:NavigationViewItem x:Uid="Shell_ColorPicker" helpers:NavHelper.NavigateTo="views:ColorPickerPage">
<winui:NavigationViewItem.Icon>
<FontIcon Glyph="&#xEF3C;"/>
</winui:NavigationViewItem.Icon>
</winui:NavigationViewItem>
</winui:NavigationView.MenuItems>
<i:Interaction.Behaviors>
<behaviors:NavigationViewHeaderBehavior