wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-25 00:27:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

[GTK3] Use WidgetCache to get colors at nsLookAndFeel for GtkButton, GtkWindow, GtkScrollBar

Browse source
This commit is contained in:
trav90 2018-04-06 07:53:35 -05:00 • committed by Roy Tam
commit f84529230b
2 changed files with 31 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

85
widget/gtk/nsLookAndFeel.cpp
View file

@ -47,9 +47,6 @@ nsLookAndFeel::nsLookAndFeel()
: nsXPLookAndFeel(), : nsXPLookAndFeel(),
#if (MOZ_WIDGET_GTK == 2) #if (MOZ_WIDGET_GTK == 2)
mStyle(nullptr), mStyle(nullptr),
#else
mBackgroundStyle(nullptr),
mButtonStyle(nullptr),
#endif #endif
mDefaultFontCached(false), mButtonFontCached(false), mDefaultFontCached(false), mButtonFontCached(false),
mFieldFontCached(false), mMenuFontCached(false) mFieldFontCached(false), mMenuFontCached(false)
@ -61,9 +58,6 @@ nsLookAndFeel::~nsLookAndFeel()
{ {
#if (MOZ_WIDGET_GTK == 2) #if (MOZ_WIDGET_GTK == 2)
g_object_unref(mStyle); g_object_unref(mStyle);
#else
g_object_unref(mBackgroundStyle);
g_object_unref(mButtonStyle);
#endif #endif
} }
@ -377,30 +371,39 @@ nsLookAndFeel::NativeGetColor(ColorID aID, nscolor& aColor)
break; break;
#else #else
// css2 http://www.w3.org/TR/REC-CSS2/ui.html#system-colors // css2 http://www.w3.org/TR/REC-CSS2/ui.html#system-colors
case eColorID_activeborder: case eColorID_activeborder: {
// active window border // active window border
gtk_style_context_get_border_color(mBackgroundStyle, GtkStyleContext *style = ClaimStyleContext(MOZ_GTK_WINDOW);
gtk_style_context_get_border_color(style,
GTK_STATE_FLAG_NORMAL, &gdk_color); GTK_STATE_FLAG_NORMAL, &gdk_color);
aColor = GDK_RGBA_TO_NS_RGBA(gdk_color); aColor = GDK_RGBA_TO_NS_RGBA(gdk_color);
ReleaseStyleContext(style);
break; break;
case eColorID_inactiveborder: }
case eColorID_inactiveborder: {
// inactive window border // inactive window border
gtk_style_context_get_border_color(mBackgroundStyle, GtkStyleContext *style = ClaimStyleContext(MOZ_GTK_WINDOW);
GTK_STATE_FLAG_INSENSITIVE, gtk_style_context_get_border_color(style,
GTK_STATE_FLAG_INSENSITIVE,
&gdk_color); &gdk_color);
aColor = GDK_RGBA_TO_NS_RGBA(gdk_color); aColor = GDK_RGBA_TO_NS_RGBA(gdk_color);
ReleaseStyleContext(style);
break; break;
}
case eColorID_graytext: // disabled text in windows, menus, etc. case eColorID_graytext: // disabled text in windows, menus, etc.
case eColorID_inactivecaptiontext: // text in inactive window caption case eColorID_inactivecaptiontext: // text in inactive window caption
aColor = sMenuTextInactive; aColor = sMenuTextInactive;
break; break;
case eColorID_inactivecaption: case eColorID_inactivecaption: {
// inactive window caption // inactive window caption
gtk_style_context_get_background_color(mBackgroundStyle, GtkStyleContext *style = ClaimStyleContext(MOZ_GTK_WINDOW);
gtk_style_context_get_background_color(style,
GTK_STATE_FLAG_INSENSITIVE, GTK_STATE_FLAG_INSENSITIVE,
&gdk_color); &gdk_color);
aColor = GDK_RGBA_TO_NS_RGBA(gdk_color); aColor = GDK_RGBA_TO_NS_RGBA(gdk_color);
ReleaseStyleContext(style);
break; break;
}
#endif #endif
case eColorID_infobackground: case eColorID_infobackground:
// tooltip background color // tooltip background color
@ -521,18 +524,24 @@ nsLookAndFeel::NativeGetColor(ColorID aID, nscolor& aColor)
case eColorID__moz_fieldtext: case eColorID__moz_fieldtext:
aColor = sMozFieldText; aColor = sMozFieldText;
break; break;
case eColorID__moz_buttondefault: case eColorID__moz_buttondefault: {
// default button border color // default button border color
gtk_style_context_get_border_color(mButtonStyle, GtkStyleContext *style = ClaimStyleContext(MOZ_GTK_BUTTON);
gtk_style_context_get_border_color(style,
GTK_STATE_FLAG_NORMAL, &gdk_color); GTK_STATE_FLAG_NORMAL, &gdk_color);
aColor = GDK_RGBA_TO_NS_RGBA(gdk_color); aColor = GDK_RGBA_TO_NS_RGBA(gdk_color);
ReleaseStyleContext(style);
break; break;
case eColorID__moz_buttonhoverface: }
gtk_style_context_get_background_color(mButtonStyle, case eColorID__moz_buttonhoverface: {
GtkStyleContext *style = ClaimStyleContext(MOZ_GTK_BUTTON);
gtk_style_context_get_background_color(style,
GTK_STATE_FLAG_PRELIGHT, GTK_STATE_FLAG_PRELIGHT,
&gdk_color); &gdk_color);
aColor = GDK_RGBA_TO_NS_RGBA(gdk_color); aColor = GDK_RGBA_TO_NS_RGBA(gdk_color);
ReleaseStyleContext(style);
break; break;
}
case eColorID__moz_buttonhovertext: case eColorID__moz_buttonhovertext:
aColor = sButtonHoverText; aColor = sButtonHoverText;
break; break;
@ -1029,16 +1038,6 @@ nsLookAndFeel::GetFontImpl(FontID aID, nsString& aFontName,
return true; return true;
} }
#if (MOZ_WIDGET_GTK == 3)
static GtkStyleContext*
create_context(GtkWidgetPath *path)
{
GtkStyleContext *style = gtk_style_context_new();
gtk_style_context_set_path(style, path);
return(style);
}
#endif
void void
nsLookAndFeel::Init() nsLookAndFeel::Init()
{ {
@ -1129,33 +1128,19 @@ nsLookAndFeel::Init()
g_object_set(settings, dark_setting, FALSE, nullptr); g_object_set(settings, dark_setting, FALSE, nullptr);
} }
GtkWidgetPath *path = gtk_widget_path_new();
gtk_widget_path_append_type(path, GTK_TYPE_WINDOW);
mBackgroundStyle = create_context(path);
gtk_style_context_add_class(mBackgroundStyle, GTK_STYLE_CLASS_BACKGROUND);
mButtonStyle = create_context(path);
gtk_style_context_add_class(mButtonStyle, GTK_STYLE_CLASS_BUTTON);
// Scrollbar colors // Scrollbar colors
style = create_context(path); style = ClaimStyleContext(MOZ_GTK_SCROLLBAR_TROUGH_VERTICAL);
gtk_style_context_add_class(style, GTK_STYLE_CLASS_SCROLLBAR);
gtk_style_context_add_class(style, GTK_STYLE_CLASS_TROUGH);
gtk_style_context_get_background_color(style, GTK_STATE_FLAG_NORMAL, &color); gtk_style_context_get_background_color(style, GTK_STATE_FLAG_NORMAL, &color);
sMozScrollbar = GDK_RGBA_TO_NS_RGBA(color); sMozScrollbar = GDK_RGBA_TO_NS_RGBA(color);
g_object_unref(style); ReleaseStyleContext(style);
// Window colors // Window colors
style = create_context(path); style = ClaimStyleContext(MOZ_GTK_WINDOW);
gtk_style_context_save(style);
gtk_style_context_add_class(style, GTK_STYLE_CLASS_BACKGROUND);
gtk_style_context_get_background_color(style, GTK_STATE_FLAG_NORMAL, &color); gtk_style_context_get_background_color(style, GTK_STATE_FLAG_NORMAL, &color);
sMozWindowBackground = GDK_RGBA_TO_NS_RGBA(color); sMozWindowBackground = GDK_RGBA_TO_NS_RGBA(color);
gtk_style_context_get_color(style, GTK_STATE_FLAG_NORMAL, &color); gtk_style_context_get_color(style, GTK_STATE_FLAG_NORMAL, &color);
sMozWindowText = GDK_RGBA_TO_NS_RGBA(color); sMozWindowText = GDK_RGBA_TO_NS_RGBA(color);
gtk_style_context_restore(style); ReleaseStyleContext(style);
g_object_unref(style);
// tooltip foreground and background // tooltip foreground and background
style = ClaimStyleContext(MOZ_GTK_TOOLTIP); style = ClaimStyleContext(MOZ_GTK_TOOLTIP);
@ -1357,8 +1342,6 @@ nsLookAndFeel::Init()
sOddCellBackground = GDK_RGBA_TO_NS_RGBA(color); sOddCellBackground = GDK_RGBA_TO_NS_RGBA(color);
gtk_style_context_restore(style); gtk_style_context_restore(style);
gtk_widget_path_free(path);
// GtkFrame has a "border" subnode on which Adwaita draws the border. // GtkFrame has a "border" subnode on which Adwaita draws the border.
// Some themes do not draw on this node but draw a border on the widget // Some themes do not draw on this node but draw a border on the widget
// root node, so check the root node if no border is found on the border // root node, so check the root node if no border is found on the border
@ -1442,12 +1425,6 @@ nsLookAndFeel::RefreshImpl()
#if (MOZ_WIDGET_GTK == 2) #if (MOZ_WIDGET_GTK == 2)
g_object_unref(mStyle); g_object_unref(mStyle);
mStyle = nullptr; mStyle = nullptr;
#else
g_object_unref(mBackgroundStyle);
g_object_unref(mButtonStyle);
mBackgroundStyle = nullptr;
mButtonStyle = nullptr;
#endif #endif
Init(); Init();

3
widget/gtk/nsLookAndFeel.h
View file

@ -33,9 +33,6 @@ public:
protected: protected:
#if (MOZ_WIDGET_GTK == 2) #if (MOZ_WIDGET_GTK == 2)
struct _GtkStyle *mStyle; struct _GtkStyle *mStyle;
#else
struct _GtkStyleContext *mBackgroundStyle;
struct _GtkStyleContext *mButtonStyle;
#endif #endif
// Cached fonts // Cached fonts