Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 508724 - Native theming for button[type=menu], widget part. r=roc

Browse Source 
--HG--
extra : rebase_source : 3307b174ac4f25ea934a5b51407ccf16baaa1168
This commit is contained in:
Markus Stange 2009-08-11 09:23:50 +12:00
parent 990cb18e6d
commit 0bbcd5bb24
4 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,7 +123,7 @@ protected:
PRBool inDisabled, ThemeButtonValue inValue,
ThemeButtonAdornment inAdornment, PRInt32 inState, nsIFrame* aFrame);
void DrawDropdown(CGContextRef context, const HIRect& inBoxRect, PRInt32 inState,
PRBool aIsEditable, nsIFrame* aFrame);
PRUint8 aWidgetType, nsIFrame* aFrame);
void DrawSpinButtons(CGContextRef context, ThemeButtonKind inKind,
const HIRect& inBoxRect,
PRBool inDisabled, ThemeDrawState inDrawState,

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

@ -866,18 +866,21 @@ static const CellRenderSettings editableMenulistSettings = {
void
nsNativeThemeCocoa::DrawDropdown(CGContextRef cgContext, const HIRect& inBoxRect,
PRInt32 inState, PRBool aIsEditable, nsIFrame* aFrame)
PRInt32 inState, PRUint8 aWidgetType, nsIFrame* aFrame)
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
NSCell* cell = aIsEditable ? (NSCell*)mComboBoxCell : (NSCell*)mDropdownCell;
[mDropdownCell setPullsDown:(aWidgetType == NS_THEME_BUTTON)];
BOOL isEditable = (aWidgetType == NS_THEME_DROPDOWN_TEXTFIELD);
NSCell* cell = isEditable ? (NSCell*)mComboBoxCell : (NSCell*)mDropdownCell;
[cell setEnabled:!IsDisabled(aFrame)];
[cell setShowsFirstResponder:(IsFocused(aFrame) || (inState & NS_EVENT_STATE_FOCUS))];
[cell setHighlighted:((inState & NS_EVENT_STATE_ACTIVE) && (inState & NS_EVENT_STATE_HOVER))];
[cell setControlTint:(FrameIsInActiveWindow(aFrame) ? [NSColor currentControlTint] : NSClearControlTint)];
const CellRenderSettings& settings = aIsEditable ? editableMenulistSettings : dropdownSettings;
const CellRenderSettings& settings = isEditable ? editableMenulistSettings : dropdownSettings;
DrawCellWithSnapping(cell, cgContext, inBoxRect, settings,
0.5f, NativeViewForFrame(aFrame), IsFrameRTL(aFrame));
@ -1588,6 +1591,8 @@ nsNativeThemeCocoa::DrawWidgetBackground(nsIRenderingContext* aContext, nsIFrame
if (IsDefaultButton(aFrame)) {
DrawButton(cgContext, kThemePushButton, macRect, true, IsDisabled(aFrame),
kThemeButtonOff, kThemeAdornmentNone, eventState, aFrame);
} else if (IsButtonTypeMenu(aFrame)) {
DrawDropdown(cgContext, macRect, eventState, aWidgetType, aFrame);
} else {
DrawPushButton(cgContext, macRect, IsDisabled(aFrame), eventState, aFrame);
}
@ -1664,8 +1669,7 @@ nsNativeThemeCocoa::DrawWidgetBackground(nsIRenderingContext* aContext, nsIFrame
case NS_THEME_DROPDOWN:
case NS_THEME_DROPDOWN_TEXTFIELD:
DrawDropdown(cgContext, macRect, eventState,
(aWidgetType == NS_THEME_DROPDOWN_TEXTFIELD), aFrame);
DrawDropdown(cgContext, macRect, eventState, aWidgetType, aFrame);
break;
case NS_THEME_DROPDOWN_BUTTON:
@ -1893,7 +1897,11 @@ nsNativeThemeCocoa::GetWidgetBorder(nsIDeviceContext* aContext,
switch (aWidgetType) {
case NS_THEME_BUTTON:
{
aResult->SizeTo(7, 1, 7, 3);
if (IsButtonTypeMenu(aFrame)) {
*aResult = RTLAwareMargin(kAquaDropdownBorder, aFrame);
} else {
aResult->SizeTo(7, 1, 7, 3);
}
break;
}

11
widget/src/xpwidgets/nsNativeTheme.cpp
View File

@ -160,6 +160,17 @@ nsNativeTheme::GetCheckedOrSelected(nsIFrame* aFrame, PRBool aCheckSelected)
: nsWidgetAtoms::checked);
}
PRBool
nsNativeTheme::IsButtonTypeMenu(nsIFrame* aFrame)
{
if (!aFrame)
return PR_FALSE;
nsIContent* content = aFrame->GetContent();
return content->AttrValueIs(kNameSpaceID_None, nsWidgetAtoms::type,
NS_LITERAL_STRING("menu"), eCaseMatters);
}
PRBool
nsNativeTheme::GetIndeterminate(nsIFrame* aFrame)
{

2
widget/src/xpwidgets/nsNativeTheme.h
View File

@ -93,6 +93,8 @@ class nsNativeTheme
return CheckBooleanAttr(aFrame, nsWidgetAtoms::_default);
}
PRBool IsButtonTypeMenu(nsIFrame* aFrame);
// checkbox:
PRBool IsChecked(nsIFrame* aFrame) {
return GetCheckedOrSelected(aFrame, PR_FALSE);