mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1845623 - Make some form controls always non-native on Windows. r=mhowell,desktop-theme-reviewers,dao 

In particular, spinner buttons, checkboxes, radio buttons, and the
menulist arrow.

These are all windows-style anyways, and look better than the native
counter-parts because they support webrender, zooming and scaling, etc.

The easiest way to see some of this in action is using ./mach run -P.

Differential Revision: https://phabricator.services.mozilla.com/D184648
This commit is contained in:
Emilio Cobos Álvarez 2023-07-28 11:06:47 +00:00
Родитель a7ddbc1217
Коммит e49eb28e30
5 изменённых файлов: 24 добавлений и 321 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
toolkit/themes/shared/checkbox.css
Просмотреть файл

@ -93,8 +93,6 @@ checkbox:not([native]):focus-visible > .checkbox-check {
@media (-moz-platform: windows) {
checkbox:where([native]) {
appearance: auto;
-moz-default-appearance: checkbox-container;
align-items: center;
margin: 2px 4px;
padding-top: 1px;
@ -126,13 +124,15 @@ checkbox:not([native]):focus-visible > .checkbox-check {
-moz-default-appearance: checkbox;
align-items: center;
margin-inline-end: 5px;
/* TODO: This matches what the old native theme did, but maybe we want to
* use em-based sizes here. */
width: 13px;
height: 13px;
}
}
@media (-moz-platform: macos) {
checkbox:where([native]) {
appearance: auto;
-moz-default-appearance: checkbox-container;
align-items: center;
margin: 4px 2px;
}

331
widget/windows/nsNativeThemeWin.cpp
Просмотреть файл

@ -56,14 +56,20 @@ nsNativeThemeWin::nsNativeThemeWin()
mProgressIndeterminateTimeStamp(TimeStamp::Now()),
mBorderCacheValid(),
mMinimumWidgetSizeCacheValid(),
mGutterSizeCacheValid(false) {
// If there is a relevant change in forms.css for windows platform,
// static widget style variables (e.g. sButtonBorderSize) should be
// reinitialized here.
}
mGutterSizeCacheValid(false) {}
nsNativeThemeWin::~nsNativeThemeWin() { nsUXThemeData::Invalidate(); }
bool nsNativeThemeWin::IsWidgetAlwaysNonNative(nsIFrame* aFrame,
StyleAppearance aAppearance) {
return Theme::IsWidgetAlwaysNonNative(aFrame, aAppearance) ||
aAppearance == StyleAppearance::Checkbox ||
aAppearance == StyleAppearance::Radio ||
aAppearance == StyleAppearance::MozMenulistArrowButton ||
aAppearance == StyleAppearance::SpinnerUpbutton ||
aAppearance == StyleAppearance::SpinnerDownbutton;
}
auto nsNativeThemeWin::IsWidgetNonNative(nsIFrame* aFrame,
StyleAppearance aAppearance)
-> NonNative {
@ -461,17 +467,6 @@ nsresult nsNativeThemeWin::GetCachedMinimumWidgetSize(
aResult->width = sz.cx;
aResult->height = sz.cy;
switch (aAppearance) {
case StyleAppearance::SpinnerUpbutton:
case StyleAppearance::SpinnerDownbutton:
aResult->width++;
aResult->height = aResult->height / 2 + 1;
break;
default:
break;
}
::ReleaseDC(nullptr, hdc);
mMinimumWidgetSizeCacheValid[cacheBitIndex] |= cacheBit;
@ -484,8 +479,6 @@ mozilla::Maybe<nsUXThemeClass> nsNativeThemeWin::GetThemeClass(
StyleAppearance aAppearance) {
switch (aAppearance) {
case StyleAppearance::Button:
case StyleAppearance::Radio:
case StyleAppearance::Checkbox:
return Some(eUXButton);
case StyleAppearance::NumberInput:
case StyleAppearance::Textfield:
@ -507,12 +500,8 @@ mozilla::Maybe<nsUXThemeClass> nsNativeThemeWin::GetThemeClass(
case StyleAppearance::Range:
case StyleAppearance::RangeThumb:
return Some(eUXTrackbar);
case StyleAppearance::SpinnerUpbutton:
case StyleAppearance::SpinnerDownbutton:
return Some(eUXSpin);
case StyleAppearance::Menulist:
case StyleAppearance::MenulistButton:
case StyleAppearance::MozMenulistArrowButton:
return Some(eUXCombobox);
case StyleAppearance::Treeheadercell:
case StyleAppearance::Treeheadersortarrow:
@ -608,36 +597,6 @@ nsresult nsNativeThemeWin::GetThemePartAndState(nsIFrame* aFrame,
if (aState == TS_NORMAL && IsDefaultButton(aFrame)) aState = TS_FOCUSED;
return NS_OK;
}
case StyleAppearance::Checkbox:
case StyleAppearance::Radio: {
bool isCheckbox = (aAppearance == StyleAppearance::Checkbox);
aPart = isCheckbox ? BP_CHECKBOX : BP_RADIO;
enum InputState { UNCHECKED = 0, CHECKED, INDETERMINATE };
InputState inputState = UNCHECKED;
if (!aFrame) {
aState = TS_NORMAL;
} else {
ElementState elementState = GetContentState(aFrame, aAppearance);
if (elementState.HasState(ElementState::CHECKED)) {
inputState = CHECKED;
}
if (isCheckbox && elementState.HasState(ElementState::INDETERMINATE)) {
inputState = INDETERMINATE;
}
if (elementState.HasState(ElementState::DISABLED)) {
aState = TS_DISABLED;
} else {
aState = StandardGetState(aFrame, aAppearance, false);
}
}
// 4 unchecked states, 4 checked states, 4 indeterminate states.
aState += inputState * 4;
return NS_OK;
}
case StyleAppearance::NumberInput:
case StyleAppearance::Textfield:
case StyleAppearance::Textarea: {
@ -761,20 +720,6 @@ nsresult nsNativeThemeWin::GetThemePartAndState(nsIFrame* aFrame,
}
return NS_OK;
}
case StyleAppearance::SpinnerUpbutton:
case StyleAppearance::SpinnerDownbutton: {
aPart = (aAppearance == StyleAppearance::SpinnerUpbutton) ? SPNP_UP
: SPNP_DOWN;
ElementState elementState = GetContentState(aFrame, aAppearance);
if (!aFrame) {
aState = TS_NORMAL;
} else if (elementState.HasState(ElementState::DISABLED)) {
aState = TS_DISABLED;
} else {
aState = StandardGetState(aFrame, aAppearance, false);
}
return NS_OK;
}
case StyleAppearance::Toolbox: {
aState = 0;
aPart = RP_BACKGROUND;
@ -884,75 +829,6 @@ nsresult nsNativeThemeWin::GetThemePartAndState(nsIFrame* aFrame,
return NS_OK;
}
case StyleAppearance::MozMenulistArrowButton: {
bool isOpen = false;
// HTML select and XUL menulist dropdown buttons get state from the
// parent.
nsIFrame* parentFrame = aFrame->GetParent();
aFrame = parentFrame;
ElementState elementState = GetContentState(aFrame, aAppearance);
aPart = CBP_DROPMARKER_VISTA;
// For HTML controls with author styling, we should fall
// back to the old dropmarker style to avoid clashes with
// author-specified backgrounds and borders (bug #441034)
if (IsWidgetStyled(aFrame->PresContext(), aFrame,
StyleAppearance::Menulist)) {
aPart = CBP_DROPMARKER;
}
if (elementState.HasState(ElementState::DISABLED)) {
aState = TS_DISABLED;
return NS_OK;
}
if (nsComboboxControlFrame* ccf = do_QueryFrame(aFrame)) {
isOpen = ccf->IsDroppedDown();
if (isOpen) {
/* Hover is propagated, but we need to know whether we're hovering
* just the combobox frame, not the dropdown frame. But, we can't get
* that information, since hover is on the content node, and they
* share the same content node. So, instead, we cheat -- if the
* dropdown is open, we always show the hover state. This looks fine
* in practice.
*/
aState = TS_HOVER;
return NS_OK;
}
} else {
/* The dropdown indicator on a menulist button in chrome is not given a
* hover effect. When the frame isn't isn't HTML content, we cheat and
* force the dropdown state to be normal. (Bug 430434)
*/
isOpen = IsOpenButton(aFrame);
aState = TS_NORMAL;
return NS_OK;
}
aState = TS_NORMAL;
// Dropdown button active state doesn't need :hover.
if (elementState.HasState(ElementState::ACTIVE)) {
if (isOpen) {
// XXX Button should look active until the mouse is released, but
// without making it look active when the popup is clicked.
return NS_OK;
}
aState = TS_ACTIVE;
} else if (elementState.HasState(ElementState::HOVER)) {
// No hover effect for XUL menulists and autocomplete dropdown buttons
// while the dropdown menu is open.
if (isOpen) {
// XXX HTML select dropdown buttons should have the hover effect when
// hovering the combobox frame, but not the popup frame.
return NS_OK;
}
aState = TS_HOVER;
}
return NS_OK;
}
default:
aPart = 0;
aState = 0;
@ -1277,20 +1153,11 @@ bool nsNativeThemeWin::GetWidgetPadding(nsDeviceContext* aContext,
nsIFrame* aFrame,
StyleAppearance aAppearance,
LayoutDeviceIntMargin* aResult) {
switch (aAppearance) {
// Radios and checkboxes return a fixed size in GetMinimumWidgetSize
// and have a meaningful baseline, so they can't have
// author-specified padding.
case StyleAppearance::Checkbox:
case StyleAppearance::Radio:
aResult->SizeTo(0, 0, 0, 0);
return true;
default:
break;
if (IsWidgetNonNative(aFrame, aAppearance) == NonNative::Always) {
return Theme::GetWidgetPadding(aContext, aFrame, aAppearance, aResult);
}
bool ok = true;
HANDLE theme = GetTheme(aAppearance);
if (!theme) {
ok = ClassicGetWidgetPadding(aContext, aFrame, aAppearance, aResult);
@ -1431,11 +1298,6 @@ LayoutDeviceIntSize nsNativeThemeWin::GetMinimumWidgetSize(
// Windows appears to always use metrics when drawing standard scrollbars)
THEMESIZE sizeReq = TS_TRUE; // Best-fit size
switch (aAppearance) {
case StyleAppearance::MozMenulistArrowButton: {
auto result = ClassicGetMinimumWidgetSize(aFrame, aAppearance);
ScaleForFrameDPI(&result, aFrame);
return result;
}
case StyleAppearance::ProgressBar:
// Best-fit size for progress meters is too large for most
// themes. We want these widgets to be able to really shrink
@ -1507,8 +1369,7 @@ nsNativeThemeWin::WidgetStateChanged(nsIFrame* aFrame,
// We need to repaint the dropdown arrow in vista HTML combobox controls when
// the control is closed to get rid of the hover effect.
if ((aAppearance == StyleAppearance::Menulist ||
aAppearance == StyleAppearance::MenulistButton ||
aAppearance == StyleAppearance::MozMenulistArrowButton) &&
aAppearance == StyleAppearance::MenulistButton) &&
nsNativeTheme::IsHTMLContent(aFrame)) {
*aShouldRepaint = true;
return NS_OK;
@ -1554,14 +1415,7 @@ bool nsNativeThemeWin::ThemeSupportsWidget(nsPresContext* aPresContext,
return Theme::ThemeSupportsWidget(aPresContext, aFrame, aAppearance);
}
HANDLE theme = nullptr;
if (aAppearance == StyleAppearance::CheckboxContainer)
theme = GetTheme(StyleAppearance::Checkbox);
else if (aAppearance == StyleAppearance::RadioContainer)
theme = GetTheme(StyleAppearance::Radio);
else
theme = GetTheme(aAppearance);
HANDLE theme = GetTheme(aAppearance);
if (theme || ClassicThemeSupportsWidget(aFrame, aAppearance))
// turn off theming for some HTML widgets styled by the page
return !IsWidgetStyled(aPresContext, aFrame, aAppearance);
@ -1569,15 +1423,6 @@ bool nsNativeThemeWin::ThemeSupportsWidget(nsPresContext* aPresContext,
return false;
}
bool nsNativeThemeWin::WidgetIsContainer(StyleAppearance aAppearance) {
// XXXdwh At some point flesh all of this out.
if (aAppearance == StyleAppearance::MozMenulistArrowButton ||
aAppearance == StyleAppearance::Radio ||
aAppearance == StyleAppearance::Checkbox)
return false;
return true;
}
bool nsNativeThemeWin::ThemeDrawsFocusForWidget(nsIFrame* aFrame,
StyleAppearance aAppearance) {
if (IsWidgetNonNative(aFrame, aAppearance) != NonNative::No) {
@ -1643,15 +1488,10 @@ bool nsNativeThemeWin::ClassicThemeSupportsWidget(nsIFrame* aFrame,
case StyleAppearance::NumberInput:
case StyleAppearance::Textfield:
case StyleAppearance::Textarea:
case StyleAppearance::Checkbox:
case StyleAppearance::Radio:
case StyleAppearance::Range:
case StyleAppearance::RangeThumb:
case StyleAppearance::Menulist:
case StyleAppearance::MenulistButton:
case StyleAppearance::MozMenulistArrowButton:
case StyleAppearance::SpinnerUpbutton:
case StyleAppearance::SpinnerDownbutton:
case StyleAppearance::Listbox:
case StyleAppearance::Treeview:
case StyleAppearance::ProgressBar:
@ -1710,19 +1550,10 @@ LayoutDeviceIntSize nsNativeThemeWin::ClassicGetMinimumWidgetSize(
nsIFrame* aFrame, StyleAppearance aAppearance) {
LayoutDeviceIntSize result;
switch (aAppearance) {
case StyleAppearance::Radio:
case StyleAppearance::Checkbox:
result.width = result.height = 13;
break;
case StyleAppearance::Menuarrow:
result.width = ::GetSystemMetrics(SM_CXMENUCHECK);
result.height = ::GetSystemMetrics(SM_CYMENUCHECK);
break;
case StyleAppearance::SpinnerUpbutton:
case StyleAppearance::SpinnerDownbutton:
result.width = ::GetSystemMetrics(SM_CXVSCROLL);
result.height = 8; // No good metrics available for this
break;
case StyleAppearance::RangeThumb: {
if (IsRangeHorizontal(aFrame)) {
result.width = 12;
@ -1733,9 +1564,6 @@ LayoutDeviceIntSize nsNativeThemeWin::ClassicGetMinimumWidgetSize(
}
break;
}
case StyleAppearance::MozMenulistArrowButton:
result.width = ::GetSystemMetrics(SM_CXVSCROLL);
break;
case StyleAppearance::Menulist:
case StyleAppearance::MenulistButton:
case StyleAppearance::Button:
@ -1797,46 +1625,6 @@ nsresult nsNativeThemeWin::ClassicGetThemePartAndState(
return NS_OK;
}
case StyleAppearance::Checkbox:
case StyleAppearance::Radio: {
ElementState contentState = GetContentState(aFrame, aAppearance);
aFocused = false;
aPart = DFC_BUTTON;
aState = 0;
nsIContent* content = aFrame->GetContent();
bool isCheckbox = (aAppearance == StyleAppearance::Checkbox);
bool isChecked = contentState.HasState(ElementState::CHECKED);
bool isIndeterminate = contentState.HasState(ElementState::INDETERMINATE);
if (isCheckbox) {
// indeterminate state takes precedence over checkedness.
if (isIndeterminate) {
aState = DFCS_BUTTON3STATE | DFCS_CHECKED;
} else {
aState = DFCS_BUTTONCHECK;
}
} else {
aState = DFCS_BUTTONRADIO;
}
if (isChecked) {
aState |= DFCS_CHECKED;
}
if (!content->IsXULElement() &&
contentState.HasState(ElementState::FOCUSRING)) {
aFocused = true;
}
if (contentState.HasState(ElementState::DISABLED)) {
aState |= DFCS_INACTIVE;
} else if (contentState.HasAllStates(ElementState::ACTIVE |
ElementState::HOVER)) {
aState |= DFCS_PUSHED;
}
return NS_OK;
}
case StyleAppearance::Listbox:
case StyleAppearance::Treeview:
case StyleAppearance::NumberInput:
@ -1853,67 +1641,6 @@ nsresult nsNativeThemeWin::ClassicGetThemePartAndState(
case StyleAppearance::Tabpanels:
// these don't use DrawFrameControl
return NS_OK;
case StyleAppearance::MozMenulistArrowButton: {
aPart = DFC_SCROLL;
aState = DFCS_SCROLLCOMBOBOX;
nsIFrame* parentFrame = aFrame->GetParent();
// HTML select and XUL menulist dropdown buttons get state from the
// parent.
aFrame = parentFrame;
ElementState elementState = GetContentState(aFrame, aAppearance);
if (elementState.HasState(ElementState::DISABLED)) {
aState |= DFCS_INACTIVE;
return NS_OK;
}
bool isOpen = false;
if (nsComboboxControlFrame* ccf = do_QueryFrame(aFrame)) {
isOpen = ccf->IsDroppedDown();
} else {
isOpen = IsOpenButton(aFrame);
}
// XXX Button should look active until the mouse is released, but
// without making it look active when the popup is clicked.
if (isOpen) {
return NS_OK;
}
// Dropdown button active state doesn't need :hover.
if (elementState.HasState(ElementState::ACTIVE))
aState |= DFCS_PUSHED | DFCS_FLAT;
return NS_OK;
}
case StyleAppearance::SpinnerUpbutton:
case StyleAppearance::SpinnerDownbutton: {
ElementState contentState = GetContentState(aFrame, aAppearance);
aPart = DFC_SCROLL;
switch (aAppearance) {
case StyleAppearance::SpinnerUpbutton:
aState = DFCS_SCROLLUP;
break;
case StyleAppearance::SpinnerDownbutton:
aState = DFCS_SCROLLDOWN;
break;
default:
break;
}
if (contentState.HasState(ElementState::DISABLED)) {
aState |= DFCS_INACTIVE;
} else {
if (contentState.HasAllStates(ElementState::HOVER |
ElementState::ACTIVE))
aState |= DFCS_PUSHED;
}
return NS_OK;
}
default:
return NS_ERROR_FAILURE;
}
@ -2079,22 +1806,13 @@ RENDER_AGAIN:
case StyleAppearance::Button: {
if (focused) {
// draw dark button focus border first
HBRUSH brush;
brush = ::GetSysColorBrush(COLOR_3DDKSHADOW);
if (brush) ::FrameRect(hdc, &widgetRect, brush);
if (HBRUSH brush = ::GetSysColorBrush(COLOR_3DDKSHADOW)) {
::FrameRect(hdc, &widgetRect, brush);
}
InflateRect(&widgetRect, -1, -1);
}
[[fallthrough]];
}
// Draw controls supported by DrawFrameControl
case StyleAppearance::Checkbox:
case StyleAppearance::Radio:
case StyleAppearance::SpinnerUpbutton:
case StyleAppearance::SpinnerDownbutton:
case StyleAppearance::MozMenulistArrowButton: {
int32_t oldTA;
// setup DC to make DrawFrameControl draw correctly
oldTA = ::SetTextAlign(hdc, TA_TOP | TA_LEFT | TA_NOUPDATECP);
int32_t oldTA = ::SetTextAlign(hdc, TA_TOP | TA_LEFT | TA_NOUPDATECP);
::DrawFrameControl(hdc, &widgetRect, part, state);
::SetTextAlign(hdc, oldTA);
break;
@ -2245,17 +1963,6 @@ uint32_t nsNativeThemeWin::GetWidgetNativeDrawingFlags(
gfxWindowsNativeDrawing::CAN_AXIS_ALIGNED_SCALE |
gfxWindowsNativeDrawing::CANNOT_COMPLEX_TRANSFORM;
// the dropdown button /almost/ renders correctly with scaling,
// except that the graphic in the dropdown button (the downward arrow)
// doesn't get scaled up.
case StyleAppearance::MozMenulistArrowButton:
// these are definitely no; they're all graphics that don't get scaled up
case StyleAppearance::Checkbox:
case StyleAppearance::Radio:
return gfxWindowsNativeDrawing::CANNOT_DRAW_TO_COLOR_ALPHA |
gfxWindowsNativeDrawing::CANNOT_AXIS_ALIGNED_SCALE |
gfxWindowsNativeDrawing::CANNOT_COMPLEX_TRANSFORM;
// need to check these others
default:
return gfxWindowsNativeDrawing::CANNOT_DRAW_TO_COLOR_ALPHA |

3
widget/windows/nsNativeThemeWin.h
Просмотреть файл

@ -34,6 +34,7 @@ class nsNativeThemeWin : public Theme {
// to avoid subtle sizing changes. The non-native theme can basically draw at
// any size, so we prefer to have consistent sizing information.
enum class NonNative { No, Always, BecauseColorMismatch };
static bool IsWidgetAlwaysNonNative(nsIFrame*, StyleAppearance);
NonNative IsWidgetNonNative(nsIFrame*, StyleAppearance);
// The nsITheme interface.
@ -77,8 +78,6 @@ class nsNativeThemeWin : public Theme {
bool ThemeSupportsWidget(nsPresContext* aPresContext, nsIFrame* aFrame,
StyleAppearance aAppearance) override;
bool WidgetIsContainer(StyleAppearance aAppearance) override;
bool ThemeDrawsFocusForWidget(nsIFrame*, StyleAppearance) override;
bool ThemeWantsButtonInnerFocusRing(nsIFrame*, StyleAppearance) override {

2
widget/windows/nsUXThemeData.cpp
Просмотреть файл

@ -72,8 +72,6 @@ const wchar_t* nsUXThemeData::GetClassName(nsUXThemeClass cls) {
return L"Tab";
case eUXTrackbar:
return L"Trackbar";
case eUXSpin:
return L"Spin";
case eUXCombobox:
return L"Combobox";
case eUXHeader:

1
widget/windows/nsUXThemeData.h
Просмотреть файл

@ -24,7 +24,6 @@ enum nsUXThemeClass {
eUXProgress,
eUXTab,
eUXTrackbar,
eUXSpin,
eUXCombobox,
eUXHeader,
eUXListview,