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)

8 files changed, 45 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index ebc5f529f6..0c35dfc636 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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]:
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index ebc5f529f6..0c35dfc636 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -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]:
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ebc5f529f6..0c35dfc636 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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]:
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index ebc5f529f6..0c35dfc636 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -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]:
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index ebc5f529f6..0c35dfc636 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -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]:
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ebc5f529f6..0c35dfc636 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -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]:
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ebc5f529f6..0c35dfc636 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -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]:
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index d0ff6da211..d7fef7edf0 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -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;