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

Bug 658829 part 1 - preliminary cleanup r=bbondy

Browse Source 
--HG--
extra : rebase_source : d2c506e0a64a4686dbf7d18b2c89bafcd83ea015
This commit is contained in:
Jim Mathies 2013-02-25 00:16:02 +00:00
parent 59a14873fd
commit 2c84cca05c
6 changed files with 257 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
widget/windows/WinUtils.cpp
View File

@ -42,8 +42,12 @@ namespace widget {
const char FaviconHelper::kJumpListCacheDir[] = "jumpListCache";
const char FaviconHelper::kShortcutCacheDir[] = "shortcutCache";
// SHCreateItemFromParsingName is only available on vista and up.
WinUtils::SHCreateItemFromParsingNamePtr WinUtils::sCreateItemFromParsingName = nullptr;
// apis available on vista and up.
WinUtils::SHCreateItemFromParsingNamePtr WinUtils::sCreateItemFromParsingName = NULL;
WinUtils::SHGetKnownFolderPathPtr WinUtils::sGetKnownFolderPath = NULL;
static const PRUnichar kSehllLibraryName[] = L"shell32.dll";
static HMODULE sShellDll = NULL;
/* static */
WinUtils::WinVersion
@ -363,38 +367,56 @@ WinUtils::InitMSG(UINT aMessage, WPARAM wParam, LPARAM lParam)
return msg;
}
/* static */
bool
WinUtils::VistaCreateItemFromParsingNameInit()
{
// Load and store Vista+ SHCreateItemFromParsingName
if (sCreateItemFromParsingName) {
return true;
}
static HMODULE sShellDll = nullptr;
if (sShellDll) {
return false;
}
static const PRUnichar kSehllLibraryName[] = L"shell32.dll";
sShellDll = ::LoadLibraryW(kSehllLibraryName);
if (!sShellDll) {
return false;
}
sCreateItemFromParsingName = (SHCreateItemFromParsingNamePtr)
GetProcAddress(sShellDll, "SHCreateItemFromParsingName");
return sCreateItemFromParsingName != nullptr;
}
/* static */
HRESULT
WinUtils::SHCreateItemFromParsingName(PCWSTR pszPath, IBindCtx *pbc,
REFIID riid, void **ppv)
{
if (!VistaCreateItemFromParsingNameInit())
if (sCreateItemFromParsingName) {
return sCreateItemFromParsingName(pszPath, pbc, riid, ppv);
}
if (!sShellDll) {
sShellDll = ::LoadLibraryW(kSehllLibraryName);
if (!sShellDll) {
return false;
}
}
sCreateItemFromParsingName = (SHCreateItemFromParsingNamePtr)
GetProcAddress(sShellDll, "SHCreateItemFromParsingName");
if (!sCreateItemFromParsingName)
return E_FAIL;
return sCreateItemFromParsingName(pszPath, pbc, riid, ppv);
}
/* static */
HRESULT
WinUtils::SHGetKnownFolderPath(REFKNOWNFOLDERID rfid,
DWORD dwFlags,
HANDLE hToken,
PWSTR *ppszPath)
{
if (sGetKnownFolderPath) {
return sGetKnownFolderPath(rfid, dwFlags, hToken, ppszPath);
}
if (!sShellDll) {
sShellDll = ::LoadLibraryW(kSehllLibraryName);
if (!sShellDll) {
return false;
}
}
sGetKnownFolderPath = (SHGetKnownFolderPathPtr)
GetProcAddress(sShellDll, "SHGetKnownFolderPath");
if (!sGetKnownFolderPath)
return E_FAIL;
return sGetKnownFolderPath(rfid, dwFlags, hToken, ppszPath);
}
#ifdef MOZ_PLACES
/************************************************************************/
/* Constructs as AsyncFaviconDataReady Object

23
widget/windows/WinUtils.h
View File

@ -190,12 +190,19 @@ public:
/**
* SHCreateItemFromParsingName() calls native SHCreateItemFromParsingName()
* API. Note that you must call VistaCreateItemFromParsingNameInit() before
* calling this. And the result must be TRUE. Otherwise, returns E_FAIL.
* API which is available on Vista and up.
*/
static HRESULT SHCreateItemFromParsingName(PCWSTR pszPath, IBindCtx *pbc,
REFIID riid, void **ppv);
/**
* SHGetKnownFolderPath() calls native SHGetKnownFolderPath()
* API which is available on Vista and up.
*/
static HRESULT SHGetKnownFolderPath(REFKNOWNFOLDERID rfid,
DWORD dwFlags,
HANDLE hToken,
PWSTR *ppszPath);
/**
* GetShellItemPath return the file or directory path of a shell item.
* Internally calls IShellItem's GetDisplayName.
@ -229,13 +236,11 @@ private:
REFIID riid,
void **ppv);
static SHCreateItemFromParsingNamePtr sCreateItemFromParsingName;
/**
* VistaCreateItemFromParsingNameInit() initializes the static pointer for
* SHCreateItemFromParsingName() API which is usable only on Vista and later.
* This returns TRUE if the API is available. Otherwise, FALSE.
*/
static bool VistaCreateItemFromParsingNameInit();
typedef HRESULT (WINAPI * SHGetKnownFolderPathPtr)(REFKNOWNFOLDERID rfid,
DWORD dwFlags,
HANDLE hToken,
PWSTR *ppszPath);
static SHGetKnownFolderPathPtr sGetKnownFolderPath;
};
#ifdef MOZ_PLACES

