Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-12 00:50:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ui.* prefs were not accepting #rrggbb colors; sr=161290, r=brade, sr=bzbarsky

Browse Source
This commit is contained in:
glazman%netscape.com 2002-08-13 10:07:16 +00:00
parent 99c6bd69fb
commit 1c0cd514aa
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
widget/src/xpwidgets/nsXPLookAndFeel.cpp
View File

@ -243,7 +243,14 @@ static int PR_CALLBACK colorPrefChanged (const char *newpref, void *data)
rv = prefService->CopyCharPref(newpref, getter_Copies(colorStr));
if (NS_SUCCEEDED(rv) && colorStr[0]) {
nscolor thecolor;
if (NS_SUCCEEDED(NS_ColorNameToRGB(NS_ConvertASCIItoUCS2(colorStr),
if (colorStr[0] == '#') {
if (NS_SUCCEEDED(NS_HexToRGB(NS_ConvertASCIItoUCS2(Substring(colorStr, 1, colorStr.Length() - 1)),
&thecolor))) {
PRInt32 id = NS_PTR_TO_INT32(data);
CACHE_COLOR(id, thecolor);
}
}
else if (NS_SUCCEEDED(NS_ColorNameToRGB(NS_ConvertASCIItoUCS2(colorStr),
&thecolor))) {
PRInt32 id = NS_PTR_TO_INT32(data);
CACHE_COLOR(id, thecolor);
@ -294,7 +301,15 @@ nsXPLookAndFeel::InitColorFromPref(PRInt32 i, nsIPref* aPrefService)
{
nsAutoString colorNSStr; colorNSStr.AssignWithConversion(colorStr);
nscolor thecolor;
if (NS_SUCCEEDED(NS_ColorNameToRGB(colorNSStr, &thecolor)))
if (colorNSStr[0] == '#') {
nsAutoString hexString;
colorNSStr.Right(hexString, colorNSStr.Length() - 1);
if (NS_SUCCEEDED(NS_HexToRGB(hexString, &thecolor))) {
CACHE_COLOR(i, thecolor);
PL_strfree(colorStr);
}
}
else if (NS_SUCCEEDED(NS_ColorNameToRGB(colorNSStr, &thecolor)))
{
CACHE_COLOR(i, thecolor);
PL_strfree(colorStr);