wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 555133 - Attempt to infer whether or not theme parts are transparent r=roc sr=vlad

Browse Source
This commit is contained in:
Rob Arnold 2010-03-29 15:24:40 -04:00
parent 6f2d38eace
commit 9ffd5134c3
15 changed files with 50 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gfx/public/nsITheme.h
View File

@ -59,8 +59,7 @@ class nsIAtom;
// IID for the nsITheme interface
// {887e8902-db6b-41b4-8481-a80f49c5a93a}
#define NS_ITHEME_IID \
{ 0x887e8902, 0xdb6b, 0x41b4, { 0x84, 0x81, 0xa8, 0x0f, 0x49, 0xc5, 0xa9, 0x3a } }
{ 0x23db7c13, 0x873d, 0x4fb5, { 0xaf, 0x29, 0xc1, 0xe9, 0xed, 0x91, 0x23, 0xf9 } }
// {D930E29B-6909-44e5-AB4B-AF10D6923705}
#define NS_THEMERENDERER_CID \
{ 0xd930e29b, 0x6909, 0x44e5, { 0xab, 0x4b, 0xaf, 0x10, 0xd6, 0x92, 0x37, 0x5 } }
@ -139,7 +138,18 @@ public:
nsIntSize* aResult,
PRBool* aIsOverridable)=0;
virtual nsTransparencyMode GetWidgetTransparency(PRUint8 aWidgetType)=0;
typedef enum Transparency {
eOpaque = 0,
eTransparent,
eUnknownTransparency
};
/**
* Returns what we know about the transparency of the widget.
*/
virtual Transparency GetWidgetTransparency(nsIFrame* aFrame, PRUint8 aWidgetType)
{ return eUnknownTransparency; }
NS_IMETHOD WidgetStateChanged(nsIFrame* aFrame, PRUint8 aWidgetType,
nsIAtom* aAttribute, PRBool* aShouldRepaint)=0;

2
layout/base/nsDisplayList.cpp
View File

