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

Bug 1866022 - Teach GTK to render non-native tree columns and toolbars. r=dao,stransky,desktop-theme-reviewers 

This fixes various things, like sort arrows not working, even in regular
non-mixed-color-scheme settings, and is a lot less code.

The toolbarbutton appearance on the problematic case described in
comment 0 could get some work (the extra borders aren't exactly pretty),
but it's still a much better improvement.

Differential Revision: https://phabricator.services.mozilla.com/D195345
This commit is contained in:
Emilio Cobos Álvarez 2023-12-04 18:57:35 +00:00
Родитель 11a85fe724
Коммит 4d0e714795
19 изменённых файлов: 100 добавлений и 309 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
servo/components/style/values/specified/box.rs
Просмотреть файл

@ -1616,9 +1616,6 @@ pub enum Appearance {
/// The dropdown portion of a toolbar button
#[parse(condition = "ParserContext::chrome_rules_enabled")]
ToolbarbuttonDropdown,
/// The gripper for a toolbar.
#[parse(condition = "ParserContext::chrome_rules_enabled")]
Toolbargripper,
/// The toolbox that contains the toolbars.
#[parse(condition = "ParserContext::chrome_rules_enabled")]
Toolbox,
@ -1631,9 +1628,6 @@ pub enum Appearance {
/// An individual header cell
#[parse(condition = "ParserContext::chrome_rules_enabled")]
Treeheadercell,
/// The sort arrow for a header.
#[parse(condition = "ParserContext::chrome_rules_enabled")]
Treeheadersortarrow,
/// A tree item.
#[parse(condition = "ParserContext::chrome_rules_enabled")]
Treeitem,

8
servo/components/style/values/specified/color.rs
Просмотреть файл

@ -347,9 +347,17 @@ pub enum SystemColor {
/// Color of tree column headers
#[parse(condition = "ParserContext::chrome_rules_enabled")]
MozColheader,
#[parse(condition = "ParserContext::chrome_rules_enabled")]
MozColheadertext,
#[parse(condition = "ParserContext::chrome_rules_enabled")]
MozColheaderhover,
#[parse(condition = "ParserContext::chrome_rules_enabled")]
MozColheaderhovertext,
#[parse(condition = "ParserContext::chrome_rules_enabled")]
MozColheaderactive,
#[parse(condition = "ParserContext::chrome_rules_enabled")]
MozColheaderactivetext,
#[parse(condition = "ParserContext::chrome_rules_enabled")]
TextSelectDisabledBackground,

23
toolkit/themes/linux/global/toolbar.css
Просмотреть файл

@ -14,26 +14,25 @@ toolbox {
}
toolbar {
appearance: auto;
-moz-default-appearance: toolbar;
background-color: -moz-headerbar;
color: -moz-headerbartext;
min-width: 1px;
min-height: 20px;
padding: 2px 0;
}
toolbar[type="menubar"] {
appearance: none;
padding: 1px 0;
}
&:-moz-window-inactive {
background-color: -moz-headerbarinactive;
color: -moz-headerbarinactivetext;
}
toolbar:-moz-lwtheme {
appearance: none;
&[type="menubar"] {
background-color: transparent;
padding: 1px 0;
}
}
toolbarseparator {
appearance: auto;
-moz-default-appearance: separator;
margin: 0;
width: 12px;
min-width: 2px;
}

7
toolkit/themes/shared/desktop-non-mac.jar.inc.mn
Просмотреть файл

@ -18,7 +18,10 @@
skin/classic/global/icons/search-textbox.svg (../../windows/global/icons/search-textbox.svg)
skin/classic/mozapps/downloads/unknownContentType.css (../../windows/mozapps/downloads/unknownContentType.css)
skin/classic/mozapps/handling/handling.css (../../windows/mozapps/handling/handling.css)
skin/classic/mozapps/downloads/unknownContentType.css (../../windows/mozapps/downloads/unknownContentType.css)
skin/classic/mozapps/handling/handling.css (../../windows/mozapps/handling/handling.css)
skin/classic/global/tree/sort-asc.svg (../../windows/global/tree/sort-asc.svg)
skin/classic/global/tree/sort-dsc.svg (../../windows/global/tree/sort-dsc.svg)
% override chrome://mozapps/skin/xpinstall/xpinstallItemGeneric.png chrome://mozapps/skin/extensions/extensionGeneric.svg

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

@ -17,6 +17,10 @@ tree {
color: FieldText;
appearance: auto;
-moz-default-appearance: listbox;
@media (-moz-platform: linux) {
appearance: none;
border: 1px solid ThreeDShadow;
}
}
/* ::::: tree rows ::::: */
@ -121,22 +125,37 @@ treecol,
.tree-columnpicker-button {
appearance: auto;
-moz-default-appearance: treeheadercell;
background-color: -moz-ColHeader;
color: -moz-ColHeaderText;
align-items: center;
justify-content: center;
color: -moz-ColHeaderText;
padding: 0 4px;
margin: 0;
}
border-inline-start: 1px solid ThreeDLightShadow;
treecol:where(:hover),
.tree-columnpicker-button:where(:hover) {
color: -moz-ColHeaderHoverText;
@media (-moz-platform: linux) or ((-moz-platform: windows) and (prefers-color-scheme: dark)) {
appearance: none;
box-shadow: inset 0 -1px ThreeDLightShadow;
}
&:where(:hover) {
background-color: -moz-ColHeaderHover;
color: -moz-ColHeaderHoverText;
}
&:where(:hover:active) {
background-color: -moz-ColHeaderActive;
color: -moz-ColHeaderActiveText;
}
}
.treecol-text {
margin: 0 !important;
}
treecol:where([ordinal="1"]) {
border-inline-start: none;
}
treecol[hideheader="true"] {
appearance: none;
}
@ -231,44 +250,21 @@ html|input.tree-input {
z-index: 2147483647;
}
@media (-moz-platform: windows) {
@media (-moz-platform: windows) or (-moz-platform: linux) {
/* ::::: sort direction indicator ::::: */
.treecol-sortdirection {
list-style-image: none;
list-style-image: url("chrome://global/skin/tree/sort-asc.svg");
-moz-context-properties: fill;
fill: currentColor;
}
visibility: hidden;
treecol[sortDirection="ascending"]:not([hideheader="true"]) > .treecol-sortdirection {
list-style-image: url("chrome://global/skin/tree/sort-asc.svg");
}
treecol[sortDirection="ascending"]:not([hideheader="true"]) > & {
visibility: inherit;
}
treecol[sortDirection="descending"]:not([hideheader="true"]) > .treecol-sortdirection {
list-style-image: url("chrome://global/skin/tree/sort-dsc.svg");
}
@media (prefers-color-scheme: dark) {
treecol,
.tree-columnpicker-button {
appearance: none;
background-color: ButtonFace;
color: ButtonText;
border-inline-start: 1px solid ThreeDLightShadow;
box-shadow: inset 0 -1px ThreeDLightShadow;
}
treecol:where([ordinal="1"]) {
border-inline-start: none;
}
treecol:where(:hover),
.tree-columnpicker-button:where(:hover) {
background-color: -moz-ButtonHoverFace;
color: -moz-ButtonHoverText;
}
treecol:where(:hover:active),
.tree-columnpicker-button:where(:hover:active) {
background-color: -moz-ButtonActiveFace;
color: -moz-ButtonActiveText;
treecol[sortDirection="descending"]:not([hideheader="true"]) > & {
visibility: inherit;
list-style-image: url("chrome://global/skin/tree/sort-dsc.svg");
}
}
}
@ -283,10 +279,3 @@ html|input.tree-input {
outline: none;
}
}
@media (-moz-platform: linux) {
.treecol-sortdirection {
appearance: auto;
-moz-default-appearance: treeheadersortarrow;
}
}

2
toolkit/themes/windows/global/jar.mn
Просмотреть файл

@ -19,5 +19,3 @@ toolkit.jar:
skin/classic/global/icons/Portrait.png (icons/Portrait.png)
skin/classic/global/icons/warning-large.png (icons/warning-large.png)
skin/classic/global/in-content/common.css (in-content/common.css)
skin/classic/global/tree/sort-asc.svg (tree/sort-asc.svg)
skin/classic/global/tree/sort-dsc.svg (tree/sort-dsc.svg)

4
widget/Theme.cpp
Просмотреть файл

@ -1327,6 +1327,7 @@ bool Theme::DoDrawWidgetBackground(PaintBackendData& aPaintData,
break;
}
case StyleAppearance::Button:
case StyleAppearance::Toolbarbutton:
PaintButton(aFrame, aPaintData, devPxRect, elementState, colors,
dpiRatio);
break;
@ -1438,6 +1439,7 @@ LayoutDeviceIntMargin Theme::GetWidgetBorder(nsDeviceContext* aContext,
case StyleAppearance::Menulist:
case StyleAppearance::MenulistButton:
case StyleAppearance::Button:
case StyleAppearance::Toolbarbutton:
// Return the border size from the UA sheet, even though what we paint
// doesn't actually match that. We know this is the UA sheet border
// because we disable native theming when different border widths are
@ -1505,6 +1507,7 @@ bool Theme::GetWidgetOverflow(nsDeviceContext* aContext, nsIFrame* aFrame,
case StyleAppearance::MenulistButton:
case StyleAppearance::Menulist:
case StyleAppearance::Button:
case StyleAppearance::Toolbarbutton:
// 2px for each segment, plus 1px separation, but we paint 1px inside
// the border area so 4px overflow.
overflow.SizeTo(4, 4, 4, 4);
@ -1670,6 +1673,7 @@ bool Theme::ThemeSupportsWidget(nsPresContext* aPresContext, nsIFrame* aFrame,
case StyleAppearance::ScrollbarVertical:
case StyleAppearance::Scrollcorner:
case StyleAppearance::Button:
case StyleAppearance::Toolbarbutton:
case StyleAppearance::Listbox:
case StyleAppearance::Menulist:
case StyleAppearance::MenulistButton:

4
widget/cocoa/nsLookAndFeel.mm
Просмотреть файл

@ -209,6 +209,9 @@ nsresult nsLookAndFeel::NativeGetColor(ColorID aID, ColorScheme aScheme,
case ColorID::MozButtonhoverface:
case ColorID::MozButtonactiveface:
case ColorID::MozButtondisabledface:
case ColorID::MozColheader:
case ColorID::MozColheaderhover:
case ColorID::MozColheaderactive:
color = GetColorFromNSColor(NSColor.controlColor);
if (!NS_GET_A(color)) {
color = GetColorFromNSColor(NSColor.controlBackgroundColor);
@ -265,6 +268,7 @@ nsresult nsLookAndFeel::NativeGetColor(ColorID aID, ColorScheme aScheme,
case ColorID::MozCellhighlighttext:
case ColorID::MozColheadertext:
case ColorID::MozColheaderhovertext:
case ColorID::MozColheaderactivetext:
color = GetColorFromNSColor(NSColor.controlTextColor);
break;
case ColorID::MozMacFocusring:

3
widget/cocoa/nsNativeThemeCocoa.mm
Просмотреть файл

@ -2412,8 +2412,6 @@ Maybe<nsNativeThemeCocoa::WidgetInfo> nsNativeThemeCocoa::ComputeWidgetInfo(
case StyleAppearance::Treeheader:
// do nothing, taken care of by individual header cells
case StyleAppearance::Treeheadersortarrow:
// do nothing, taken care of by treeview header
case StyleAppearance::Treeline:
// do nothing, these lines don't exist on macos
break;
@ -3200,7 +3198,6 @@ bool nsNativeThemeCocoa::ThemeSupportsWidget(nsPresContext* aPresContext,
case StyleAppearance::Treeview:
case StyleAppearance::Treeheader:
case StyleAppearance::Treeheadercell:
case StyleAppearance::Treeheadersortarrow:
case StyleAppearance::Treeitem:
case StyleAppearance::Treeline:

34
widget/gtk/WidgetStyleCache.cpp
Просмотреть файл

@ -120,18 +120,6 @@ static GtkWidget* CreateGripperWidget() {
return widget;
}
static GtkWidget* CreateToolbarWidget() {
GtkWidget* widget = gtk_toolbar_new();
gtk_container_add(GTK_CONTAINER(GetWidget(MOZ_GTK_GRIPPER)), widget);
return widget;
}
static GtkWidget* CreateToolbarSeparatorWidget() {
GtkWidget* widget = GTK_WIDGET(gtk_separator_tool_item_new());
AddToWindowContainer(widget);
return widget;
}
static GtkWidget* CreateButtonWidget() {
GtkWidget* widget = gtk_button_new_with_label("M");
AddToWindowContainer(widget);
@ -406,13 +394,6 @@ static GtkWidget* CreateTreeHeaderCellWidget() {
return gtk_tree_view_column_get_button(middleTreeViewColumn);
}
static GtkWidget* CreateTreeHeaderSortArrowWidget() {
/* TODO, but it can't be NULL */
GtkWidget* widget = gtk_button_new();
AddToWindowContainer(widget);
return widget;
}
static GtkWidget* CreateHPanedWidget() {
GtkWidget* widget = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
AddToWindowContainer(widget);
@ -729,12 +710,6 @@ static GtkWidget* CreateWidget(WidgetNodeType aAppearance) {
return CreateExpanderWidget();
case MOZ_GTK_FRAME:
return CreateFrameWidget();
case MOZ_GTK_GRIPPER:
return CreateGripperWidget();
case MOZ_GTK_TOOLBAR:
return CreateToolbarWidget();
case MOZ_GTK_TOOLBAR_SEPARATOR:
return CreateToolbarSeparatorWidget();
case MOZ_GTK_SPINBUTTON:
return CreateSpinWidget();
case MOZ_GTK_BUTTON:
@ -752,8 +727,6 @@ static GtkWidget* CreateWidget(WidgetNodeType aAppearance) {
return CreateTreeViewWidget();
case MOZ_GTK_TREE_HEADER_CELL:
return CreateTreeHeaderCellWidget();
case MOZ_GTK_TREE_HEADER_SORTARROW:
return CreateTreeHeaderSortArrowWidget();
case MOZ_GTK_SPLITTER_HORIZONTAL:
return CreateHPanedWidget();
case MOZ_GTK_SPLITTER_VERTICAL:
@ -1073,10 +1046,6 @@ static GtkStyleContext* GetCssNodeStyleInternal(WidgetNodeType aNodeType) {
case MOZ_GTK_PROGRESS_CHUNK:
style = CreateChildCSSNode("progress", MOZ_GTK_PROGRESS_TROUGH);
break;
case MOZ_GTK_GRIPPER:
// TODO - create from CSS node
style = CreateSubStyleWithClass(MOZ_GTK_GRIPPER, GTK_STYLE_CLASS_GRIP);
break;
case MOZ_GTK_SPINBUTTON_ENTRY:
// TODO - create from CSS node
style =
@ -1228,9 +1197,6 @@ static GtkStyleContext* GetWidgetStyleInternal(WidgetNodeType aNodeType) {
GTK_STYLE_CLASS_PROGRESSBAR);
gtk_style_context_remove_class(style, GTK_STYLE_CLASS_TROUGH);
break;
case MOZ_GTK_GRIPPER:
style = CreateSubStyleWithClass(MOZ_GTK_GRIPPER, GTK_STYLE_CLASS_GRIP);
break;
case MOZ_GTK_SPINBUTTON_ENTRY:
style =
CreateSubStyleWithClass(MOZ_GTK_SPINBUTTON, GTK_STYLE_CLASS_ENTRY);

129
widget/gtk/gtk3drawing.cpp
Просмотреть файл

@ -878,17 +878,6 @@ static gint moz_gtk_scale_thumb_paint(cairo_t* cr, GdkRectangle* rect,
return MOZ_GTK_SUCCESS;
}
static gint moz_gtk_gripper_paint(cairo_t* cr, GdkRectangle* rect,
GtkWidgetState* state,
GtkTextDirection direction) {
GtkStyleContext* style =
GetStyleContext(MOZ_GTK_GRIPPER, state->image_scale, direction,
GetStateFlagsFromGtkWidgetState(state));
gtk_render_background(style, cr, rect->x, rect->y, rect->width, rect->height);
gtk_render_frame(style, cr, rect->x, rect->y, rect->width, rect->height);
return MOZ_GTK_SUCCESS;
}
static gint moz_gtk_hpaned_paint(cairo_t* cr, GdkRectangle* rect,
GtkWidgetState* state) {
GtkStyleContext* style =
@ -999,42 +988,6 @@ static gint moz_gtk_tree_header_cell_paint(cairo_t* cr,
return MOZ_GTK_SUCCESS;
}
static gint moz_gtk_tree_header_sort_arrow_paint(cairo_t* cr,
GdkRectangle* rect,
GtkWidgetState* state,
GtkArrowType arrow_type,
GtkTextDirection direction) {
GdkRectangle arrow_rect;
gdouble arrow_angle;
GtkStyleContext* style;
/* hard code these values */
arrow_rect.width = 11;
arrow_rect.height = 11;
arrow_rect.x = rect->x + (rect->width - arrow_rect.width) / 2;
arrow_rect.y = rect->y + (rect->height - arrow_rect.height) / 2;
style = GetStyleContext(MOZ_GTK_TREE_HEADER_SORTARROW, state->image_scale,
direction, GetStateFlagsFromGtkWidgetState(state));
switch (arrow_type) {
case GTK_ARROW_LEFT:
arrow_angle = ARROW_LEFT;
break;
case GTK_ARROW_RIGHT:
arrow_angle = ARROW_RIGHT;
break;
case GTK_ARROW_DOWN:
arrow_angle = ARROW_DOWN;
break;
default:
arrow_angle = ARROW_UP;
break;
}
if (arrow_type != GTK_ARROW_NONE)
gtk_render_arrow(style, cr, arrow_angle, arrow_rect.x, arrow_rect.y,
arrow_rect.width);
return MOZ_GTK_SUCCESS;
}
/* See gtk_expander_paint() for reference.
*/
static gint moz_gtk_treeview_expander_paint(cairo_t* cr, GdkRectangle* rect,
@ -1184,57 +1137,6 @@ static gint moz_gtk_arrow_paint(cairo_t* cr, GdkRectangle* rect,
return MOZ_GTK_SUCCESS;
}
static gint moz_gtk_toolbar_paint(cairo_t* cr, GdkRectangle* rect,
GtkWidgetState* state,
GtkTextDirection direction) {
GtkStyleContext* style =
GetStyleContext(MOZ_GTK_TOOLBAR, state->image_scale, direction);
gtk_render_background(style, cr, rect->x, rect->y, rect->width, rect->height);
gtk_render_frame(style, cr, rect->x, rect->y, rect->width, rect->height);
return MOZ_GTK_SUCCESS;
}
/* See _gtk_toolbar_paint_space_line() for reference.
*/
static gint moz_gtk_toolbar_separator_paint(cairo_t* cr, GdkRectangle* rect,
GtkWidgetState* state,
GtkTextDirection direction) {
gint separator_width;
gint paint_width;
gboolean wide_separators;
/* Defined as constants in GTK+ 2.10.14 */
const double start_fraction = 0.2;
const double end_fraction = 0.8;
GtkStyleContext* style = GetStyleContext(MOZ_GTK_TOOLBAR, state->image_scale);
gtk_style_context_get_style(style, "wide-separators", &wide_separators,
"separator-width", &separator_width, NULL);
style =
GetStyleContext(MOZ_GTK_TOOLBAR_SEPARATOR, state->image_scale, direction);
if (wide_separators) {
if (separator_width > rect->width) separator_width = rect->width;
gtk_render_frame(style, cr, rect->x + (rect->width - separator_width) / 2,
rect->y + rect->height * start_fraction, separator_width,
rect->height * (end_fraction - start_fraction));
} else {
GtkBorder padding;
gtk_style_context_get_padding(style, gtk_style_context_get_state(style),
&padding);
paint_width = padding.left;
if (paint_width > rect->width) paint_width = rect->width;
gtk_render_line(style, cr, rect->x + (rect->width - paint_width) / 2,
rect->y + rect->height * start_fraction,
rect->x + (rect->width - paint_width) / 2,
rect->y + rect->height * end_fraction);
}
return MOZ_GTK_SUCCESS;
}
static gint moz_gtk_tooltip_paint(cairo_t* cr, const GdkRectangle* aRect,
GtkWidgetState* state,
GtkTextDirection direction) {
@ -1723,9 +1625,6 @@ gint moz_gtk_get_widget_border(WidgetNodeType widget, gint* left, gint* top,
moz_gtk_add_border_padding(style, left, top, right, bottom);
return MOZ_GTK_SUCCESS;
}
case MOZ_GTK_TREE_HEADER_SORTARROW:
w = GetWidget(MOZ_GTK_TREE_HEADER_SORTARROW);
break;
case MOZ_GTK_DROPDOWN: {
/* We need to account for the arrow on the dropdown, so text
* doesn't come too close to the arrow, or in some cases spill
@ -1824,12 +1723,10 @@ gint moz_gtk_get_widget_border(WidgetNodeType widget, gint* left, gint* top,
case MOZ_GTK_RADIOBUTTON:
case MOZ_GTK_SCALE_THUMB_HORIZONTAL:
case MOZ_GTK_SCALE_THUMB_VERTICAL:
case MOZ_GTK_GRIPPER:
case MOZ_GTK_PROGRESS_CHUNK:
case MOZ_GTK_PROGRESS_CHUNK_INDETERMINATE:
case MOZ_GTK_PROGRESS_CHUNK_VERTICAL_INDETERMINATE:
case MOZ_GTK_TREEVIEW_EXPANDER:
case MOZ_GTK_TOOLBAR_SEPARATOR:
case MOZ_GTK_HEADER_BAR:
case MOZ_GTK_HEADER_BAR_MAXIMIZED:
case MOZ_GTK_HEADER_BAR_BUTTON_CLOSE:
@ -1843,7 +1740,6 @@ gint moz_gtk_get_widget_border(WidgetNodeType widget, gint* left, gint* top,
case MOZ_GTK_WINDOW_DECORATION_SOLID:
case MOZ_GTK_RESIZER:
case MOZ_GTK_TOOLBARBUTTON_ARROW:
case MOZ_GTK_TOOLBAR:
case MOZ_GTK_TAB_SCROLLARROW:
return MOZ_GTK_SUCCESS;
default:
@ -1938,22 +1834,6 @@ void moz_gtk_get_arrow_size(WidgetNodeType widgetType, gint* width,
}
}
gint moz_gtk_get_toolbar_separator_width(gint* size) {
gboolean wide_separators;
gint separator_width;
GtkBorder border;
GtkStyleContext* style = GetStyleContext(MOZ_GTK_TOOLBAR);
gtk_style_context_get_style(style, "space-size", size, "wide-separators",
&wide_separators, "separator-width",
&separator_width, NULL);
/* Just in case... */
gtk_style_context_get_border(style, gtk_style_context_get_state(style),
&border);
*size = MAX(*size, (wide_separators ? separator_width : border.left));
return MOZ_GTK_SUCCESS;
}
gint moz_gtk_get_expander_size(gint* size) {
GtkStyleContext* style = GetStyleContext(MOZ_GTK_EXPANDER);
gtk_style_context_get_style(style, "expander-size", size, NULL);
@ -2232,15 +2112,10 @@ gint moz_gtk_widget_paint(WidgetNodeType widget, cairo_t* cr,
direction, GetStateFlagsFromGtkWidgetState(state));
return moz_gtk_entry_paint(cr, rect, state, style, widget);
}
case MOZ_GTK_GRIPPER:
return moz_gtk_gripper_paint(cr, rect, state, direction);
case MOZ_GTK_TREEVIEW:
return moz_gtk_treeview_paint(cr, rect, state, direction);
case MOZ_GTK_TREE_HEADER_CELL:
return moz_gtk_tree_header_cell_paint(cr, rect, state, flags, direction);
case MOZ_GTK_TREE_HEADER_SORTARROW:
return moz_gtk_tree_header_sort_arrow_paint(
cr, rect, state, (GtkArrowType)flags, direction);
case MOZ_GTK_TREEVIEW_EXPANDER:
return moz_gtk_treeview_expander_paint(
cr, rect, state, (GtkExpanderStyle)flags, direction);
@ -2256,10 +2131,6 @@ gint moz_gtk_widget_paint(WidgetNodeType widget, cairo_t* cr,
return moz_gtk_text_view_paint(cr, rect, state, direction);
case MOZ_GTK_DROPDOWN:
return moz_gtk_combo_box_paint(cr, rect, state, direction);
case MOZ_GTK_TOOLBAR:
return moz_gtk_toolbar_paint(cr, rect, state, direction);
case MOZ_GTK_TOOLBAR_SEPARATOR:
return moz_gtk_toolbar_separator_paint(cr, rect, state, direction);
case MOZ_GTK_TOOLTIP:
return moz_gtk_tooltip_paint(cr, rect, state, direction);
case MOZ_GTK_FRAME:

8
widget/gtk/gtkdrawing.h
Просмотреть файл

@ -158,8 +158,6 @@ enum WidgetNodeType : int {
MOZ_GTK_SPINBUTTON_UP,
MOZ_GTK_SPINBUTTON_DOWN,
MOZ_GTK_SPINBUTTON_ENTRY,
/* Paints the gripper of a GtkHandleBox. */
MOZ_GTK_GRIPPER,
/* Paints a GtkEntry. */
MOZ_GTK_ENTRY,
/* Paints a GtkExpander. */
@ -176,10 +174,6 @@ enum WidgetNodeType : int {
/* Paints an entry in an editable option menu */
MOZ_GTK_DROPDOWN_ENTRY,
/* Paints the background of a GtkHandleBox. */
MOZ_GTK_TOOLBAR,
/* Paints a toolbar separator */
MOZ_GTK_TOOLBAR_SEPARATOR,
/* Paints a GtkToolTip */
MOZ_GTK_TOOLTIP,
/* Paints a GtkBox from GtkToolTip */
@ -221,8 +215,6 @@ enum WidgetNodeType : int {
MOZ_GTK_TREEVIEW_VIEW,
/* Paints treeheader cells */
MOZ_GTK_TREE_HEADER_CELL,
/* Paints sort arrows in treeheader cells */
MOZ_GTK_TREE_HEADER_SORTARROW,
/* Paints an expander for a GtkTreeView */
MOZ_GTK_TREEVIEW_EXPANDER,
/* Paints the background of menus, context menus. */

23
widget/gtk/nsLookAndFeel.cpp
Просмотреть файл

@ -749,11 +749,23 @@ nsresult nsLookAndFeel::PerThemeData::GetColor(ColorID aID,
case ColorID::MozComboboxtext:
aColor = mComboBoxText;
break;
case ColorID::MozColheader:
aColor = mMozColHeader.mBg;
break;
case ColorID::MozColheadertext:
aColor = mMozColHeaderText;
aColor = mMozColHeader.mFg;
break;
case ColorID::MozColheaderhover:
aColor = mMozColHeaderHover.mBg;
break;
case ColorID::MozColheaderhovertext:
aColor = mMozColHeaderHoverText;
aColor = mMozColHeaderHover.mFg;
break;
case ColorID::MozColheaderactive:
aColor = mMozColHeaderActive.mBg;
break;
case ColorID::MozColheaderactivetext:
aColor = mMozColHeaderActive.mFg;
break;
case ColorID::SpellCheckerUnderline:
case ColorID::Mark:
@ -2113,10 +2125,9 @@ void nsLookAndFeel::PerThemeData::Init() {
// Column header colors
style = GetStyleContext(MOZ_GTK_TREE_HEADER_CELL);
gtk_style_context_get_color(style, GTK_STATE_FLAG_NORMAL, &color);
mMozColHeaderText = GDK_RGBA_TO_NS_RGBA(color);
gtk_style_context_get_color(style, GTK_STATE_FLAG_PRELIGHT, &color);
mMozColHeaderHoverText = GDK_RGBA_TO_NS_RGBA(color);
mMozColHeader = GetColorPair(style, GTK_STATE_FLAG_NORMAL);
mMozColHeaderHover = GetColorPair(style, GTK_STATE_FLAG_NORMAL);
mMozColHeaderActive = GetColorPair(style, GTK_STATE_FLAG_ACTIVE);
// Compute cell highlight colors
InitCellHighlightColors();

5
widget/gtk/nsLookAndFeel.h
Просмотреть файл

@ -120,8 +120,9 @@ class nsLookAndFeel final : public nsXPLookAndFeel {
ColorPair mAccent;
ColorPair mSelectedItem;
nscolor mMozColHeaderText = kBlack;
nscolor mMozColHeaderHoverText = kBlack;
ColorPair mMozColHeader;
ColorPair mMozColHeaderHover;
ColorPair mMozColHeaderActive;
ColorPair mTitlebar;
ColorPair mTitlebarInactive;

54
widget/gtk/nsNativeThemeGTK.cpp
Просмотреть файл

@ -289,12 +289,6 @@ bool nsNativeThemeGTK::GetGtkWidgetAndState(StyleAppearance aAppearance,
}
break;
}
case StyleAppearance::Separator:
aGtkWidgetType = MOZ_GTK_TOOLBAR_SEPARATOR;
break;
case StyleAppearance::Toolbargripper:
aGtkWidgetType = MOZ_GTK_GRIPPER;
break;
case StyleAppearance::NumberInput:
case StyleAppearance::Textfield:
aGtkWidgetType = MOZ_GTK_ENTRY;
@ -306,37 +300,6 @@ bool nsNativeThemeGTK::GetGtkWidgetAndState(StyleAppearance aAppearance,
case StyleAppearance::Treeview:
aGtkWidgetType = MOZ_GTK_TREEVIEW;
break;
case StyleAppearance::Treeheadercell:
if (aWidgetFlags) {
// In this case, the flag denotes whether the header is the sorted one
// or not
if (GetTreeSortDirection(aFrame) == eTreeSortDirection_Natural)
*aWidgetFlags = false;
else
*aWidgetFlags = true;
}
aGtkWidgetType = MOZ_GTK_TREE_HEADER_CELL;
break;
case StyleAppearance::Treeheadersortarrow:
if (aWidgetFlags) {
switch (GetTreeSortDirection(aFrame)) {
case eTreeSortDirection_Ascending:
*aWidgetFlags = GTK_ARROW_DOWN;
break;
case eTreeSortDirection_Descending:
*aWidgetFlags = GTK_ARROW_UP;
break;
case eTreeSortDirection_Natural:
default:
/* This prevents the treecolums from getting smaller
* and wider when switching sort direction off and on
* */
*aWidgetFlags = GTK_ARROW_NONE;
break;
}
}
aGtkWidgetType = MOZ_GTK_TREE_HEADER_SORTARROW;
break;
case StyleAppearance::Treetwisty:
aGtkWidgetType = MOZ_GTK_TREEVIEW_EXPANDER;
if (aWidgetFlags) *aWidgetFlags = GTK_EXPANDER_COLLAPSED;
@ -369,9 +332,6 @@ bool nsNativeThemeGTK::GetGtkWidgetAndState(StyleAppearance aAppearance,
*aWidgetFlags = GTK_ARROW_LEFT;
}
break;
case StyleAppearance::Toolbar:
aGtkWidgetType = MOZ_GTK_TOOLBAR;
break;
case StyleAppearance::Tooltip:
aGtkWidgetType = MOZ_GTK_TOOLTIP;
break;
@ -1133,9 +1093,7 @@ LayoutDeviceIntSize nsNativeThemeGTK::GetMinimumWidgetSize(
}
case StyleAppearance::Button:
case StyleAppearance::Menulist:
case StyleAppearance::MenulistButton:
case StyleAppearance::Toolbarbutton:
case StyleAppearance::Treeheadercell: {
case StyleAppearance::MenulistButton: {
if (aAppearance == StyleAppearance::Menulist ||
aAppearance == StyleAppearance::MenulistButton) {
// Include the arrow size.
@ -1184,15 +1142,11 @@ LayoutDeviceIntSize nsNativeThemeGTK::GetMinimumWidgetSize(
result.height = height;
}
} break;
case StyleAppearance::Separator: {
moz_gtk_get_toolbar_separator_width(&result.width);
} break;
case StyleAppearance::Spinner:
// hard code these sizes
result.width = 14;
result.height = 26;
break;
case StyleAppearance::Treeheadersortarrow:
case StyleAppearance::SpinnerUpbutton:
case StyleAppearance::SpinnerDownbutton:
// hard code these sizes
@ -1302,7 +1256,6 @@ nsNativeThemeGTK::ThemeSupportsWidget(nsPresContext* aPresContext,
case StyleAppearance::Radio:
case StyleAppearance::Checkbox:
case StyleAppearance::Toolbox: // N/A
case StyleAppearance::Toolbar:
case StyleAppearance::Toolbarbutton:
case StyleAppearance::Dualbutton: // so we can override the border with 0
case StyleAppearance::ToolbarbuttonDropdown:
@ -1310,16 +1263,12 @@ nsNativeThemeGTK::ThemeSupportsWidget(nsPresContext* aPresContext,
case StyleAppearance::ButtonArrowDown:
case StyleAppearance::ButtonArrowNext:
case StyleAppearance::ButtonArrowPrevious:
case StyleAppearance::Separator:
case StyleAppearance::Toolbargripper:
case StyleAppearance::Listbox:
case StyleAppearance::Treeview:
// case StyleAppearance::Treeitem:
case StyleAppearance::Treetwisty:
// case StyleAppearance::Treeline:
// case StyleAppearance::Treeheader:
case StyleAppearance::Treeheadercell:
case StyleAppearance::Treeheadersortarrow:
case StyleAppearance::Treetwistyopen:
case StyleAppearance::ProgressBar:
case StyleAppearance::Progresschunk:
@ -1387,7 +1336,6 @@ bool nsNativeThemeGTK::ThemeDrawsFocusForWidget(nsIFrame* aFrame,
case StyleAppearance::MenulistButton:
case StyleAppearance::Textarea:
case StyleAppearance::Textfield:
case StyleAppearance::Treeheadercell:
case StyleAppearance::NumberInput:
return true;
default:

1
widget/nsNativeTheme.cpp
Просмотреть файл

@ -54,7 +54,6 @@ NS_IMPL_ISUPPORTS(nsNativeTheme, nsITimerCallback, nsINamed)
if (aAppearance == StyleAppearance::Checkbox ||
aAppearance == StyleAppearance::Radio ||
aAppearance == StyleAppearance::ToolbarbuttonDropdown ||
aAppearance == StyleAppearance::Treeheadersortarrow ||
aAppearance == StyleAppearance::ButtonArrowPrevious ||
aAppearance == StyleAppearance::ButtonArrowNext ||
aAppearance == StyleAppearance::ButtonArrowUp ||

10
widget/nsXPLookAndFeel.cpp
Просмотреть файл

@ -283,8 +283,12 @@ static const char sColorPrefs[][41] = {
"ui.-moz-hyperlinktext",
"ui.-moz-activehyperlinktext",
"ui.-moz-visitedhyperlinktext",
"ui.-moz-colheader",
"ui.-moz-colheadertext",
"ui.-moz-colheaderhover",
"ui.-moz-colheaderhovertext",
"ui.-moz-colheaderactive",
"ui.-moz-colheaderactivetext",
"ui.textSelectDisabledBackground",
"ui.textSelectAttentionBackground",
"ui.textSelectAttentionForeground",
@ -737,6 +741,9 @@ Maybe<nscolor> nsXPLookAndFeel::GenericDarkColor(ColorID aID) {
case ColorID::Captiontext:
case ColorID::Inactivecaptiontext: // TODO(emilio): Maybe make
// Inactivecaptiontext Graytext?
case ColorID::MozColheadertext:
case ColorID::MozColheaderhovertext:
case ColorID::MozColheaderactivetext:
color = kWindowText;
break;
case ColorID::Buttonshadow:
@ -757,6 +764,7 @@ Maybe<nscolor> nsXPLookAndFeel::GenericDarkColor(ColorID aID) {
break;
case ColorID::Field:
case ColorID::Buttonface: // --in-content-button-background
case ColorID::MozColheader:
case ColorID::Threedface:
case ColorID::MozCombobox:
case ColorID::MozCellhighlighttext:
@ -772,9 +780,11 @@ Maybe<nscolor> nsXPLookAndFeel::GenericDarkColor(ColorID aID) {
color = NS_ComposeColors(kWindowBackground, NS_RGBA(43, 42, 51, 102));
break;
case ColorID::MozButtonhoverface: // --in-content-button-background-hover
case ColorID::MozColheaderhover:
color = NS_RGB(82, 82, 94);
break;
case ColorID::MozButtonactiveface: // --in-content-button-background-active
case ColorID::MozColheaderactive:
color = NS_RGB(91, 91, 102);
break;
case ColorID::Highlight:

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

@ -213,6 +213,9 @@ nsresult nsLookAndFeel::NativeGetColor(ColorID aID, ColorScheme aScheme,
case ColorID::MozButtonhoverface:
case ColorID::MozButtonactiveface:
case ColorID::MozButtondisabledface:
case ColorID::MozColheader:
case ColorID::MozColheaderhover:
case ColorID::MozColheaderactive:
idx = COLOR_BTNFACE;
break;
case ColorID::Buttonhighlight:
@ -338,6 +341,7 @@ nsresult nsLookAndFeel::NativeGetColor(ColorID aID, ColorScheme aScheme,
case ColorID::MozDialogtext:
case ColorID::MozColheadertext:
case ColorID::MozColheaderhovertext:
case ColorID::MozColheaderactivetext:
idx = COLOR_WINDOWTEXT;
break;
case ColorID::MozNativehyperlinktext:

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

@ -504,7 +504,6 @@ mozilla::Maybe<nsUXThemeClass> nsNativeThemeWin::GetThemeClass(
case StyleAppearance::MenulistButton:
return Some(eUXCombobox);
case StyleAppearance::Treeheadercell:
case StyleAppearance::Treeheadersortarrow:
return Some(eUXHeader);
case StyleAppearance::Listbox:
case StyleAppearance::Treeview:
@ -778,12 +777,6 @@ nsresult nsNativeThemeWin::GetThemePartAndState(nsIFrame* aFrame,
return NS_OK;
}
case StyleAppearance::Treeheadersortarrow: {
// XXX Probably will never work due to a bug in the Luna theme.
aPart = 4;
aState = 1;
return NS_OK;
}
case StyleAppearance::Treeheadercell: {
aPart = 1;
if (!aFrame) {