callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

settings: Implement StyleProvider interface without StyleProperties

Browse Source 
I want to deprecate GtkStyleProperties.
This commit is contained in:
Benjamin Otte
2012-12-01 00:56:12 +01:00
parent fe61e6b3fe
commit 41f8ba3c35
1 changed files with 39 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
gtk/gtksettings.c
View File

@ -24,6 +24,9 @@
#include "gtksettings.h" #include "gtksettings.h"
#include "gtkcssarrayvalueprivate.h"
#include "gtkcssnumbervalueprivate.h"
#include "gtkcssstringvalueprivate.h"
#include "gtkmodules.h" #include "gtkmodules.h"
#include "gtkmodulesprivate.h" #include "gtkmodulesprivate.h"
#include "gtksettingsprivate.h" #include "gtksettingsprivate.h"
@ -114,7 +117,8 @@ struct _GtkSettingsPrivate
GdkScreen *screen; GdkScreen *screen;
GtkCssProvider *theme_provider; GtkCssProvider *theme_provider;
GtkCssProvider *key_theme_provider; GtkCssProvider *key_theme_provider;
GtkStyleProperties *style; GtkCssValue *default_font_family;
GtkCssValue *default_font_size;
}; };
typedef enum typedef enum
@ -1414,32 +1418,34 @@ static void
settings_ensure_style (GtkSettings *settings) settings_ensure_style (GtkSettings *settings)
{ {
GtkSettingsPrivate *priv = settings->priv; GtkSettingsPrivate *priv = settings->priv;
PangoFontDescription *font_desc; PangoFontDescription *description;
gchar *font_name; gchar *font_name;
PangoFontMask mask;
if (priv->style) if (priv->default_font_family)
return; return;
priv->style = gtk_style_properties_new ();
g_object_get (settings, g_object_get (settings,
"gtk-font-name", &font_name, "gtk-font-name", &font_name,
NULL); NULL);
font_desc = pango_font_description_from_string (font_name); description = pango_font_description_from_string (font_name);
if (description)
mask = pango_font_description_get_set_fields (description);
else
mask = 0;
/* Unset attributes from this description, if (mask & PANGO_FONT_MASK_FAMILY)
* so they do not override theme values */ priv->default_font_family = _gtk_css_array_value_new (_gtk_css_string_value_new (pango_font_description_get_family (description)));
pango_font_description_unset_fields (font_desc, PANGO_FONT_MASK_WEIGHT); else
pango_font_description_unset_fields (font_desc, PANGO_FONT_MASK_STRETCH); priv->default_font_family = _gtk_css_array_value_new (_gtk_css_string_value_new ("Sans"));
pango_font_description_unset_fields (font_desc, PANGO_FONT_MASK_VARIANT);
pango_font_description_unset_fields (font_desc, PANGO_FONT_MASK_STYLE);
gtk_style_properties_set (priv->style, 0, if (mask & PANGO_FONT_MASK_SIZE)
"font", font_desc, priv->default_font_size = _gtk_css_number_value_new ((double) pango_font_description_get_size (description) / PANGO_SCALE, GTK_CSS_PX);
NULL); else
priv->default_font_size = _gtk_css_number_value_new (10.0, GTK_CSS_PX);
pango_font_description_free (font_desc); pango_font_description_free (description);
g_free (font_name); g_free (font_name);
} }
@ -1448,17 +1454,6 @@ gtk_settings_provider_iface_init (GtkStyleProviderIface *iface)
{ {
} }
static GtkCssValue *
gtk_settings_style_provider_get_color (GtkStyleProviderPrivate *provider,
const char *name)
{
GtkSettings *settings = GTK_SETTINGS (provider);
settings_ensure_style (settings);
return _gtk_style_provider_private_get_color (GTK_STYLE_PROVIDER_PRIVATE (settings->priv->style), name);
}
static void static void
gtk_settings_style_provider_lookup (GtkStyleProviderPrivate *provider, gtk_settings_style_provider_lookup (GtkStyleProviderPrivate *provider,
const GtkCssMatcher *matcher, const GtkCssMatcher *matcher,
@ -1468,29 +1463,16 @@ gtk_settings_style_provider_lookup (GtkStyleProviderPrivate *provider,
settings_ensure_style (settings); settings_ensure_style (settings);
_gtk_style_provider_private_lookup (GTK_STYLE_PROVIDER_PRIVATE (settings->priv->style), if (_gtk_css_lookup_is_missing (lookup, GTK_CSS_PROPERTY_FONT_FAMILY))
matcher, _gtk_css_lookup_set (lookup, GTK_CSS_PROPERTY_FONT_FAMILY, NULL, settings->priv->default_font_family);
lookup); if (_gtk_css_lookup_is_missing (lookup, GTK_CSS_PROPERTY_FONT_SIZE))
} _gtk_css_lookup_set (lookup, GTK_CSS_PROPERTY_FONT_SIZE, NULL, settings->priv->default_font_size);
static GtkCssChange
gtk_settings_style_provider_get_change (GtkStyleProviderPrivate *provider,
const GtkCssMatcher *matcher)
{
GtkSettings *settings = GTK_SETTINGS (provider);
settings_ensure_style (settings);
return _gtk_style_provider_private_get_change (GTK_STYLE_PROVIDER_PRIVATE (settings->priv->style),
matcher);
} }
static void static void
gtk_settings_provider_private_init (GtkStyleProviderPrivateInterface *iface) gtk_settings_provider_private_init (GtkStyleProviderPrivateInterface *iface)
{ {
iface->get_color = gtk_settings_style_provider_get_color;
iface->lookup = gtk_settings_style_provider_lookup; iface->lookup = gtk_settings_style_provider_lookup;
iface->get_change = gtk_settings_style_provider_get_change;
} }
static void static void
@ -1511,7 +1493,10 @@ gtk_settings_finalize (GObject *object)
settings_update_provider (priv->screen, &priv->theme_provider, NULL); settings_update_provider (priv->screen, &priv->theme_provider, NULL);
settings_update_provider (priv->screen, &priv->key_theme_provider, NULL); settings_update_provider (priv->screen, &priv->key_theme_provider, NULL);
g_clear_object (&priv->style); if (priv->default_font_family)
_gtk_css_value_unref (priv->default_font_family);
if (priv->default_font_size)
_gtk_css_value_unref (priv->default_font_size);
G_OBJECT_CLASS (gtk_settings_parent_class)->finalize (object); G_OBJECT_CLASS (gtk_settings_parent_class)->finalize (object);
} }
@ -1720,10 +1705,15 @@ settings_invalidate_style (GtkSettings *settings)
{ {
GtkSettingsPrivate *priv = settings->priv; GtkSettingsPrivate *priv = settings->priv;
if (priv->style) if (priv->default_font_family)
{ {
g_object_unref (priv->style); _gtk_css_value_unref (priv->default_font_family);
priv->style = NULL; priv->default_font_family = NULL;
}
if (priv->default_font_size)
{
_gtk_css_value_unref (priv->default_font_size);
priv->default_font_size = NULL;
} }
_gtk_style_provider_private_changed (GTK_STYLE_PROVIDER_PRIVATE (settings)); _gtk_style_provider_private_changed (GTK_STYLE_PROVIDER_PRIVATE (settings));