mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-06-11 20:23:07 +08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

[Settings V2] Updated default color values for fz (#2972)

Browse Source 
* updated default color values for fz

* moved default values to shared constants

Co-authored-by: Lavius Motileng <laviusmotileng-ms>
This commit is contained in:
Lavius Motileng 2020-05-14 11:58:56 -07:00 committed by GitHub
parent b37695bc6f
commit 3737ad6524
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/Microsoft.PowerToys.Settings.UI.Lib/ConfigDefaults.cs Normal file
View File

@ -0,0 +1,22 @@
// Copyright (c) Microsoft Corporation
// The Microsoft Corporation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Collections.Generic;
using System.Text;
namespace Microsoft.PowerToys.Settings.UI.Lib
{
public static class ConfigDefaults
{
// Fancy Zones Default Colors
public static readonly string DefaultFancyZonesZoneHighlightColor = "#0078D7";
public static readonly string DefaultFancyZonesInActiveColor = "#F5FCFF";
public static readonly string DefaultFancyzonesBorderColor = "#FFFFFF";
// Fancy Zones Default Flags.
public static readonly bool DefaultFancyzonesShiftDrag = true;
public static readonly bool DefaultUseCursorposEditorStartupscreen = true;
}
}

10
src/core/Microsoft.PowerToys.Settings.UI.Lib/FZConfigProperties.cs
View File

@ -10,7 +10,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib
{ {
public FZConfigProperties() public FZConfigProperties()
{ {
this.FancyzonesShiftDrag = new BoolProperty(true); this.FancyzonesShiftDrag = new BoolProperty(ConfigDefaults.DefaultFancyzonesShiftDrag);
this.FancyzonesOverrideSnapHotkeys = new BoolProperty(); this.FancyzonesOverrideSnapHotkeys = new BoolProperty();
this.FancyzonesMouseSwitch = new BoolProperty(); this.FancyzonesMouseSwitch = new BoolProperty();
this.FancyzonesMoveWindowsAcrossMonitors = new BoolProperty(); this.FancyzonesMoveWindowsAcrossMonitors = new BoolProperty();
@ -18,9 +18,9 @@ namespace Microsoft.PowerToys.Settings.UI.Lib
this.FancyzonesZoneSetChangeMoveWindows = new BoolProperty(); this.FancyzonesZoneSetChangeMoveWindows = new BoolProperty();
this.FancyzonesVirtualDesktopChangeMoveWindows = new BoolProperty(); this.FancyzonesVirtualDesktopChangeMoveWindows = new BoolProperty();
this.FancyzonesAppLastZoneMoveWindows = new BoolProperty(); this.FancyzonesAppLastZoneMoveWindows = new BoolProperty();
this.UseCursorposEditorStartupscreen = new BoolProperty(true); this.UseCursorposEditorStartupscreen = new BoolProperty(ConfigDefaults.DefaultUseCursorposEditorStartupscreen);
this.FancyzonesShowOnAllMonitors = new BoolProperty(); this.FancyzonesShowOnAllMonitors = new BoolProperty();
this.FancyzonesZoneHighlightColor = new StringProperty("#F5FCFF"); this.FancyzonesZoneHighlightColor = new StringProperty(ConfigDefaults.DefaultFancyZonesZoneHighlightColor);
this.FancyzonesHighlightOpacity = new IntProperty(50); this.FancyzonesHighlightOpacity = new IntProperty(50);
this.FancyzonesEditorHotkey = new KeyBoardKeysProperty( this.FancyzonesEditorHotkey = new KeyBoardKeysProperty(
new HotkeySettings() new HotkeySettings()
@ -34,8 +34,8 @@ namespace Microsoft.PowerToys.Settings.UI.Lib
}); });
this.FancyzonesMakeDraggedWindowTransparent = new BoolProperty(); this.FancyzonesMakeDraggedWindowTransparent = new BoolProperty();
this.FancyzonesExcludedApps = new StringProperty(); this.FancyzonesExcludedApps = new StringProperty();
this.FancyzonesInActiveColor = new StringProperty("#F5FCFF"); this.FancyzonesInActiveColor = new StringProperty(ConfigDefaults.DefaultFancyZonesInActiveColor);
this.FancyzonesBorderColor = new StringProperty("#F5FCFF"); this.FancyzonesBorderColor = new StringProperty(ConfigDefaults.DefaultFancyzonesBorderColor);
} }
[JsonPropertyName("fancyzones_shiftDrag")] [JsonPropertyName("fancyzones_shiftDrag")]

6
src/core/Microsoft.PowerToys.Settings.UnitTest/ViewModelTests/FancyZones.cs
View File

@ -253,7 +253,7 @@ namespace ViewModelTests
{ {
// arrange // arrange
FancyZonesViewModel viewModel = new FancyZonesViewModel(); FancyZonesViewModel viewModel = new FancyZonesViewModel();
Assert.AreEqual("#F5FCFF", ToRGBHex(viewModel.ZoneHighlightColor)); Assert.AreEqual(ConfigDefaults.DefaultFancyZonesZoneHighlightColor, ToRGBHex(viewModel.ZoneHighlightColor));
// Assert // Assert
ShellPage.DefaultSndMSGCallback = msg => ShellPage.DefaultSndMSGCallback = msg =>
@ -271,7 +271,7 @@ namespace ViewModelTests
{ {
// arrange // arrange
FancyZonesViewModel viewModel = new FancyZonesViewModel(); FancyZonesViewModel viewModel = new FancyZonesViewModel();
Assert.AreEqual("#F5FCFF", ToRGBHex(viewModel.ZoneBorderColor)); Assert.AreEqual(ConfigDefaults.DefaultFancyzonesBorderColor, ToRGBHex(viewModel.ZoneBorderColor));
// Assert // Assert
ShellPage.DefaultSndMSGCallback = msg => ShellPage.DefaultSndMSGCallback = msg =>
@ -289,7 +289,7 @@ namespace ViewModelTests
{ {
// arrange // arrange
FancyZonesViewModel viewModel = new FancyZonesViewModel(); FancyZonesViewModel viewModel = new FancyZonesViewModel();
Assert.AreEqual("#F5FCFF", ToRGBHex(viewModel.ZoneInActiveColor)); Assert.AreEqual(ConfigDefaults.DefaultFancyZonesInActiveColor, ToRGBHex(viewModel.ZoneInActiveColor));
// Assert // Assert
ShellPage.DefaultSndMSGCallback = msg => ShellPage.DefaultSndMSGCallback = msg =>