@ -1069,7 +1069,7 @@ PRBool
nsDisplayBackground::IsOpaque(nsDisplayListBuilder* aBuilder) {
// theme background overrides any other background
if (mIsThemed)
return PR_FALSE;
return mThemeTransparency == nsITheme::eOpaque;
const nsStyleBackground* bg;

3
layout/base/nsDisplayList.h
View File

@ -1305,7 +1305,7 @@ private:
class nsDisplayBackground : public nsDisplayItem {
public:
nsDisplayBackground(nsIFrame* aFrame) : nsDisplayItem(aFrame) {
mIsThemed = mFrame->IsThemed();
mIsThemed = mFrame->IsThemed(&mThemeTransparency);
MOZ_COUNT_CTOR(nsDisplayBackground);
}
#ifdef NS_BUILD_REFCNT_LOGGING
@ -1325,6 +1325,7 @@ public:
private:
/* Used to cache mFrame->IsThemed() since it isn't a cheap call */
PRPackedBool mIsThemed;
nsITheme::Transparency mThemeTransparency;
};
/**

6
layout/base/nsLayoutUtils.cpp
View File

@ -3244,9 +3244,11 @@ nsLayoutUtils::GetFrameTransparency(nsIFrame* aBackgroundFrame,
if (HasNonZeroCorner(aCSSRootFrame->GetStyleContext()->GetStyleBorder()->mBorderRadius))
return eTransparencyTransparent;
nsTransparencyMode transparency;
nsITheme::Transparency transparency;
if (aCSSRootFrame->IsThemed(&transparency))
return transparency;
return transparency == nsITheme::eTransparent
? eTransparencyTransparent
: eTransparencyOpaque;
if (aCSSRootFrame->GetStyleDisplay()->mAppearance == NS_THEME_WIN_GLASS)
return eTransparencyGlass;

10
layout/generic/nsIFrame.h
View File

@ -977,19 +977,19 @@ public:
const nsRect& aDirtyRect,
nsDisplayList* aList);
PRBool IsThemed(nsTransparencyMode* aTransparencyMode = nsnull) {
return IsThemed(GetStyleDisplay(), aTransparencyMode);
PRBool IsThemed(nsITheme::Transparency* aTransparencyState = nsnull) {
return IsThemed(GetStyleDisplay(), aTransparencyState);
}
PRBool IsThemed(const nsStyleDisplay* aDisp,
nsTransparencyMode* aTransparencyMode = nsnull) {
nsITheme::Transparency* aTransparencyState = nsnull) {
if (!aDisp->mAppearance)
return PR_FALSE;
nsPresContext* pc = PresContext();
nsITheme *theme = pc->GetTheme();
if(!theme || !theme->ThemeSupportsWidget(pc, this, aDisp->mAppearance))
return PR_FALSE;
if (aTransparencyMode) {
*aTransparencyMode = theme->GetWidgetTransparency(aDisp->mAppearance);
if (aTransparencyState) {
*aTransparencyState = theme->GetWidgetTransparency(this, aDisp->mAppearance);
}
return PR_TRUE;
}

2
widget/src/cocoa/nsNativeThemeCocoa.h
View File

@ -90,7 +90,7 @@ public:
PRBool WidgetIsContainer(PRUint8 aWidgetType);
PRBool ThemeDrawsFocusForWidget(nsPresContext* aPresContext, nsIFrame* aFrame, PRUint8 aWidgetType);
PRBool ThemeNeedsComboboxDropmarker();
virtual nsTransparencyMode GetWidgetTransparency(PRUint8 aWidgetType);
virtual Transparency GetWidgetTransparency(nsIFrame* aFrame, PRUint8 aWidgetType);
protected:

8
widget/src/cocoa/nsNativeThemeCocoa.mm
View File

@ -2469,12 +2469,12 @@ nsNativeThemeCocoa::ThemeNeedsComboboxDropmarker()
return PR_FALSE;
}
nsTransparencyMode
nsNativeThemeCocoa::GetWidgetTransparency(PRUint8 aWidgetType)
nsITheme::Transparency
nsNativeThemeCocoa::GetWidgetTransparency(nsIFrame* aFrame, PRUint8 aWidgetType)
{
if (aWidgetType == NS_THEME_MENUPOPUP ||
aWidgetType == NS_THEME_TOOLTIP)
return eTransparencyTransparent;
return eTransparent;
return eTransparencyOpaque;
return eUnknownTransparency;
}

6
widget/src/gtk2/nsNativeThemeGTK.cpp
View File

@ -1341,9 +1341,3 @@ nsNativeThemeGTK::ThemeNeedsComboboxDropmarker()
{
return PR_FALSE;
}
nsTransparencyMode
nsNativeThemeGTK::GetWidgetTransparency(PRUint8 aWidgetType)
{
return eTransparencyOpaque;
}

2
widget/src/gtk2/nsNativeThemeGTK.h
View File

@ -92,8 +92,6 @@ public:
PRBool ThemeNeedsComboboxDropmarker();
virtual nsTransparencyMode GetWidgetTransparency(PRUint8 aWidgetType);
nsNativeThemeGTK();
virtual ~nsNativeThemeGTK();

6
widget/src/qt/nsNativeThemeQt.cpp
View File

@ -627,12 +627,6 @@ nsNativeThemeQt::ThemeNeedsComboboxDropmarker()
return PR_TRUE;
}
nsTransparencyMode
nsNativeThemeQt::GetWidgetTransparency(PRUint8 aWidgetType)
{
return eTransparencyOpaque;
}
void
nsNativeThemeQt::InitButtonStyle(PRUint8 aWidgetType,
nsIFrame* aFrame,

2
widget/src/qt/nsNativeThemeQt.h
View File

@ -99,8 +99,6 @@ public:
PRBool ThemeNeedsComboboxDropmarker();
virtual nsTransparencyMode GetWidgetTransparency(PRUint8 aWidgetType);
nsNativeThemeQt();
virtual ~nsNativeThemeQt();

18
widget/src/windows/nsNativeThemeWin.cpp
View File

@ -1776,10 +1776,22 @@ nsNativeThemeWin::ThemeNeedsComboboxDropmarker()
return PR_TRUE;
}
nsTransparencyMode
nsNativeThemeWin::GetWidgetTransparency(PRUint8 aWidgetType)
nsITheme::Transparency
nsNativeThemeWin::GetWidgetTransparency(nsIFrame* aFrame, PRUint8 aWidgetType)
{
return eTransparencyOpaque;
HANDLE theme = GetTheme(aWidgetType);
// For the classic theme we don't really have a way of knowing
if (!theme)
return eUnknownTransparency;
PRInt32 part, state;
nsresult rv = GetThemePartAndState(aFrame, aWidgetType, part, state);
// Fail conservatively
NS_ENSURE_SUCCESS(rv, eUnknownTransparency);
if (nsUXThemeData::isThemeBackgroundPartiallyTransparent(theme, part, state))
return eTransparent;
return eOpaque;
}
/* Windows 9x/NT/2000/Classic XP Theme Support */

2
widget/src/windows/nsNativeThemeWin.h
View File

@ -78,7 +78,7 @@ public:
nsIntSize* aResult,
PRBool* aIsOverridable);
virtual nsTransparencyMode GetWidgetTransparency(PRUint8 aWidgetType);
virtual Transparency GetWidgetTransparency(nsIFrame* aFrame, PRUint8 aWidgetType);
NS_IMETHOD WidgetStateChanged(nsIFrame* aFrame, PRUint8 aWidgetType,
nsIAtom* aAttribute, PRBool* aShouldRepaint);

