callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Centralize lookup and caching of cursor GC's here.

Browse Source 
Sun Mar  3 14:26:33 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkstyle.[ch] (_gtk_get_insertion_cursor_gc):
        Centralize lookup and caching of cursor GC's here.

        * gtk/gtkentry.[ch] gtk/gtktextview.[ch] gtk/gtktextdisplay.c
        gtk/gtklabel.c: Move to using _gtk_get_insertion_cursor_gc().

        * gtk/gtkentry.c (gtk_entry_expose): Draw cursors
        under the text, not over the text.

        * gtk/gtkwidget.c (gtk_widget_class_init): add
        a secondary-cursor-color property.

        * gtk/gtkwidget.c (gtk_widget_class_init): Decrease
        the default aspect ratio to 1/25 (0.04).

        * tests/testgtkrc (bell_duration): Comment out
        cursor color setting.
This commit is contained in:
Owen Taylor
2002-03-03 19:59:29 +00:00
committed by Owen Taylor
parent 5d5cfcd435
commit c848fbbcfe
17 changed files with 323 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
gtk/gtktextview.c
View File

@ -3251,24 +3251,6 @@ changed_handler (GtkTextLayout *layout,
}
}
static void
gtk_text_view_realize_cursor_gc (GtkTextView *text_view)
{
GdkColor *cursor_color;
GdkColor red = { 0, 0xffff, 0x0000, 0x0000 };
if (text_view->cursor_gc)
gdk_gc_unref (text_view->cursor_gc);
gtk_widget_style_get (GTK_WIDGET (text_view), "cursor-color", &cursor_color, NULL);
if (!cursor_color)
cursor_color = &red;
text_view->cursor_gc = gdk_gc_new (text_view->text_window->bin_window);
gdk_gc_set_rgb_fg_color (text_view->cursor_gc, cursor_color);
}
static void
gtk_text_view_realize (GtkWidget *widget)
{
@ -3320,8 +3302,6 @@ gtk_text_view_realize (GtkWidget *widget)
text_window_realize (text_view->bottom_window,
widget->window);
gtk_text_view_realize_cursor_gc (text_view);
gtk_text_view_ensure_layout (text_view);
if (text_view->buffer)
@ -3350,12 +3330,6 @@ gtk_text_view_unrealize (GtkWidget *widget)
gtk_text_buffer_remove_selection_clipboard (text_view->buffer,
gtk_clipboard_get (GDK_SELECTION_PRIMARY));
if (text_view->cursor_gc)
{
gdk_gc_unref (text_view->cursor_gc);
text_view->cursor_gc = NULL;
}
gtk_text_view_remove_validate_idles (text_view);
if (text_view->popup_menu)
@ -3411,8 +3385,6 @@ gtk_text_view_style_set (GtkWidget *widget,
if (text_view->bottom_window)
gdk_window_set_background (text_view->bottom_window->bin_window,
&widget->style->bg[GTK_WIDGET_STATE (widget)]);
gtk_text_view_realize_cursor_gc (text_view);
}
if (text_view->layout && previous_style)
@ -4060,7 +4032,7 @@ gtk_text_view_paint (GtkWidget *widget,
gtk_text_layout_draw (text_view->layout,
widget,
text_view->text_window->bin_window,
text_view->cursor_gc,
NULL,
text_view->xoffset,
text_view->yoffset,
area->x, area->y,