Use layout text (which may be affected by invisible char) to compute

Thu Feb  7 10:53:12 2002  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkentry.c (gtk_entry_draw_text): Use layout text
	(which may be affected by invisible char) to compute
	selection bounds, not entry text. (#70733, Alex Larsson)
This commit is contained in:
Owen Taylor 2002-02-07 15:57:32 +00:00 committed by Owen Taylor
parent 49ea86bccd
commit 31bd536b5c
8 changed files with 45 additions and 2 deletions

View File

@ -1,3 +1,9 @@
Thu Feb 7 10:53:12 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_draw_text): Use layout text
(which may be affected by invisible char) to compute
selection bounds, not entry text. (#70733, Alex Larsson)
2002-02-07 Padraig O'Briain <padraig.obriain@sun.com>
* gtk/gtkwidget.[ch]:

View File

@ -1,3 +1,9 @@
Thu Feb 7 10:53:12 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_draw_text): Use layout text
(which may be affected by invisible char) to compute
selection bounds, not entry text. (#70733, Alex Larsson)
2002-02-07 Padraig O'Briain <padraig.obriain@sun.com>
* gtk/gtkwidget.[ch]:

View File

@ -1,3 +1,9 @@
Thu Feb 7 10:53:12 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_draw_text): Use layout text
(which may be affected by invisible char) to compute
selection bounds, not entry text. (#70733, Alex Larsson)
2002-02-07 Padraig O'Briain <padraig.obriain@sun.com>
* gtk/gtkwidget.[ch]:

View File

@ -1,3 +1,9 @@
Thu Feb 7 10:53:12 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_draw_text): Use layout text
(which may be affected by invisible char) to compute
selection bounds, not entry text. (#70733, Alex Larsson)
2002-02-07 Padraig O'Briain <padraig.obriain@sun.com>
* gtk/gtkwidget.[ch]:

View File

@ -1,3 +1,9 @@
Thu Feb 7 10:53:12 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_draw_text): Use layout text
(which may be affected by invisible char) to compute
selection bounds, not entry text. (#70733, Alex Larsson)
2002-02-07 Padraig O'Briain <padraig.obriain@sun.com>
* gtk/gtkwidget.[ch]:

View File

@ -1,3 +1,9 @@
Thu Feb 7 10:53:12 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_draw_text): Use layout text
(which may be affected by invisible char) to compute
selection bounds, not entry text. (#70733, Alex Larsson)
2002-02-07 Padraig O'Briain <padraig.obriain@sun.com>
* gtk/gtkwidget.[ch]:

View File

@ -1,3 +1,9 @@
Thu Feb 7 10:53:12 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_draw_text): Use layout text
(which may be affected by invisible char) to compute
selection bounds, not entry text. (#70733, Alex Larsson)
2002-02-07 Padraig O'Briain <padraig.obriain@sun.com>
* gtk/gtkwidget.[ch]:

View File

@ -2677,8 +2677,9 @@ gtk_entry_draw_text (GtkEntry *entry)
gint *ranges;
gint n_ranges, i;
PangoRectangle logical_rect;
gint start_index = g_utf8_offset_to_pointer (entry->text, start_pos) - entry->text;
gint end_index = g_utf8_offset_to_pointer (entry->text, end_pos) - entry->text;
const gchar *text = pango_layout_get_text (layout);
gint start_index = g_utf8_offset_to_pointer (text, start_pos) - text;
gint end_index = g_utf8_offset_to_pointer (text, end_pos) - text;
GdkRegion *clip_region = gdk_region_new ();
GdkGC *text_gc;
GdkGC *selection_gc;