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

Use the split-cursor setting for textview cursors

Browse Source 
Explicitely check the split-cursor setting when drawing the textview
insertion cursor instead of relying on the cursor_direction set in the
textlayout. This makes the cursor drawin code more uniform with other
widgets in preparation to refactoring the cursor drawing code in a
shared function.

https://bugzilla.gnome.org/show_bug.cgi?id=640317
This commit is contained in:
Paolo Borelli 2011-11-27 15:12:36 +01:00
parent 0bff1af7a2
commit 3c6842222a
1 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
gtk/gtktextdisplay.c
View File

@ -912,39 +912,56 @@ gtk_text_layout_draw (GtkTextLayout *layout,
{ {
int index; int index;
PangoRectangle strong_pos, weak_pos; PangoRectangle strong_pos, weak_pos;
PangoRectangle *cursor1, *cursor2;
gboolean split_cursor;
GtkTextDirection dir1, dir2;
GdkRectangle cursor_location; GdkRectangle cursor_location;
index = g_array_index(line_display->cursors, int, i); index = g_array_index(line_display->cursors, int, i);
pango_layout_get_cursor_pos (line_display->layout, index, &strong_pos, &weak_pos); pango_layout_get_cursor_pos (line_display->layout, index, &strong_pos, &weak_pos);
cursor_location.x = line_display->x_offset + PANGO_PIXELS (strong_pos.x); dir1 = line_display->direction;
cursor_location.y = line_display->top_margin + PANGO_PIXELS (strong_pos.y); dir2 = GTK_TEXT_DIR_NONE;
cursor_location.width = 0;
cursor_location.height = PANGO_PIXELS (strong_pos.height);
if (layout->cursor_direction == GTK_TEXT_DIR_NONE || g_object_get (gtk_widget_get_settings (widget),
line_display->direction == layout->cursor_direction) "gtk-split-cursor", &split_cursor,
NULL);
if (split_cursor)
{ {
gtk_draw_insertion_cursor (widget, cr, cursor1 = &strong_pos;
&cursor_location, TRUE, line_display->direction, if (strong_pos.x != weak_pos.x || strong_pos.y != weak_pos.y)
layout->cursor_direction != GTK_TEXT_DIR_NONE); {
dir2 = (line_display->direction == GTK_TEXT_DIR_LTR) ? GTK_TEXT_DIR_RTL : GTK_TEXT_DIR_LTR;
cursor2 = &weak_pos;
}
}
else
{
if (layout->keyboard_direction == line_display->direction)
cursor1 = &strong_pos;
else
cursor1 = &weak_pos;
} }
if ((strong_pos.x != weak_pos.x || strong_pos.y != weak_pos.y) && cursor_location.x = line_display->x_offset + PANGO_PIXELS (cursor1->x);
(layout->cursor_direction == GTK_TEXT_DIR_NONE || cursor_location.y = line_display->top_margin + PANGO_PIXELS (cursor1->y);
line_display->direction != layout->cursor_direction)) cursor_location.width = 0;
cursor_location.height = PANGO_PIXELS (cursor1->height);
gtk_draw_insertion_cursor (widget, cr,
&cursor_location, TRUE, dir1,
dir2 != GTK_TEXT_DIR_NONE);
if (dir2 != GTK_TEXT_DIR_NONE)
{ {
GtkTextDirection dir; cursor_location.x = line_display->x_offset + PANGO_PIXELS (cursor2->x);
cursor_location.y = line_display->top_margin + PANGO_PIXELS (cursor2->y);
dir = (line_display->direction == GTK_TEXT_DIR_RTL) ? GTK_TEXT_DIR_LTR : GTK_TEXT_DIR_RTL;
cursor_location.x = line_display->x_offset + PANGO_PIXELS (weak_pos.x);
cursor_location.y = line_display->top_margin + PANGO_PIXELS (weak_pos.y);
cursor_location.width = 0; cursor_location.width = 0;
cursor_location.height = PANGO_PIXELS (weak_pos.height); cursor_location.height = PANGO_PIXELS (cursor2->height);
gtk_draw_insertion_cursor (widget, cr, gtk_draw_insertion_cursor (widget, cr,
&cursor_location, FALSE, dir, &cursor_location, FALSE, dir2,
TRUE); TRUE);
} }
} }