зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1707992 - Remove support for some useless appearance values in nsNativeThemeGTK. r=stransky
We use the same background-color with CSS anyways, so this shouldn't change behavior. Differential Revision: https://phabricator.services.mozilla.com/D113554
This commit is contained in:
Родитель
19af6bcbf4
Коммит
9f6e1b077e
|
@ -15,8 +15,6 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
:root {
|
:root {
|
||||||
appearance: auto;
|
|
||||||
-moz-default-appearance: dialog;
|
|
||||||
background-color: -moz-Dialog;
|
background-color: -moz-Dialog;
|
||||||
color: -moz-DialogText;
|
color: -moz-DialogText;
|
||||||
font: message-box;
|
font: message-box;
|
||||||
|
|
|
@ -731,10 +731,6 @@ bool nsNativeThemeGTK::GetGtkWidgetAndState(StyleAppearance aAppearance,
|
||||||
case StyleAppearance::Radiomenuitem:
|
case StyleAppearance::Radiomenuitem:
|
||||||
aGtkWidgetType = MOZ_GTK_RADIOMENUITEM;
|
aGtkWidgetType = MOZ_GTK_RADIOMENUITEM;
|
||||||
break;
|
break;
|
||||||
case StyleAppearance::Window:
|
|
||||||
case StyleAppearance::Dialog:
|
|
||||||
aGtkWidgetType = MOZ_GTK_WINDOW;
|
|
||||||
break;
|
|
||||||
case StyleAppearance::MozGtkInfoBar:
|
case StyleAppearance::MozGtkInfoBar:
|
||||||
aGtkWidgetType = MOZ_GTK_INFO_BAR;
|
aGtkWidgetType = MOZ_GTK_INFO_BAR;
|
||||||
break;
|
break;
|
||||||
|
@ -1209,31 +1205,6 @@ nsNativeThemeGTK::DrawWidgetBackground(gfxContext* aContext, nsIFrame* aFrame,
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool nsNativeThemeGTK::CreateWebRenderCommandsForWidget(
|
|
||||||
mozilla::wr::DisplayListBuilder& aBuilder,
|
|
||||||
mozilla::wr::IpcResourceUpdateQueue& aResources,
|
|
||||||
const mozilla::layers::StackingContextHelper& aSc,
|
|
||||||
mozilla::layers::RenderRootStateManager* aManager, nsIFrame* aFrame,
|
|
||||||
StyleAppearance aAppearance, const nsRect& aRect) {
|
|
||||||
nsPresContext* presContext = aFrame->PresContext();
|
|
||||||
wr::LayoutRect bounds = wr::ToLayoutRect(LayoutDeviceRect::FromAppUnits(
|
|
||||||
aRect, presContext->AppUnitsPerDevPixel()));
|
|
||||||
|
|
||||||
switch (aAppearance) {
|
|
||||||
case StyleAppearance::Window:
|
|
||||||
case StyleAppearance::Dialog:
|
|
||||||
aBuilder.PushRect(bounds, bounds, true,
|
|
||||||
wr::ToColorF(ToDeviceColor(LookAndFeel::Color(
|
|
||||||
LookAndFeel::ColorID::WindowBackground,
|
|
||||||
LookAndFeel::ColorScheme::Light,
|
|
||||||
LookAndFeel::UseStandins::No, NS_TRANSPARENT))));
|
|
||||||
return true;
|
|
||||||
|
|
||||||
default:
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
WidgetNodeType nsNativeThemeGTK::NativeThemeToGtkTheme(
|
WidgetNodeType nsNativeThemeGTK::NativeThemeToGtkTheme(
|
||||||
StyleAppearance aAppearance, nsIFrame* aFrame) {
|
StyleAppearance aAppearance, nsIFrame* aFrame) {
|
||||||
WidgetNodeType gtkWidgetType;
|
WidgetNodeType gtkWidgetType;
|
||||||
|
@ -1710,9 +1681,7 @@ nsNativeThemeGTK::WidgetStateChanged(nsIFrame* aFrame,
|
||||||
aAppearance == StyleAppearance::Menubar ||
|
aAppearance == StyleAppearance::Menubar ||
|
||||||
aAppearance == StyleAppearance::Menupopup ||
|
aAppearance == StyleAppearance::Menupopup ||
|
||||||
aAppearance == StyleAppearance::Tooltip ||
|
aAppearance == StyleAppearance::Tooltip ||
|
||||||
aAppearance == StyleAppearance::Menuseparator ||
|
aAppearance == StyleAppearance::Menuseparator) {
|
||||||
aAppearance == StyleAppearance::Window ||
|
|
||||||
aAppearance == StyleAppearance::Dialog) {
|
|
||||||
*aShouldRepaint = false;
|
*aShouldRepaint = false;
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
@ -1891,8 +1860,6 @@ nsNativeThemeGTK::ThemeSupportsWidget(nsPresContext* aPresContext,
|
||||||
case StyleAppearance::Checkmenuitem:
|
case StyleAppearance::Checkmenuitem:
|
||||||
case StyleAppearance::Radiomenuitem:
|
case StyleAppearance::Radiomenuitem:
|
||||||
case StyleAppearance::Splitter:
|
case StyleAppearance::Splitter:
|
||||||
case StyleAppearance::Window:
|
|
||||||
case StyleAppearance::Dialog:
|
|
||||||
case StyleAppearance::MozGtkInfoBar:
|
case StyleAppearance::MozGtkInfoBar:
|
||||||
case StyleAppearance::MozWindowButtonBox:
|
case StyleAppearance::MozWindowButtonBox:
|
||||||
case StyleAppearance::MozWindowButtonClose:
|
case StyleAppearance::MozWindowButtonClose:
|
||||||
|
@ -1959,10 +1926,8 @@ bool nsNativeThemeGTK::ThemeNeedsComboboxDropmarker() { return false; }
|
||||||
nsITheme::Transparency nsNativeThemeGTK::GetWidgetTransparency(
|
nsITheme::Transparency nsNativeThemeGTK::GetWidgetTransparency(
|
||||||
nsIFrame* aFrame, StyleAppearance aAppearance) {
|
nsIFrame* aFrame, StyleAppearance aAppearance) {
|
||||||
switch (aAppearance) {
|
switch (aAppearance) {
|
||||||
// These widgets always draw a default background.
|
// These always draw a default background.
|
||||||
case StyleAppearance::Menupopup:
|
case StyleAppearance::Menupopup:
|
||||||
case StyleAppearance::Window:
|
|
||||||
case StyleAppearance::Dialog:
|
|
||||||
return eOpaque;
|
return eOpaque;
|
||||||
case StyleAppearance::ScrollbarVertical:
|
case StyleAppearance::ScrollbarVertical:
|
||||||
case StyleAppearance::ScrollbarHorizontal:
|
case StyleAppearance::ScrollbarHorizontal:
|
||||||
|
|
|
@ -30,13 +30,6 @@ class nsNativeThemeGTK final : private nsNativeTheme,
|
||||||
const nsRect& aRect, const nsRect& aDirtyRect,
|
const nsRect& aRect, const nsRect& aDirtyRect,
|
||||||
DrawOverflow) override;
|
DrawOverflow) override;
|
||||||
|
|
||||||
bool CreateWebRenderCommandsForWidget(
|
|
||||||
mozilla::wr::DisplayListBuilder& aBuilder,
|
|
||||||
mozilla::wr::IpcResourceUpdateQueue& aResources,
|
|
||||||
const mozilla::layers::StackingContextHelper& aSc,
|
|
||||||
mozilla::layers::RenderRootStateManager* aManager, nsIFrame* aFrame,
|
|
||||||
StyleAppearance aAppearance, const nsRect& aRect) override;
|
|
||||||
|
|
||||||
[[nodiscard]] LayoutDeviceIntMargin GetWidgetBorder(
|
[[nodiscard]] LayoutDeviceIntMargin GetWidgetBorder(
|
||||||
nsDeviceContext* aContext, nsIFrame* aFrame,
|
nsDeviceContext* aContext, nsIFrame* aFrame,
|
||||||
StyleAppearance aAppearance) override;
|
StyleAppearance aAppearance) override;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче