Skip to content

GPII-3187, GPII-3220: Added new high-contrast themes (and fixed the theme solution) #638

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amb26 merged 9 commits into from
Aug 27, 2018
Merged

GPII-3187, GPII-3220: Added new high-contrast themes (and fixed the theme solution) #638

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fedfa89
GPII-3220: Setting the high-contrast themes via their DisplayName.
stegru Jul 26, 2018
6ca4b3b
GPII-3220: Tests for setHighContrastTheme
stegru Jul 26, 2018
ece3e23
GPII-3187: Added custom pre-defined themes
stegru Jul 29, 2018
4082711
Merge remote-tracking branch 'upstream/master' into GPII-3220
stegru Jul 30, 2018
587f23a
GPII-3220: Implied highContrast/enabled from highContrastTheme, so QS…
stegru Aug 6, 2018
af2c9b0
Merge remote-tracking branch 'upstream/master' into GPII-3220
stegru Aug 6, 2018
7ede6a5
GPII-3220: Fixed high-contrast transformations.
stegru Aug 7, 2018
74ee7cc
GPII-3220: Made high-contrast theme names point to the correct files.
stegru Aug 10, 2018
1a3f632
Merge remote-tracking branch 'upstream/master' into GPII-3220
stegru Aug 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 42 additions & 9 deletions testData/solutions/win32.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2010,7 +2010,7 @@
]
},
"settingsHandlers": {
"configure": {
"configure-spi": {
"type": "gpii.windows.spiSettingsHandler",
"liveness": "live",
"options": {
Expand All @@ -2035,9 +2035,29 @@
},
"capabilitiesTransformations": {
"HighContrastOn": {
// (highContrast.enabled || highContrastTheme) && (highContrastTheme != "regular-contrast")
"transform": {
"type": "fluid.transforms.value",
"inputPath": "http://registry\\.gpii\\.net/common/highContrast/enabled",
"type": "fluid.transforms.binaryOp",
"left": {
"transform": {
"type": "fluid.transforms.binaryOp",
"leftPath": "http://registry\\.gpii\\.net/common/highContrast/enabled",
"left": false,
"operator": "||",
"rightPath": "http://registry\\.gpii\\.net/common/highContrastTheme",
"right": false
}
},
"operator": "&&",
"right": {
"transform": {
"type": "fluid.transforms.binaryOp",
"left": "",
"leftPath": "http://registry\\.gpii\\.net/common/highContrastTheme",
"operator": "!==",
"right": "regular-contrast"
}
},
"outputPath": "value"
},
"path": {
Expand All @@ -2052,7 +2072,7 @@
"http://registry\\.gpii\\.net/common/highContrast/enabled": "HighContrastOn.value"
}
},
"configureTheme": {
"configure-registry": {
"type": "gpii.windows.registrySettingsHandler",
"liveness": "live",
"options": {
Expand Down Expand Up @@ -2083,17 +2103,30 @@
"type": "fluid.transforms.valueMapper",
"defaultInputPath": "http://registry\\.gpii\\.net/common/highContrastTheme",
"match": {
"black-white": "%SystemRoot%\\resources\\Ease of Access Themes\\hcwhite.theme",
"white-black": "%SystemRoot%\\resources\\Ease of Access Themes\\hcblack.theme",
"black-yellow": "%SystemRoot%\\resources\\Ease of Access Themes\\hc1.theme",
"yellow-black": "%SystemRoot%\\resources\\Ease of Access Themes\\hc1.theme",
"lime-black": "%SystemRoot%\\resources\\Ease of Access Themes\\hc2.theme"
"black-white": "${{environment}.SystemRoot}\\resources\\Ease of Access Themes\\hcwhite.theme",
"white-black": "${{environment}.SystemRoot}\\resources\\Ease of Access Themes\\hcblack.theme",
"yellow-black": "${{environment}.SystemRoot}\\resources\\Ease of Access Themes\\hc1.theme",
"black-yellow": "${{environment}.SystemRoot}\\resources\\Ease of Access Themes\\yellowOnBlack.theme",
"lime-black": "${{environment}.SystemRoot}\\resources\\Ease of Access Themes\\hc2.theme",
"black-brown": "${{environment}.SystemRoot}\\resources\\Ease of Access Themes\\blackOnBrown.theme",
"gray-black": "${{environment}.SystemRoot}\\resources\\Ease of Access Themes\\grayOnDark.theme",
"grey-black": "${{environment}.SystemRoot}\\resources\\Ease of Access Themes\\grayOnDark.theme",
"gray-white": "${{environment}.SystemRoot}\\resources\\Ease of Access Themes\\grayOnWhite.theme",
"grey-white": "${{environment}.SystemRoot}\\resources\\Ease of Access Themes\\grayOnWhite.theme"
}
}
}
}
}
},
"configure": [
"settings.configure-registry",
{
"type": "gpii.windows.spiSettingsHandler.setHighContrastTheme",
"filename": "${{registry}HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Themes\\LastHighContrastTheme}"
},
"settings.configure-spi"
],
"isInstalled": [
{
"type": "gpii.deviceReporter.alwaysInstalled"
Expand Down