Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 394406 with gfx.color_management turned ON inconsistent behaviour for selection colours. r+sr+a=roc

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@233838 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
masayuki%d-toybox.com 2007-09-04 11:28:13 +00:00
parent f4c1926acb
commit ff68debbf8
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mozilla/widget/src/xpwidgets/nsXPLookAndFeel.cpp
View File

@ -431,6 +431,29 @@ nsXPLookAndFeel::~nsXPLookAndFeel()
{
}
PRBool
nsXPLookAndFeel::IsSpecialColor(const nsColorID aID, nscolor &aColor)
{
switch (aID) {
case eColor_TextSelectForeground:
return (aColor == NS_DONT_CHANGE_COLOR);
case eColor_IMESelectedRawTextBackground:
case eColor_IMESelectedConvertedTextBackground:
case eColor_IMERawInputBackground:
case eColor_IMEConvertedTextBackground:
case eColor_IMESelectedRawTextForeground:
case eColor_IMESelectedConvertedTextForeground:
case eColor_IMERawInputForeground:
case eColor_IMEConvertedTextForeground:
case eColor_IMERawInputUnderline:
case eColor_IMEConvertedTextUnderline:
case eColor_IMESelectedRawTextUnderline:
case eColor_IMESelectedConvertedTextUnderline:
return NS_IS_IME_SPECIAL_COLOR(aColor);
}
return PR_FALSE;
}
//
// All these routines will return NS_OK if they have a value,
// in which case the nsLookAndFeel should use that value;
@ -545,7 +568,7 @@ nsXPLookAndFeel::GetColor(const nsColorID aID, nscolor &aColor)
}
if (NS_SUCCEEDED(NativeGetColor(aID, aColor))) {
if (gfxPlatform::IsCMSEnabled()) {
if (gfxPlatform::IsCMSEnabled() && !IsSpecialColor(aID, aColor)) {
cmsHTRANSFORM transform = gfxPlatform::GetCMSInverseRGBTransform();
if (transform) {
PRUint8 color[3];

1
mozilla/widget/src/xpwidgets/nsXPLookAndFeel.h
View File

@ -118,6 +118,7 @@ protected:
void InitFromPref(nsLookAndFeelFloatPref* aPref, nsIPrefBranch* aPrefBranch);
void InitColorFromPref(PRInt32 aIndex, nsIPrefBranch* aPrefBranch);
virtual nsresult NativeGetColor(const nsColorID aID, nscolor& aColor) = 0;
PRBool IsSpecialColor(const nsColorID aID, nscolor &aColor);
static PRBool sInitialized;
static nsLookAndFeelIntPref sIntPrefs[];