AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-01 16:30:15 +00:00
Code Issues Projects Releases Wiki Activity

entry: Fix text clipping

Browse Source 
Clipping the text to the entire widget allocation is wrong if there are
icons involved.
This commit is contained in:
Timm Bäder 2018-01-10 11:02:10 +01:00
parent 6235b12ca4
commit 60d3378dd1
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gtk/gtkentry.c
View File

@ -3389,22 +3389,21 @@ gtk_entry_snapshot (GtkWidget *widget,
{ {
GtkEntry *entry = GTK_ENTRY (widget); GtkEntry *entry = GTK_ENTRY (widget);
GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry); GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry);
graphene_rect_t bounds;
int i; int i;
graphene_rect_init (&bounds,
0, 0,
gtk_widget_get_width (widget),
gtk_widget_get_height (widget));
gtk_snapshot_push_clip (snapshot, &bounds, "Entry Clip");
/* Draw progress */ /* Draw progress */
if (priv->progress_widget && gtk_widget_get_visible (priv->progress_widget)) if (priv->progress_widget && gtk_widget_get_visible (priv->progress_widget))
gtk_widget_snapshot_child (widget, priv->progress_widget, snapshot); gtk_widget_snapshot_child (widget, priv->progress_widget, snapshot);
/* Draw text and cursor */ gtk_snapshot_push_clip (snapshot,
&GRAPHENE_RECT_INIT (
priv->text_x,
0,
priv->text_width,
gtk_widget_get_height (widget)),
"Entry Clip");
/* Draw text and cursor */
if (priv->dnd_position != -1) if (priv->dnd_position != -1)
gtk_entry_draw_cursor (GTK_ENTRY (widget), snapshot, CURSOR_DND); gtk_entry_draw_cursor (GTK_ENTRY (widget), snapshot, CURSOR_DND);
@ -3416,6 +3415,8 @@ gtk_entry_snapshot (GtkWidget *widget,
priv->selection_bound == priv->current_pos && priv->cursor_visible) priv->selection_bound == priv->current_pos && priv->cursor_visible)
gtk_entry_draw_cursor (GTK_ENTRY (widget), snapshot, CURSOR_STANDARD); gtk_entry_draw_cursor (GTK_ENTRY (widget), snapshot, CURSOR_STANDARD);
gtk_snapshot_pop (snapshot);
/* Draw icons */ /* Draw icons */
for (i = 0; i < MAX_ICONS; i++) for (i = 0; i < MAX_ICONS; i++)
{ {
@ -3426,8 +3427,6 @@ gtk_entry_snapshot (GtkWidget *widget,
} }
gtk_entry_draw_undershoot (entry, snapshot); gtk_entry_draw_undershoot (entry, snapshot);
gtk_snapshot_pop (snapshot);
} }
static void static void