When in split cursor mode, always add the cursor as both strong and weak

Sun Mar  3 11:12:16 2002  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtktextlayout.c (add_cursor): When in split cursor
	mode, always add the cursor as both strong and weak
	so that it is drawn with the correct non-split color.

diff --git a/ChangeLog b/ChangeLog
index d48162491a472d2e23f677b65a3b57c7debac89a..58f27760ae3f9dc709194948663ee72f1144361a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Mar  3 11:12:16 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextlayout.c (add_cursor): When in split cursor
+       mode, always add the cursor as both strong and weak
+       so that it is drawn with the correct non-split color.
+
 Sun Mar  3 11:05:13 2002  Owen Taylor  <otaylor@redhat.com>
 
        * modules/input/Makefile.am (moduledir): Fix

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index d48162491a472d2e23f677b65a3b57c7debac89a..58f27760ae3f9dc709194948663ee72f1144361a 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Sun Mar  3 11:12:16 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextlayout.c (add_cursor): When in split cursor
+       mode, always add the cursor as both strong and weak
+       so that it is drawn with the correct non-split color.
+
 Sun Mar  3 11:05:13 2002  Owen Taylor  <otaylor@redhat.com>
 
        * modules/input/Makefile.am (moduledir): Fix

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d48162491a472d2e23f677b65a3b57c7debac89a..58f27760ae3f9dc709194948663ee72f1144361a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sun Mar  3 11:12:16 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextlayout.c (add_cursor): When in split cursor
+       mode, always add the cursor as both strong and weak
+       so that it is drawn with the correct non-split color.
+
 Sun Mar  3 11:05:13 2002  Owen Taylor  <otaylor@redhat.com>
 
        * modules/input/Makefile.am (moduledir): Fix

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index d48162491a472d2e23f677b65a3b57c7debac89a..58f27760ae3f9dc709194948663ee72f1144361a 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Sun Mar  3 11:12:16 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextlayout.c (add_cursor): When in split cursor
+       mode, always add the cursor as both strong and weak
+       so that it is drawn with the correct non-split color.
+
 Sun Mar  3 11:05:13 2002  Owen Taylor  <otaylor@redhat.com>
 
        * modules/input/Makefile.am (moduledir): Fix

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d48162491a472d2e23f677b65a3b57c7debac89a..58f27760ae3f9dc709194948663ee72f1144361a 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Sun Mar  3 11:12:16 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextlayout.c (add_cursor): When in split cursor
+       mode, always add the cursor as both strong and weak
+       so that it is drawn with the correct non-split color.
+
 Sun Mar  3 11:05:13 2002  Owen Taylor  <otaylor@redhat.com>
 
        * modules/input/Makefile.am (moduledir): Fix

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d48162491a472d2e23f677b65a3b57c7debac89a..58f27760ae3f9dc709194948663ee72f1144361a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Sun Mar  3 11:12:16 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextlayout.c (add_cursor): When in split cursor
+       mode, always add the cursor as both strong and weak
+       so that it is drawn with the correct non-split color.
+
 Sun Mar  3 11:05:13 2002  Owen Taylor  <otaylor@redhat.com>
 
        * modules/input/Makefile.am (moduledir): Fix

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d48162491a472d2e23f677b65a3b57c7debac89a..58f27760ae3f9dc709194948663ee72f1144361a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sun Mar  3 11:12:16 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextlayout.c (add_cursor): When in split cursor
+       mode, always add the cursor as both strong and weak
+       so that it is drawn with the correct non-split color.
+
 Sun Mar  3 11:05:13 2002  Owen Taylor  <otaylor@redhat.com>
 
        * modules/input/Makefile.am (moduledir): Fix

diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c
index 6ebea4f774b907af66fa9e555e9bff20b49c629c..b92e85cc8f16abdd9cd88ccb7e09bdf7be8706fd 100644 (file)
--- a/gtk/gtktextlayout.c
+++ b/gtk/gtktextlayout.c
@@ -1458,7 +1458,7 @@ add_cursor (GtkTextLayout      *layout,
       cursor->y = PANGO_PIXELS (strong_pos.y);
       cursor->height = PANGO_PIXELS (strong_pos.height);
       cursor->is_strong = TRUE;
-      cursor->is_weak = FALSE;
+      cursor->is_weak = (layout->cursor_direction == GTK_TEXT_DIR_NONE) ? FALSE : TRUE;
       display->cursors = g_slist_prepend (display->cursors, cursor);
     }
   
@@ -1473,7 +1473,7 @@ add_cursor (GtkTextLayout      *layout,
          cursor->x = PANGO_PIXELS (weak_pos.x);
          cursor->y = PANGO_PIXELS (weak_pos.y);
          cursor->height = PANGO_PIXELS (weak_pos.height);
-         cursor->is_strong = FALSE;
+         cursor->is_strong = (layout->cursor_direction == GTK_TEXT_DIR_NONE) ? FALSE : TRUE;
          cursor->is_weak = TRUE;
          display->cursors = g_slist_prepend (display->cursors, cursor);
        }