Clip when drawing the cursor. This prevents bits of a selectable label

2004-11-09  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtklabel.c (draw_insertion_cursor, gtk_label_expose):
	Clip when drawing the cursor. This prevents bits of a
	selectable label leaking out from underneath the resize
	grip in a statusbar.  (#73359)
This commit is contained in:
Matthias Clasen
2004-11-09 14:28:34 +00:00
committed by Matthias Clasen
parent 677f5951bb
commit 9ca871be3f
5 changed files with 24 additions and 3 deletions

View File

@ -1,5 +1,10 @@
2004-11-09 Matthias Clasen <mclasen@redhat.com> 2004-11-09 Matthias Clasen <mclasen@redhat.com>
* gtk/gtklabel.c (draw_insertion_cursor, gtk_label_expose):
Clip when drawing the cursor. This prevents bits of a
selectable label leaking out from underneath the resize
grip in a statusbar. (#73359)
* gtk/gtkstatusbar.c: Apply a patch by Owen Taylor to * gtk/gtkstatusbar.c: Apply a patch by Owen Taylor to
get reasonable allocations for the statusbar and its get reasonable allocations for the statusbar and its
children. (#73359) children. (#73359)

View File

@ -1,5 +1,10 @@
2004-11-09 Matthias Clasen <mclasen@redhat.com> 2004-11-09 Matthias Clasen <mclasen@redhat.com>
* gtk/gtklabel.c (draw_insertion_cursor, gtk_label_expose):
Clip when drawing the cursor. This prevents bits of a
selectable label leaking out from underneath the resize
grip in a statusbar. (#73359)
* gtk/gtkstatusbar.c: Apply a patch by Owen Taylor to * gtk/gtkstatusbar.c: Apply a patch by Owen Taylor to
get reasonable allocations for the statusbar and its get reasonable allocations for the statusbar and its
children. (#73359) children. (#73359)

View File

@ -1,5 +1,10 @@
2004-11-09 Matthias Clasen <mclasen@redhat.com> 2004-11-09 Matthias Clasen <mclasen@redhat.com>
* gtk/gtklabel.c (draw_insertion_cursor, gtk_label_expose):
Clip when drawing the cursor. This prevents bits of a
selectable label leaking out from underneath the resize
grip in a statusbar. (#73359)
* gtk/gtkstatusbar.c: Apply a patch by Owen Taylor to * gtk/gtkstatusbar.c: Apply a patch by Owen Taylor to
get reasonable allocations for the statusbar and its get reasonable allocations for the statusbar and its
children. (#73359) children. (#73359)

View File

@ -1,5 +1,10 @@
2004-11-09 Matthias Clasen <mclasen@redhat.com> 2004-11-09 Matthias Clasen <mclasen@redhat.com>
* gtk/gtklabel.c (draw_insertion_cursor, gtk_label_expose):
Clip when drawing the cursor. This prevents bits of a
selectable label leaking out from underneath the resize
grip in a statusbar. (#73359)
* gtk/gtkstatusbar.c: Apply a patch by Owen Taylor to * gtk/gtkstatusbar.c: Apply a patch by Owen Taylor to
get reasonable allocations for the statusbar and its get reasonable allocations for the statusbar and its
children. (#73359) children. (#73359)

View File

@ -1987,7 +1987,7 @@ draw_insertion_cursor (GtkLabel *label,
else else
text_dir = GTK_TEXT_DIR_RTL; text_dir = GTK_TEXT_DIR_RTL;
gtk_draw_insertion_cursor (widget, widget->window, NULL, gtk_draw_insertion_cursor (widget, widget->window, &(widget->allocation),
cursor_location, cursor_location,
is_primary, text_dir, draw_arrow); is_primary, text_dir, draw_arrow);
} }
@ -2147,8 +2147,9 @@ gtk_label_expose (GtkWidget *widget,
x, y, x, y,
range, range,
1); 1);
gdk_region_intersect (clip, event->region);
/* FIXME should use gtk_paint, but it can't use a clip
/* FIXME should use gtk_paint, but it can't use a clip
* region * region
*/ */