summaryrefslogtreecommitdiffstats
path: root/widget/cocoa/nsNativeThemeCocoa.mm
diff options
context:
space:
mode:
Diffstat (limited to 'widget/cocoa/nsNativeThemeCocoa.mm')
-rw-r--r--widget/cocoa/nsNativeThemeCocoa.mm178
1 files changed, 9 insertions, 169 deletions
diff --git a/widget/cocoa/nsNativeThemeCocoa.mm b/widget/cocoa/nsNativeThemeCocoa.mm
index 18913facea..ad16fac04a 100644
--- a/widget/cocoa/nsNativeThemeCocoa.mm
+++ b/widget/cocoa/nsNativeThemeCocoa.mm
@@ -458,8 +458,6 @@ nsNativeThemeCocoa::nsNativeThemeCocoa() : ThemeCocoa(ScrollbarStyle()) {
mMeterBarCell = [[NSLevelIndicatorCell alloc]
initWithLevelIndicatorStyle:NSLevelIndicatorStyleContinuousCapacity];
- mTreeHeaderCell = [[NSTableHeaderCell alloc] init];
-
mCellDrawView = [[MOZCellDrawView alloc] init];
if (XRE_IsParentProcess()) {
@@ -498,7 +496,6 @@ nsNativeThemeCocoa::~nsNativeThemeCocoa() {
[mSearchFieldCell release];
[mDropdownCell release];
[mComboBoxCell release];
- [mTreeHeaderCell release];
[mCellDrawWindow release];
[mCellDrawView release];
@@ -1094,6 +1091,7 @@ static bool ShouldUnconditionallyDrawFocusRingIfFocused(nsIFrame* aFrame) {
// Mac always draws focus rings for textboxes and lists.
switch (aFrame->StyleDisplay()->EffectiveAppearance()) {
case StyleAppearance::NumberInput:
+ case StyleAppearance::PasswordInput:
case StyleAppearance::Textfield:
case StyleAppearance::Textarea:
case StyleAppearance::Searchfield:
@@ -1316,17 +1314,6 @@ static void RenderButton(CGContextRef cgContext, const HIRect& aRenderRect,
NULL);
}
-static ThemeDrawState ToThemeDrawState(
- const nsNativeThemeCocoa::ControlParams& aParams) {
- if (aParams.disabled) {
- return kThemeStateUnavailable;
- }
- if (aParams.pressed) {
- return kThemeStatePressed;
- }
- return kThemeStateActive;
-}
-
void nsNativeThemeCocoa::DrawHIThemeButton(
CGContextRef cgContext, const HIRect& aRect, ThemeButtonKind aKind,
ThemeButtonValue aValue, ThemeDrawState aState,
@@ -1376,16 +1363,6 @@ void nsNativeThemeCocoa::DrawButton(CGContextRef cgContext,
case ButtonType::eHelpButton:
DrawHelpButton(cgContext, inBoxRect, controlParams);
return;
- case ButtonType::eTreeTwistyPointingRight:
- DrawHIThemeButton(cgContext, inBoxRect, kThemeDisclosureButton,
- kThemeDisclosureRight, ToThemeDrawState(controlParams),
- kThemeAdornmentNone, controlParams);
- return;
- case ButtonType::eTreeTwistyPointingDown:
- DrawHIThemeButton(cgContext, inBoxRect, kThemeDisclosureButton,
- kThemeDisclosureDown, ToThemeDrawState(controlParams),
- kThemeAdornmentNone, controlParams);
- return;
case ButtonType::eDisclosureButtonClosed:
DrawDisclosureButton(cgContext, inBoxRect, controlParams,
NSControlStateValueOff);
@@ -1397,87 +1374,6 @@ void nsNativeThemeCocoa::DrawButton(CGContextRef cgContext,
}
}
-nsNativeThemeCocoa::TreeHeaderCellParams
-nsNativeThemeCocoa::ComputeTreeHeaderCellParams(nsIFrame* aFrame,
- ElementState aEventState) {
- TreeHeaderCellParams params;
- params.controlParams = ComputeControlParams(aFrame, aEventState);
- params.sortDirection = GetTreeSortDirection(aFrame);
- params.lastTreeHeaderCell = IsLastTreeHeaderCell(aFrame);
- return params;
-}
-
-@interface NSTableHeaderCell (NSTableHeaderCell_setSortable)
-// This method has been present in the same form since at least macOS 10.4.
-- (void)_setSortable:(BOOL)arg1
- showSortIndicator:(BOOL)arg2
- ascending:(BOOL)arg3
- priority:(NSInteger)arg4
- highlightForSort:(BOOL)arg5;
-@end
-
-void nsNativeThemeCocoa::DrawTreeHeaderCell(
- CGContextRef cgContext, const HIRect& inBoxRect,
- const TreeHeaderCellParams& aParams) {
- NS_OBJC_BEGIN_TRY_IGNORE_BLOCK;
-
- // Without clearing the cell's title, it takes on a default value of "Field",
- // which is displayed underneath the title set in the front-end.
- NSCell* cell = (NSCell*)mTreeHeaderCell;
- cell.title = @"";
-
- if ([mTreeHeaderCell
- respondsToSelector:@selector
- (_setSortable:
- showSortIndicator:ascending:priority:highlightForSort:)]) {
- switch (aParams.sortDirection) {
- case eTreeSortDirection_Ascending:
- [mTreeHeaderCell _setSortable:YES
- showSortIndicator:YES
- ascending:YES
- priority:0
- highlightForSort:YES];
- break;
- case eTreeSortDirection_Descending:
- [mTreeHeaderCell _setSortable:YES
- showSortIndicator:YES
- ascending:NO
- priority:0
- highlightForSort:YES];
- break;
- default:
- // eTreeSortDirection_Natural
- [mTreeHeaderCell _setSortable:YES
- showSortIndicator:NO
- ascending:YES
- priority:0
- highlightForSort:NO];
- break;
- }
- }
-
- mTreeHeaderCell.enabled = !aParams.controlParams.disabled;
- mTreeHeaderCell.state =
- (mTreeHeaderCell.enabled && aParams.controlParams.pressed)
- ? NSControlStateValueOn
- : NSControlStateValueOff;
-
- mCellDrawView._drawingEndSeparator = !aParams.lastTreeHeaderCell;
-
- NSGraphicsContext* savedContext = NSGraphicsContext.currentContext;
- NSGraphicsContext.currentContext =
- [NSGraphicsContext graphicsContextWithCGContext:cgContext flipped:YES];
- DrawCellIncludingFocusRing(mTreeHeaderCell, inBoxRect, mCellDrawView);
- NSGraphicsContext.currentContext = savedContext;
-
-#if DRAW_IN_FRAME_DEBUG
- CGContextSetRGBFillColor(cgContext, 0.0, 0.0, 0.5, 0.25);
- CGContextFillRect(cgContext, inBoxRect);
-#endif
-
- NS_OBJC_END_TRY_IGNORE_BLOCK;
-}
-
static const CellRenderSettings dropdownSettings = {
{
NSMakeSize(0, 16), // mini
@@ -2159,8 +2055,6 @@ Maybe<nsNativeThemeCocoa::WidgetInfo> nsNativeThemeCocoa::ComputeWidgetInfo(
switch (aAppearance) {
case StyleAppearance::Menupopup:
- return Nothing();
-
case StyleAppearance::Tooltip:
return Nothing();
@@ -2323,6 +2217,7 @@ Maybe<nsNativeThemeCocoa::WidgetInfo> nsNativeThemeCocoa::ComputeWidgetInfo(
case StyleAppearance::Textfield:
case StyleAppearance::NumberInput:
+ case StyleAppearance::PasswordInput:
return Some(
WidgetInfo::TextField(ComputeTextFieldParams(aFrame, elementState)));
@@ -2348,30 +2243,6 @@ Maybe<nsNativeThemeCocoa::WidgetInfo> nsNativeThemeCocoa::ComputeWidgetInfo(
// Do nothing: progress and meter bars cases will draw chunks.
break;
- case StyleAppearance::Treetwisty:
- return Some(WidgetInfo::Button(
- ButtonParams{ComputeControlParams(aFrame, elementState),
- ButtonType::eTreeTwistyPointingRight}));
-
- case StyleAppearance::Treetwistyopen:
- return Some(WidgetInfo::Button(
- ButtonParams{ComputeControlParams(aFrame, elementState),
- ButtonType::eTreeTwistyPointingDown}));
-
- case StyleAppearance::Treeheadercell:
- return Some(WidgetInfo::TreeHeaderCell(
- ComputeTreeHeaderCellParams(aFrame, elementState)));
-
- case StyleAppearance::Treeitem:
- case StyleAppearance::Treeview:
- return Some(WidgetInfo::ColorFill(sRGBColor(1.0, 1.0, 1.0, 1.0)));
-
- case StyleAppearance::Treeheader:
- // do nothing, taken care of by individual header cells
- case StyleAppearance::Treeline:
- // do nothing, these lines don't exist on macos
- break;
-
case StyleAppearance::Range: {
Maybe<ScaleParams> params = ComputeHTMLScaleParams(aFrame, elementState);
if (params) {
@@ -2581,12 +2452,6 @@ void nsNativeThemeCocoa::RenderWidget(const WidgetInfo& aWidgetInfo,
DrawMeter(cgContext, macRect, params);
break;
}
- case Widget::eTreeHeaderCell: {
- TreeHeaderCellParams params =
- aWidgetInfo.Params<TreeHeaderCellParams>();
- DrawTreeHeaderCell(cgContext, macRect, params);
- break;
- }
case Widget::eScale: {
ScaleParams params = aWidgetInfo.Params<ScaleParams>();
DrawScale(cgContext, macRect, params);
@@ -2668,14 +2533,10 @@ bool nsNativeThemeCocoa::CreateWebRenderCommandsForWidget(
case StyleAppearance::MozMenulistArrowButton:
case StyleAppearance::Textfield:
case StyleAppearance::NumberInput:
+ case StyleAppearance::PasswordInput:
case StyleAppearance::Searchfield:
case StyleAppearance::ProgressBar:
case StyleAppearance::Meter:
- case StyleAppearance::Treeheadercell:
- case StyleAppearance::Treetwisty:
- case StyleAppearance::Treetwistyopen:
- case StyleAppearance::Treeitem:
- case StyleAppearance::Treeview:
case StyleAppearance::Range:
return false;
@@ -2747,6 +2608,7 @@ LayoutDeviceIntMargin nsNativeThemeCocoa::GetWidgetBorder(
break;
case StyleAppearance::NumberInput:
+ case StyleAppearance::PasswordInput:
case StyleAppearance::Textfield: {
SInt32 frameOutset = 0;
::GetThemeMetric(kThemeMetricEditTextFrameOutset, &frameOutset);
@@ -2845,6 +2707,7 @@ bool nsNativeThemeCocoa::GetWidgetOverflow(nsDeviceContext* aContext,
case StyleAppearance::MozMacHelpButton:
case StyleAppearance::Toolbarbutton:
case StyleAppearance::NumberInput:
+ case StyleAppearance::PasswordInput:
case StyleAppearance::Textfield:
case StyleAppearance::Textarea:
case StyleAppearance::Searchfield:
@@ -2957,6 +2820,7 @@ LayoutDeviceIntSize nsNativeThemeCocoa::GetMinimumWidgetSize(
}
case StyleAppearance::NumberInput:
+ case StyleAppearance::PasswordInput:
case StyleAppearance::Textfield:
case StyleAppearance::Textarea:
case StyleAppearance::Searchfield: {
@@ -2985,23 +2849,6 @@ LayoutDeviceIntSize nsNativeThemeCocoa::GetMinimumWidgetSize(
break;
}
- case StyleAppearance::Treetwisty:
- case StyleAppearance::Treetwistyopen: {
- SInt32 twistyHeight = 0, twistyWidth = 0;
- ::GetThemeMetric(kThemeMetricDisclosureButtonWidth, &twistyWidth);
- ::GetThemeMetric(kThemeMetricDisclosureButtonHeight, &twistyHeight);
- result.SizeTo(twistyWidth, twistyHeight);
- break;
- }
-
- case StyleAppearance::Treeheader:
- case StyleAppearance::Treeheadercell: {
- SInt32 headerHeight = 0;
- ::GetThemeMetric(kThemeMetricListHeaderHeight, &headerHeight);
- result.SizeTo(0, headerHeight);
- break;
- }
-
case StyleAppearance::Tab: {
result.SizeTo(0, tabHeights[miniControlSize]);
break;
@@ -3128,6 +2975,7 @@ bool nsNativeThemeCocoa::ThemeSupportsWidget(nsPresContext* aPresContext,
case StyleAppearance::SpinnerDownbutton:
case StyleAppearance::Statusbar:
case StyleAppearance::NumberInput:
+ case StyleAppearance::PasswordInput:
case StyleAppearance::Textfield:
case StyleAppearance::Textarea:
case StyleAppearance::Searchfield:
@@ -3140,14 +2988,6 @@ bool nsNativeThemeCocoa::ThemeSupportsWidget(nsPresContext* aPresContext,
case StyleAppearance::Tabpanels:
case StyleAppearance::Tab:
- case StyleAppearance::Treetwisty:
- case StyleAppearance::Treetwistyopen:
- case StyleAppearance::Treeview:
- case StyleAppearance::Treeheader:
- case StyleAppearance::Treeheadercell:
- case StyleAppearance::Treeitem:
- case StyleAppearance::Treeline:
-
case StyleAppearance::Range:
return !IsWidgetStyled(aPresContext, aFrame, aAppearance);
@@ -3184,6 +3024,7 @@ bool nsNativeThemeCocoa::ThemeDrawsFocusForWidget(nsIFrame*,
case StyleAppearance::Textfield:
case StyleAppearance::Searchfield:
case StyleAppearance::NumberInput:
+ case StyleAppearance::PasswordInput:
case StyleAppearance::Menulist:
case StyleAppearance::MenulistButton:
case StyleAppearance::Button:
@@ -3212,9 +3053,8 @@ bool nsNativeThemeCocoa::WidgetAppearanceDependsOnWindowFocus(
case StyleAppearance::SpinnerDownbutton:
case StyleAppearance::Separator:
case StyleAppearance::NumberInput:
+ case StyleAppearance::PasswordInput:
case StyleAppearance::Textfield:
- case StyleAppearance::Treeview:
- case StyleAppearance::Treeline:
case StyleAppearance::Textarea:
case StyleAppearance::Listbox:
return false;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-05 02:39:48 +0000