330
widget/windows/nsNativeThemeWin.cpp
View File

@ -44,13 +44,20 @@ extern PRLogModuleInfo* gWindowsLog;
NS_IMPL_ISUPPORTS_INHERITED1(nsNativeThemeWin, nsNativeTheme, nsITheme)
static inline bool IsHTMLContent(nsIFrame *frame)
nsNativeThemeWin::nsNativeThemeWin()
{
nsIContent* content = frame->GetContent();
return content && content->IsHTML();
// If there is a relevant change in forms.css for windows platform,
// static widget style variables (e.g. sButtonBorderSize) should be
// reinitialized here.
}
static int32_t GetTopLevelWindowActiveState(nsIFrame *aFrame)
nsNativeThemeWin::~nsNativeThemeWin()
{
nsUXThemeData::Invalidate();
}
static int32_t
GetTopLevelWindowActiveState(nsIFrame *aFrame)
{
// Get the widget. nsIFrame's GetNearestWidget walks up the view chain
// until it finds a real window.
@ -67,7 +74,8 @@ static int32_t GetTopLevelWindowActiveState(nsIFrame *aFrame)
return mozilla::widget::themeconst::FS_INACTIVE;
}
static int32_t GetWindowFrameButtonState(nsIFrame *aFrame, nsEventStates eventState)
static int32_t
GetWindowFrameButtonState(nsIFrame *aFrame, nsEventStates eventState)
{
if (GetTopLevelWindowActiveState(aFrame) ==
mozilla::widget::themeconst::FS_INACTIVE) {
@ -84,7 +92,8 @@ static int32_t GetWindowFrameButtonState(nsIFrame *aFrame, nsEventStates eventSt
return mozilla::widget::themeconst::BS_NORMAL;
}
static int32_t GetClassicWindowFrameButtonState(nsEventStates eventState)
static int32_t
GetClassicWindowFrameButtonState(nsEventStates eventState)
{
if (eventState.HasState(NS_EVENT_STATE_ACTIVE) &&
eventState.HasState(NS_EVENT_STATE_HOVER))
@ -92,7 +101,8 @@ static int32_t GetClassicWindowFrameButtonState(nsEventStates eventState)
return DFCS_BUTTONPUSH;
}
static void QueryForButtonData(nsIFrame *aFrame)
static void
QueryForButtonData(nsIFrame *aFrame)
{
if (nsUXThemeData::sTitlebarInfoPopulatedThemed && nsUXThemeData::sTitlebarInfoPopulatedAero)
return;
@ -107,17 +117,8 @@ static void QueryForButtonData(nsIFrame *aFrame)
nsUXThemeData::UpdateTitlebarInfo(window->GetWindowHandle());
}
nsNativeThemeWin::nsNativeThemeWin() {
// If there is a relevant change in forms.css for windows platform,
// static widget style variables (e.g. sButtonBorderSize) should be
// reinitialized here.
}
nsNativeThemeWin::~nsNativeThemeWin() {
nsUXThemeData::Invalidate();
}
static bool IsTopLevelMenu(nsIFrame *aFrame)
static bool
IsTopLevelMenu(nsIFrame *aFrame)
{
bool isTopLevel(false);
nsMenuFrame *menuFrame = do_QueryFrame(aFrame);
@ -127,16 +128,21 @@ static bool IsTopLevelMenu(nsIFrame *aFrame)
return isTopLevel;
}
static MARGINS GetCheckboxMargins(HANDLE theme, HDC hdc)
static MARGINS
GetCheckboxMargins(HANDLE theme, HDC hdc)
{
MARGINS checkboxContent = {0};
GetThemeMargins(theme, hdc, MENU_POPUPCHECK, MCB_NORMAL, TMT_CONTENTMARGINS, NULL, &checkboxContent);
GetThemeMargins(theme, hdc, MENU_POPUPCHECK, MCB_NORMAL,
TMT_CONTENTMARGINS, NULL, &checkboxContent);
return checkboxContent;
}
static SIZE GetCheckboxBGSize(HANDLE theme, HDC hdc)
static SIZE
GetCheckboxBGSize(HANDLE theme, HDC hdc)
{
SIZE checkboxSize;
GetThemePartSize(theme, hdc, MENU_POPUPCHECK, MC_CHECKMARKNORMAL, NULL, TS_TRUE, &checkboxSize);
GetThemePartSize(theme, hdc, MENU_POPUPCHECK, MC_CHECKMARKNORMAL,
NULL, TS_TRUE, &checkboxSize);
MARGINS checkboxMargins = GetCheckboxMargins(theme, hdc);
@ -152,17 +158,27 @@ static SIZE GetCheckboxBGSize(HANDLE theme, HDC hdc)
ret.cy = height;
return ret;
}
static SIZE GetCheckboxBGBounds(HANDLE theme, HDC hdc)
static SIZE
GetCheckboxBGBounds(HANDLE theme, HDC hdc)
{
MARGINS checkboxBGSizing = {0};
MARGINS checkboxBGContent = {0};
GetThemeMargins(theme, hdc, MENU_POPUPCHECKBACKGROUND, MCB_NORMAL, TMT_SIZINGMARGINS, NULL, &checkboxBGSizing);
GetThemeMargins(theme, hdc, MENU_POPUPCHECKBACKGROUND, MCB_NORMAL, TMT_CONTENTMARGINS, NULL, &checkboxBGContent);
GetThemeMargins(theme, hdc, MENU_POPUPCHECKBACKGROUND, MCB_NORMAL,
TMT_SIZINGMARGINS, NULL, &checkboxBGSizing);
GetThemeMargins(theme, hdc, MENU_POPUPCHECKBACKGROUND, MCB_NORMAL,
TMT_CONTENTMARGINS, NULL, &checkboxBGContent);
#define posdx(d) ((d) > 0 ? d : 0)
int dx = posdx(checkboxBGContent.cxRightWidth - checkboxBGSizing.cxRightWidth) + posdx(checkboxBGContent.cxLeftWidth - checkboxBGSizing.cxLeftWidth);
int dy = posdx(checkboxBGContent.cyTopHeight - checkboxBGSizing.cyTopHeight) + posdx(checkboxBGContent.cyBottomHeight - checkboxBGSizing.cyBottomHeight);
int dx = posdx(checkboxBGContent.cxRightWidth -
checkboxBGSizing.cxRightWidth) +
posdx(checkboxBGContent.cxLeftWidth -
checkboxBGSizing.cxLeftWidth);
int dy = posdx(checkboxBGContent.cyTopHeight -
checkboxBGSizing.cyTopHeight) +
posdx(checkboxBGContent.cyBottomHeight -
checkboxBGSizing.cyBottomHeight);
#undef posdx
@ -171,7 +187,9 @@ static SIZE GetCheckboxBGBounds(HANDLE theme, HDC hdc)
ret.cy += dy;
return ret;
}
static SIZE GetGutterSize(HANDLE theme, HDC hdc)
static SIZE
GetGutterSize(HANDLE theme, HDC hdc)
{
SIZE gutterSize;
GetThemePartSize(theme, hdc, MENU_POPUPGUTTER, 0, NULL, TS_TRUE, &gutterSize);
@ -189,103 +207,107 @@ static SIZE GetGutterSize(HANDLE theme, HDC hdc)
return ret;
}
static HRESULT DrawThemeBGRTLAware(HANDLE theme, HDC hdc, int part, int state,
const RECT *widgetRect, const RECT *clipRect,
bool isRTL)
/* DrawThemeBGRTLAware - render a theme part based on rtl state.
* Some widgets are not direction-neutral and need to be drawn reversed for
* RTL. Windows provides a way to do this with SetLayout, but this reverses
* the entire drawing area of a given device context, which means that its
* use will also affect the positioning of the widget. There are two ways
* to work around this:
*
* Option 1: Alter the position of the rect that we send so that we cancel
* out the positioning effects of SetLayout
* Option 2: Create a memory DC with the widgetRect's dimensions, draw onto
* that, and then transfer the results back to our DC
*
* This function tries to implement option 1, under the assumption that the
* correct way to reverse the effects of SetLayout is to translate the rect
* such that the offset from the DC bitmap's left edge to the old rect's
* left edge is equal to the offset from the DC bitmap's right edge to the
* new rect's right edge. In other words,
* (oldRect.left + vpOrg.x) == ((dcBMP.width - vpOrg.x) - newRect.right)
*/
static HRESULT
DrawThemeBGRTLAware(HANDLE aTheme, HDC aHdc, int aPart, int aState,
const RECT *aWidgetRect, const RECT *aClipRect,
bool aIsRtl)
{
/* Some widgets are not direction-neutral and need to be drawn reversed for
* RTL. Windows provides a way to do this with SetLayout, but this reverses
* the entire drawing area of a given device context, which means that its
* use will also affect the positioning of the widget. There are two ways
* to work around this:
*
* Option 1: Alter the position of the rect that we send so that we cancel
* out the positioning effects of SetLayout
* Option 2: Create a memory DC with the widgetRect's dimensions, draw onto
* that, and then transfer the results back to our DC
*
* This function tries to implement option 1, under the assumption that the
* correct way to reverse the effects of SetLayout is to translate the rect
* such that the offset from the DC bitmap's left edge to the old rect's
* left edge is equal to the offset from the DC bitmap's right edge to the
* new rect's right edge. In other words,
* (oldRect.left + vpOrg.x) == ((dcBMP.width - vpOrg.x) - newRect.right)
*
* I am not 100% sure that this is the correct approach, but I have yet to
* find a problem with it.
*/
NS_ASSERTION(aTheme, "Bad theme handle.");
NS_ASSERTION(aHdc, "Bad hdc.");
NS_ASSERTION(aWidgetRect, "Bad rect.");
NS_ASSERTION(aClipRect, "Bad clip rect.");
if (isRTL) {
HGDIOBJ hObj = GetCurrentObject(hdc, OBJ_BITMAP);
BITMAP bitmap;
POINT vpOrg;
if (hObj &&
GetObject(hObj, sizeof(bitmap), &bitmap) &&
GetViewportOrgEx(hdc, &vpOrg))
{
RECT newWRect(*widgetRect);
newWRect.left = bitmap.bmWidth - (widgetRect->right + 2*vpOrg.x);
newWRect.right = bitmap.bmWidth - (widgetRect->left + 2*vpOrg.x);
RECT newCRect;
RECT *newCRectPtr = NULL;
if (clipRect) {
newCRect.top = clipRect->top;
newCRect.bottom = clipRect->bottom;
newCRect.left = bitmap.bmWidth - (clipRect->right + 2*vpOrg.x);
newCRect.right = bitmap.bmWidth - (clipRect->left + 2*vpOrg.x);
newCRectPtr = &newCRect;
}
SetLayout(hdc, LAYOUT_RTL);
HRESULT hr = DrawThemeBackground(theme, hdc, part, state, &newWRect, newCRectPtr);
SetLayout(hdc, 0);
if (hr == S_OK)
return hr;
}
if (!aIsRtl) {
return DrawThemeBackground(aTheme, aHdc, aPart, aState,
aWidgetRect, aClipRect);
}
// Draw normally if LTR or if anything went wrong
return DrawThemeBackground(theme, hdc, part, state, widgetRect, clipRect);
HGDIOBJ hObj = GetCurrentObject(aHdc, OBJ_BITMAP);
BITMAP bitmap;
POINT vpOrg;
if (hObj && GetObject(hObj, sizeof(bitmap), &bitmap) &&
GetViewportOrgEx(aHdc, &vpOrg)) {
RECT newWRect(*aWidgetRect);
newWRect.left = bitmap.bmWidth - (aWidgetRect->right + 2*vpOrg.x);
newWRect.right = bitmap.bmWidth - (aWidgetRect->left + 2*vpOrg.x);
RECT newCRect;
RECT *newCRectPtr = NULL;
if (aClipRect) {
newCRect.top = aClipRect->top;
newCRect.bottom = aClipRect->bottom;
newCRect.left = bitmap.bmWidth - (aClipRect->right + 2*vpOrg.x);
newCRect.right = bitmap.bmWidth - (aClipRect->left + 2*vpOrg.x);
newCRectPtr = &newCRect;
}
SetLayout(aHdc, LAYOUT_RTL);
HRESULT hr = DrawThemeBackground(aTheme, aHdc, aPart, aState, &newWRect,
newCRectPtr);
SetLayout(aHdc, 0);
if (SUCCEEDED(hr)) {
return hr;
}
}
return DrawThemeBackground(aTheme, aHdc, aPart, aState,
aWidgetRect, aClipRect);
}
/*
Caption button padding data - 'hot' button padding.
These areas are considered hot, in that they activate
a button when hovered or clicked. The button graphic
is drawn inside the padding border. Unrecognized themes
are treated as their recognized counterparts for now.
left top right bottom
classic min 1 2 0 1
classic max 0 2 1 1
classic close 1 2 2 1
aero basic min 1 2 0 2
aero basic max 0 2 1 2
aero basic close 1 2 1 2
xp theme min 0 2 0 2
xp theme max 0 2 1 2
xp theme close 1 2 2 2
'cold' button padding - generic button padding, should
be handled in css.
left top right bottom
classic min 0 0 0 0
classic max 0 0 0 0
classic close 0 0 0 0
aero basic min 0 0 1 0
aero basic max 1 0 0 0
aero basic close 0 0 0 0
xp theme min 0 0 1 0
xp theme max 1 0 0 0
xp theme close 0 0 0 0
*/
* Caption button padding data - 'hot' button padding.
* These areas are considered hot, in that they activate
* a button when hovered or clicked. The button graphic
* is drawn inside the padding border. Unrecognized themes
* are treated as their recognized counterparts for now.
* left top right bottom
* classic min 1 2 0 1
* classic max 0 2 1 1
* classic close 1 2 2 1
*
* aero basic min 1 2 0 2
* aero basic max 0 2 1 2
* aero basic close 1 2 1 2
*
* xp theme min 0 2 0 2
* xp theme max 0 2 1 2
* xp theme close 1 2 2 2
*
* 'cold' button padding - generic button padding, should
* be handled in css.
* left top right bottom
* classic min 0 0 0 0
* classic max 0 0 0 0
* classic close 0 0 0 0
*
* aero basic min 0 0 1 0
* aero basic max 1 0 0 0
* aero basic close 0 0 0 0
*
* xp theme min 0 0 1 0
* xp theme max 1 0 0 0
* xp theme close 0 0 0 0
*/
enum CaptionDesktopTheme {
CAPTION_CLASSIC = 0,
@ -316,10 +338,43 @@ static CaptionButtonPadding buttonData[3] = {
}
};
/**
* Progress bar related constants.
* These values are found by experimenting and comparing against native widgets
* used by the system. They are very unlikely exact but try to not be too wrong.
// Adds "hot" caption button padding to minimum widget size.
static void
AddPaddingRect(nsIntSize* aSize, CaptionButton button) {
if (!aSize)
return;
RECT offset;
if (!IsAppThemed())
offset = buttonData[CAPTION_CLASSIC].hotPadding[button];
else if (WinUtils::GetWindowsVersion() < WinUtils::VISTA_VERSION)
offset = buttonData[CAPTION_XPTHEME].hotPadding[button];
else
offset = buttonData[CAPTION_BASIC].hotPadding[button];
aSize->width += offset.left + offset.right;
aSize->height += offset.top + offset.bottom;
}
// If we've added padding to the minimum widget size, offset
// the area we draw into to compensate.
static void
OffsetBackgroundRect(RECT& rect, CaptionButton button) {
RECT offset;
if (!IsAppThemed())
offset = buttonData[CAPTION_CLASSIC].hotPadding[button];
else if (WinUtils::GetWindowsVersion() < WinUtils::VISTA_VERSION)
offset = buttonData[CAPTION_XPTHEME].hotPadding[button];
else
offset = buttonData[CAPTION_BASIC].hotPadding[button];
rect.left += offset.left;
rect.top += offset.top;
rect.right -= offset.right;
rect.bottom -= offset.bottom;
}
/*
* Progress bar related constants. These values are found by experimenting and
* comparing against native widgets used by the system. They are very unlikely
* exact but try to not be too wrong.
*/
// The width of the overlay used to animate the horizontal progress bar (Vista and later).
static const int32_t kProgressHorizontalVistaOverlaySize = 120;
@ -342,37 +397,6 @@ static const int32_t kProgressIndeterminateDelay = 500;
// Delay (in ms) between two determinate progress bar animation on Vista/7.
static const int32_t kProgressDeterminedVistaDelay = 1000;
// Adds "hot" caption button padding to minimum widget size.
static void AddPaddingRect(nsIntSize* aSize, CaptionButton button) {
if (!aSize)
return;
RECT offset;
if (!IsAppThemed())
offset = buttonData[CAPTION_CLASSIC].hotPadding[button];
else if (WinUtils::GetWindowsVersion() == WinUtils::WINXP_VERSION)
offset = buttonData[CAPTION_XPTHEME].hotPadding[button];
else
offset = buttonData[CAPTION_BASIC].hotPadding[button];
aSize->width += offset.left + offset.right;
aSize->height += offset.top + offset.bottom;
}
// If we've added padding to the minimum widget size, offset
// the area we draw into to compensate.
static void OffsetBackgroundRect(RECT& rect, CaptionButton button) {
RECT offset;
if (!IsAppThemed())
offset = buttonData[CAPTION_CLASSIC].hotPadding[button];
else if (WinUtils::GetWindowsVersion() == WinUtils::WINXP_VERSION)
offset = buttonData[CAPTION_XPTHEME].hotPadding[button];
else
offset = buttonData[CAPTION_BASIC].hotPadding[button];
rect.left += offset.left;
rect.top += offset.top;
rect.right -= offset.right;
rect.bottom -= offset.bottom;
}
HANDLE
nsNativeThemeWin::GetTheme(uint8_t aWidgetType)
{

24
widget/windows/nsUXThemeConstants.h
View File

@ -10,6 +10,10 @@
* Windows' Theme API. For more information on theme parts and states see
* http://msdn.microsoft.com/en-us/library/bb773210(VS.85).aspx
*/
#include <vssym32.h>
#include <vsstyle.h>
#define THEME_COLOR 204
#define THEME_FONT 210
@ -24,10 +28,6 @@
#define TKP_FOCUSED 4
#define TKP_DISABLED 5
// Toolbar constants
#define TP_BUTTON 1
#define TP_SEPARATOR 5
// Toolbarbutton constants
#define TB_CHECKED 5
#define TB_HOVER_CHECKED 6
@ -78,16 +78,6 @@
#define SPNP_UP 1
#define SPNP_DOWN 2
// Progress bar constants
#define PP_BAR 1
#define PP_BARVERT 2
#define PP_CHUNK 3
#define PP_CHUNKVERT 4
#define PP_FILL 5
#define PP_FILLVERT 6
#define PP_MOVEOVERLAY 8
#define PP_MOVEOVERLAYVERT 9
// Tab constants
#define TABP_TAB 4
#define TABP_TAB_SELECTED 5
@ -151,12 +141,6 @@
#define MSM_NORMAL 1
#define MSM_DISABLED 2
// From tmschema.h in the Vista SDK
#define TMT_TEXTCOLOR 3803
#define TMT_SIZINGMARGINS 3601
#define TMT_CONTENTMARGINS 3602
#define TMT_CAPTIONMARGINS 3603
// Rebar constants
#define RP_BAND 3
#define RP_BACKGROUND 6

11
widget/xpwidgets/nsNativeTheme.cpp
View File

@ -303,6 +303,17 @@ nsNativeTheme::IsFrameRTL(nsIFrame* aFrame)
return aFrame && aFrame->StyleVisibility()->mDirection == NS_STYLE_DIRECTION_RTL;
}
bool
nsNativeTheme::IsHTMLContent(nsIFrame *aFrame)
{
if (!aFrame) {
return false;
}
nsIContent* content = aFrame->GetContent();
return content && content->IsHTML();
}
// scrollbar button:
int32_t
nsNativeTheme::GetScrollbarButtonType(nsIFrame* aFrame)

6
widget/xpwidgets/nsNativeTheme.h
View File

@ -59,6 +59,8 @@ class nsNativeTheme : public nsITimerCallback
// RTL chrome direction
bool IsFrameRTL(nsIFrame* aFrame);
bool IsHTMLContent(nsIFrame *aFrame);
// button:
bool IsDefaultButton(nsIFrame* aFrame) {
return CheckBooleanAttr(aFrame, nsGkAtoms::_default);
@ -75,11 +77,11 @@ class nsNativeTheme : public nsITimerCallback
bool IsSelected(nsIFrame* aFrame) {
return GetCheckedOrSelected(aFrame, true);
}
bool IsFocused(nsIFrame* aFrame) {
return CheckBooleanAttr(aFrame, nsGkAtoms::focused);
}
// scrollbar button:
int32_t GetScrollbarButtonType(nsIFrame* aFrame);