AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-17 06:10:15 +00:00
Code Issues Projects Releases Wiki Activity

entry: add css letter-spacing

Browse Source
This commit is contained in:
Paolo Borelli 2015-07-05 10:48:40 +02:00
parent a19331f231
commit 9e26fa9a42
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk/gtkentry.c
View File

@ -47,6 +47,7 @@
#include "gtkmarshalers.h"
#include "gtkmenu.h"
#include "gtkmenuitem.h"
#include "gtkpango.h"
#include "gtkseparatormenuitem.h"
#include "gtkselection.h"
#include "gtksettings.h"
@ -6250,7 +6251,9 @@ gtk_entry_create_layout (GtkEntry *entry,
{
GtkEntryPrivate *priv = entry->priv;
GtkWidget *widget = GTK_WIDGET (entry);
GtkStyleContext *context;
PangoLayout *layout;
PangoAttrList *style_attrs;
PangoAttrList *tmp_attrs;
gboolean placeholder_layout;
@ -6261,11 +6264,18 @@ gtk_entry_create_layout (GtkEntry *entry,
gchar *display_text;
guint n_bytes;
context = gtk_widget_get_style_context (widget);
layout = gtk_widget_create_pango_layout (widget, NULL);
pango_layout_set_single_paragraph_mode (layout, TRUE);
tmp_attrs = priv->attrs ? pango_attr_list_ref (priv->attrs)
: pango_attr_list_new ();
style_attrs = _gtk_style_context_get_pango_attributes (context);
tmp_attrs = style_attrs ? style_attrs : pango_attr_list_new ();
if (priv->attrs)
{
_gtk_pango_attr_list_merge (tmp_attrs, priv->attrs);
}
placeholder_layout = show_placeholder_text (entry);
if (placeholder_layout)