pluma-view: Fix bold and italic fonts in menus

sc0w · vkareh · commit ca00615b5105 · 2018-08-13T16:37:00.000-04:00
diff --git a/pluma/pluma-view.c b/pluma/pluma-view.c
@@ -667,15 +667,15 @@ static PangoFontDescription* get_system_font (void)
 }
 
 static void
-contextmenu_font_changed_cb (GSettings *settings,
-			     gchar     *key,
-			     gpointer   user_data)
+system_font_changed_cb (GSettings *settings,
+			gchar     *key,
+			gpointer   user_data)
 {
 	PangoFontDescription *sys_font_desc = NULL;
 	sys_font_desc = get_system_font ();
 	if (sys_font_desc)
 	{
-		pluma_override_font (".context-menu", NULL, sys_font_desc);
+		pluma_override_font ("label", NULL, sys_font_desc);
 		pango_font_description_free (sys_font_desc);
 	}
 }
@@ -714,9 +714,9 @@ pluma_override_font (const gchar          *item,
 
 	prov_str = gtk_css_provider_to_string (provider);
 
-	if (g_str_has_prefix (prov_str, "textview") && g_str_has_prefix (item, ".context-menu"))
+	if (g_str_has_prefix (prov_str, "textview") && g_str_has_prefix (item, "label"))
 	{
-		if (strstr (prov_str, ".context-menu"))
+		if (strstr (prov_str, "label"))
 		{
 			g_strdelimit (prov_str, "}", '\0');
 			gchar *prov_new_str = g_strdup_printf ("%s}", prov_str);
@@ -737,7 +737,7 @@ pluma_override_font (const gchar          *item,
 		settings = g_settings_new ("org.mate.interface");
 		g_signal_connect (settings,
 				  "changed::" "font-name",
-				  G_CALLBACK (contextmenu_font_changed_cb), NULL);
+				  G_CALLBACK (system_font_changed_cb), NULL);
 
 		gtk_style_context_add_provider_for_screen (gtk_widget_get_screen (widget),
 							   GTK_STYLE_PROVIDER (provider),
@@ -795,7 +795,7 @@ pluma_view_set_font (PlumaView   *view,
 
 	sys_font_desc = get_system_font ();
 	if (sys_font_desc) {
-		pluma_override_font (".context-menu", GTK_WIDGET (view), sys_font_desc);
+		pluma_override_font ("label", GTK_WIDGET (view), sys_font_desc);
 		pango_font_description_free (sys_font_desc);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -667,15 +667,15 @@ static PangoFontDescription* get_system_font (void)`
`667`	`667`	`}`
`668`	`668`
`669`	`669`	`static void`
`670`		`-contextmenu_font_changed_cb (GSettings *settings,`
`671`		`- gchar *key,`
`672`		`- gpointer user_data)`
	`670`	`+system_font_changed_cb (GSettings *settings,`
	`671`	`+ gchar *key,`
	`672`	`+ gpointer user_data)`
`673`	`673`	`{`
`674`	`674`	`PangoFontDescription *sys_font_desc = NULL;`
`675`	`675`	`sys_font_desc = get_system_font ();`
`676`	`676`	`if (sys_font_desc)`
`677`	`677`	`{`
`678`		`- pluma_override_font (".context-menu", NULL, sys_font_desc);`
	`678`	`+ pluma_override_font ("label", NULL, sys_font_desc);`
`679`	`679`	`pango_font_description_free (sys_font_desc);`
`680`	`680`	`}`
`681`	`681`	`}`
`@@ -714,9 +714,9 @@ pluma_override_font (const gchar *item,`
`714`	`714`
`715`	`715`	`prov_str = gtk_css_provider_to_string (provider);`
`716`	`716`
`717`		`- if (g_str_has_prefix (prov_str, "textview") && g_str_has_prefix (item, ".context-menu"))`
	`717`	`+ if (g_str_has_prefix (prov_str, "textview") && g_str_has_prefix (item, "label"))`
`718`	`718`	`{`
`719`		`- if (strstr (prov_str, ".context-menu"))`
	`719`	`+ if (strstr (prov_str, "label"))`
`720`	`720`	`{`
`721`	`721`	`g_strdelimit (prov_str, "}", '\0');`
`722`	`722`	`gchar *prov_new_str = g_strdup_printf ("%s}", prov_str);`
`@@ -737,7 +737,7 @@ pluma_override_font (const gchar *item,`
`737`	`737`	`settings = g_settings_new ("org.mate.interface");`
`738`	`738`	`g_signal_connect (settings,`
`739`	`739`	`"changed::" "font-name",`
`740`		`- G_CALLBACK (contextmenu_font_changed_cb), NULL);`
	`740`	`+ G_CALLBACK (system_font_changed_cb), NULL);`
`741`	`741`
`742`	`742`	`gtk_style_context_add_provider_for_screen (gtk_widget_get_screen (widget),`
`743`	`743`	`GTK_STYLE_PROVIDER (provider),`
`@@ -795,7 +795,7 @@ pluma_view_set_font (PlumaView *view,`
`795`	`795`
`796`	`796`	`sys_font_desc = get_system_font ();`
`797`	`797`	`if (sys_font_desc) {`
`798`		`- pluma_override_font (".context-menu", GTK_WIDGET (view), sys_font_desc);`
	`798`	`+ pluma_override_font ("label", GTK_WIDGET (view), sys_font_desc);`
`799`	`799`	`pango_font_description_free (sys_font_desc);`
`800`	`800`	`}`
`801`	`801`