summaryrefslogtreecommitdiff
path: root/pluma/pluma-view.c
diff options
context:
space:
mode:
authorBwackNinja <[email protected]>2020-10-16 12:08:49 -0400
committerraveit65 <[email protected]>2020-10-27 13:09:33 +0100
commit1b879ef459cce5d6012c9f535b2ce2f056b49989 (patch)
treea8690fc92c1f7ca2b1f575574f87858baab3c712 /pluma/pluma-view.c
parent6e4188e92ee151ac44f2cccf239c8f5ae43d4b69 (diff)
downloadpluma-1b879ef459cce5d6012c9f535b2ce2f056b49989.tar.bz2
pluma-1b879ef459cce5d6012c9f535b2ce2f056b49989.tar.xz
pluma-view: Fix incorrect interface font
Fixes issue #525 by setting the textview font with css without also setting the font for the labels. Changes based on gedit and gtk/gtkfontbutton.c.
Diffstat (limited to 'pluma/pluma-view.c')
-rw-r--r--pluma/pluma-view.c136
1 files changed, 32 insertions, 104 deletions
diff --git a/pluma/pluma-view.c b/pluma/pluma-view.c
index c1918ca4..9b94da3f 100644
--- a/pluma/pluma-view.c
+++ b/pluma/pluma-view.c
@@ -44,6 +44,7 @@
#include "pluma-view.h"
#include "pluma-debug.h"
+#include "pluma-pango.h"
#include "pluma-utils.h"
#include "pluma-settings.h"
@@ -97,6 +98,9 @@ struct _PlumaViewPrivate
gboolean disable_popdown;
GtkTextBuffer *current_buffer;
+
+ GtkCssProvider *css_provider;
+ PangoFontDescription *font_desc;
};
/* The search entry completion is shared among all the views */
@@ -481,6 +485,7 @@ pluma_view_init (PlumaView *view)
guint right_margin_position;
GtkWrapMode wrap_mode;
GtkSourceSmartHomeEndType smart_home_end;
+ GtkStyleContext *context;
pluma_debug (DEBUG_VIEW);
@@ -490,6 +495,15 @@ pluma_view_init (PlumaView *view)
view->priv->editor_settings = g_settings_new (PLUMA_SCHEMA_ID);
view->priv->interface_settings = g_settings_new ("org.mate.interface");
+ view->priv->css_provider = gtk_css_provider_new ();
+ context = gtk_widget_get_style_context (GTK_WIDGET (view));
+ gtk_style_context_add_class (context, "pluma-view");
+
+ gtk_style_context_add_provider (context,
+ GTK_STYLE_PROVIDER (view->priv->css_provider),
+ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+
+
/* Get setting values */
use_default_font = g_settings_get_boolean (view->priv->editor_settings,
PLUMA_SETTINGS_USE_DEFAULT_FONT);
@@ -600,6 +614,9 @@ pluma_view_dispose (GObject *object)
current_buffer_removed (view);
g_signal_handlers_disconnect_by_func (view, on_notify_buffer_cb, NULL);
+ g_clear_object (&view->priv->css_provider);
+ g_clear_pointer (&view->priv->font_desc, pango_font_description_free);
+
(* G_OBJECT_CLASS (pluma_view_parent_class)->dispose) (object);
}
@@ -900,101 +917,21 @@ pluma_view_scroll_to_cursor (PlumaView *view)
0.0);
}
-static PangoFontDescription* get_system_font (GSettings *settings)
-{
- PangoFontDescription *desc = NULL;
- char *name;
-
- name = g_settings_get_string (settings, "font-name");
-
- if (name)
- {
- desc = pango_font_description_from_string (name);
- g_free (name);
- }
-
- return desc;
-}
-
static void
-system_font_changed_cb (GSettings *settings,
- gchar *key,
- gpointer user_data)
+update_css_provider (PlumaView *view)
{
- PangoFontDescription *sys_font_desc = NULL;
- sys_font_desc = get_system_font (settings);
- if (sys_font_desc)
- {
- pluma_override_font (NULL, "label", sys_font_desc);
- pango_font_description_free (sys_font_desc);
- }
-}
+ gchar *str;
+ gchar *css;
-void
-pluma_override_font (PlumaView *view,
- const gchar *item,
- PangoFontDescription *font)
-{
- static GtkCssProvider *provider = NULL; /*We need to keep this as long as Pluma is running*/
- gchar *prov_str;
- gchar *css;
- gchar *family;
- gchar *weight;
- const gchar *style;
- gchar *size;
-
- family = g_strdup_printf ("font-family: %s;", pango_font_description_get_family (font));
-
- weight = g_strdup_printf ("font-weight: %d;", pango_font_description_get_weight (font));
-
- if (pango_font_description_get_style (font) == PANGO_STYLE_NORMAL)
- style = "font-style: normal;";
- else if (pango_font_description_get_style (font) == PANGO_STYLE_ITALIC)
- style = "font-style: italic;";
- else
- style = "font-style: oblique;";
+ g_assert (PLUMA_IS_VIEW (view));
+ g_assert (view->priv->font_desc != NULL);
- size = g_strdup_printf ("font-size: %d%s;",
- pango_font_description_get_size (font) / PANGO_SCALE,
- pango_font_description_get_size_is_absolute (font) ? "px" : "pt");
-
- if (provider == NULL)
- {
- provider = gtk_css_provider_new ();
-
- g_signal_connect (view->priv->interface_settings,
- "changed::" "font-name",
- G_CALLBACK (system_font_changed_cb), NULL);
-
- gtk_style_context_add_provider_for_screen (gtk_widget_get_screen (GTK_WIDGET(view)),
- GTK_STYLE_PROVIDER (provider),
- GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
- }
-
- prov_str = gtk_css_provider_to_string (provider);
-
- if (g_str_has_prefix (prov_str, "textview") && g_str_has_prefix (item, "label"))
- {
- if (strstr (prov_str, "label"))
- {
- g_strdelimit (prov_str, "}", '\0');
- gchar *prov_new_str = g_strdup_printf ("%s}", prov_str);
- css = g_strdup_printf ("%s %s { %s %s %s %s }", prov_new_str, item, family, weight, style, size);
- g_free (prov_new_str);
- }
- else
- css = g_strdup_printf ("%s %s { %s %s %s %s }", prov_str, item, family, weight, style, size);
- }
- else
- css = g_strdup_printf ("%s { %s %s %s %s }", item, family, weight, style, size);
-
- gtk_css_provider_load_from_data (provider, css, -1, NULL);
+ str = pluma_pango_font_description_to_css (view->priv->font_desc);
+ css = g_strdup_printf ("textview { %s }", str ? str : "");
+ gtk_css_provider_load_from_data (view->priv->css_provider, css, -1, NULL);
g_free (css);
- g_free (family);
- g_free (weight);
- g_free (size);
- g_free (prov_str);
+ g_free (str);
}
/* FIXME this is an issue for introspection */
@@ -1012,13 +949,12 @@ pluma_view_set_font (PlumaView *view,
gboolean def,
const gchar *font_name)
{
- PangoFontDescription *font_desc = NULL;
- PangoFontDescription *sys_font_desc = NULL;
-
pluma_debug (DEBUG_VIEW);
g_return_if_fail (PLUMA_IS_VIEW (view));
+ g_clear_pointer (&view->priv->font_desc, pango_font_description_free);
+
if (def)
{
PlumaSettings *settings;
@@ -1026,27 +962,19 @@ pluma_view_set_font (PlumaView *view,
settings = _pluma_settings_get_singleton ();
font = pluma_settings_get_system_font (settings);
- font_desc = pango_font_description_from_string (font);
+ view->priv->font_desc = pango_font_description_from_string (font);
g_free (font);
}
else
{
g_return_if_fail (font_name != NULL);
- font_desc = pango_font_description_from_string (font_name);
+ view->priv->font_desc = pango_font_description_from_string (font_name);
}
- g_return_if_fail (font_desc != NULL);
-
- pluma_override_font (view, "textview", font_desc);
-
- sys_font_desc = get_system_font (view->priv->interface_settings);
- if (sys_font_desc) {
- pluma_override_font (view, "label", sys_font_desc);
- pango_font_description_free (sys_font_desc);
- }
+ g_return_if_fail (view->priv->font_desc != NULL);
- pango_font_description_free (font_desc);
+ update_css_provider (view);
}
static void
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-07 01:16:54 +0000