openkylin
/
vte2.91
mirror of https://gitee.com/openkylin/vte2.91.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[PATCH] Add the style context provider with FALLBACK priority 

Let's try again. This time we have two style providers. One of them is at
APPLICATION priority and cannot be overridden by the theme. It sets the padding
on VteTerminal widgets. The other one is at FALLBACK priority and is for
colours. This can be overridden by the theme.

This reverts commit bd86e7637d89a55941674756e3e223c82aee2305.

Bug-Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=740123

Gbp-Pq: Name 0001-Add-the-style-context-provider-with-FALLBACK-priorit.patch
This commit is contained in:
Iain Lane 2015-07-16 10:32:38 +01:00 committed by openKylinBot
parent a5510b463a
commit a4a357d460
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/vtegtk.cc
View File

@ -74,6 +74,7 @@
struct _VteTerminalClassPrivate { struct _VteTerminalClassPrivate {
GtkStyleProvider *style_provider; GtkStyleProvider *style_provider;
GtkStyleProvider *style_provider_padding;
}; };
#ifdef VTE_DEBUG #ifdef VTE_DEBUG
@ -399,6 +400,9 @@ vte_terminal_init(VteTerminal *terminal)
context = gtk_widget_get_style_context(&terminal->widget); context = gtk_widget_get_style_context(&terminal->widget);
gtk_style_context_add_provider (context, gtk_style_context_add_provider (context,
VTE_TERMINAL_GET_CLASS (terminal)->priv->style_provider, VTE_TERMINAL_GET_CLASS (terminal)->priv->style_provider,
GTK_STYLE_PROVIDER_PRIORITY_FALLBACK);
gtk_style_context_add_provider (context,
VTE_TERMINAL_GET_CLASS (terminal)->priv->style_provider_padding,
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
/* Initialize private data. NOTE: place is zeroed */ /* Initialize private data. NOTE: place is zeroed */
@ -1813,6 +1817,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
klass->priv = G_TYPE_CLASS_GET_PRIVATE (klass, VTE_TYPE_TERMINAL, VteTerminalClassPrivate); klass->priv = G_TYPE_CLASS_GET_PRIVATE (klass, VTE_TYPE_TERMINAL, VteTerminalClassPrivate);
klass->priv->style_provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ()); klass->priv->style_provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
klass->priv->style_provider_padding = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
gtk_css_provider_load_from_data (GTK_CSS_PROVIDER (klass->priv->style_provider), gtk_css_provider_load_from_data (GTK_CSS_PROVIDER (klass->priv->style_provider),
"VteTerminal, " VTE_TERMINAL_CSS_NAME " {\n" "VteTerminal, " VTE_TERMINAL_CSS_NAME " {\n"
"padding: 1px 1px 1px 1px;\n" "padding: 1px 1px 1px 1px;\n"
@ -1821,6 +1826,11 @@ vte_terminal_class_init(VteTerminalClass *klass)
"}\n", "}\n",
-1, NULL); -1, NULL);
gtk_css_provider_load_from_data (GTK_CSS_PROVIDER (klass->priv->style_provider_padding),
"VteTerminal, " VTE_TERMINAL_CSS_NAME " {\n"
"padding: 1px 1px 1px 1px;\n"
"}\n",
-1, NULL);
#ifdef WITH_A11Y #ifdef WITH_A11Y
/* a11y */ /* a11y */
gtk_widget_class_set_accessible_type(widget_class, VTE_TYPE_TERMINAL_ACCESSIBLE); gtk_widget_class_set_accessible_type(widget_class, VTE_TYPE_TERMINAL_ACCESSIBLE);