github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-02-19 03:14:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

feat: systemPreferences.getColor should return RGBA instead of RGB (#38960)

Browse Source 
* fix: return RGBA hex value from `SystemPreferences.getColor`

* docs: update docs to match changes of last commit

* fix: GetColor on windows now returns RGBA too

* fix: update tests for getColor RGBA on Windows

---------

Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
This commit is contained in:
ILikeTeaALot
2023-09-28 23:56:16 +01:00
committed by GitHub
parent dd7395ebed
commit d002f16157
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
shell/browser/api/electron_api_system_preferences_mac.mm
View File

@@ -540,7 +540,7 @@ std::string SystemPreferences::GetColor(gin_helper::ErrorThrower thrower,
}
if (sysColor)
return ToRGBHex(skia::NSSystemColorToSkColor(sysColor));
return ToRGBAHex(skia::NSSystemColorToSkColor(sysColor));
return "";
}

2
shell/browser/api/electron_api_system_preferences_win.cc
View File

@@ -133,7 +133,7 @@ std::string SystemPreferences::GetColor(gin_helper::ErrorThrower thrower,
});
if (const auto* iter = Lookup.find(color); iter != Lookup.end())
return ToRGBHex(color_utils::GetSysSkColor(iter->second));
return ToRGBAHex(color_utils::GetSysSkColor(iter->second));
thrower.ThrowError("Unknown color: " + color);
return "";