2
widget/src/windows/nsUXThemeData.cpp
View File

@ -83,6 +83,7 @@ nsUXThemeData::GetThemeMarginsPtr nsUXThemeData::getThemeMargins = NULL;
nsUXThemeData::IsAppThemedPtr nsUXThemeData::isAppThemed = NULL;
nsUXThemeData::GetCurrentThemeNamePtr nsUXThemeData::getCurrentThemeName = NULL;
nsUXThemeData::GetThemeSysColorPtr nsUXThemeData::getThemeSysColor = NULL;
nsUXThemeData::IsThemeBackgroundPartiallyTransparentPtr nsUXThemeData::isThemeBackgroundPartiallyTransparent = NULL;
#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_LONGHORN
nsUXThemeData::DwmExtendFrameIntoClientAreaProc nsUXThemeData::dwmExtendFrameIntoClientAreaPtr = NULL;
@ -124,6 +125,7 @@ nsUXThemeData::Initialize()
isAppThemed = (IsAppThemedPtr)GetProcAddress(sThemeDLL, "IsAppThemed");
getCurrentThemeName = (GetCurrentThemeNamePtr)GetProcAddress(sThemeDLL, "GetCurrentThemeName");
getThemeSysColor = (GetThemeSysColorPtr)GetProcAddress(sThemeDLL, "GetThemeSysColor");
isThemeBackgroundPartiallyTransparent = (IsThemeBackgroundPartiallyTransparentPtr)GetProcAddress(sThemeDLL, "IsThemeBackgroundPartiallyTransparent");
}
#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_LONGHORN
sDwmDLL = ::LoadLibraryW(kDwmLibraryName);

2
widget/src/windows/nsUXThemeData.h
View File

@ -153,6 +153,7 @@ public:
LPWSTR pszColorBuff, int cchMaxColorChars,
LPWSTR pszSizeBuff, int cchMaxSizeChars);
typedef COLORREF (WINAPI*GetThemeSysColorPtr)(HANDLE hTheme, int iColorID);
typedef BOOL (WINAPI*IsThemeBackgroundPartiallyTransparentPtr)(HANDLE hTheme, int iPartId, int iStateId);
static OpenThemeDataPtr openTheme;
static CloseThemeDataPtr closeTheme;
@ -167,6 +168,7 @@ public:
static IsAppThemedPtr isAppThemed;
static GetCurrentThemeNamePtr getCurrentThemeName;
static GetThemeSysColorPtr getThemeSysColor;
static IsThemeBackgroundPartiallyTransparentPtr isThemeBackgroundPartiallyTransparent;
#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_LONGHORN
// dwmapi.dll function typedefs and declarations