summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2004-11-09 14:28:34 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2004-11-09 14:28:34 +0000
commit9ca871be3f3812de05bcc3eefdcb12d66f294bd9 (patch)
treeafe43f7237b49688aaabbe48035df2a55eed50d5
parent677f5951bbf353b74a24bf22982b86d26ddbc684 (diff)
downloadgdk-pixbuf-9ca871be3f3812de05bcc3eefdcb12d66f294bd9.tar.gz
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)
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-2-105
-rw-r--r--ChangeLog.pre-2-65
-rw-r--r--ChangeLog.pre-2-85
-rw-r--r--gtk/gtklabel.c7
5 files changed, 24 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c6d6a8c0d..59907ad3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
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
get reasonable allocations for the statusbar and its
children. (#73359)
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c6d6a8c0d..59907ad3a 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,10 @@
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
get reasonable allocations for the statusbar and its
children. (#73359)
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c6d6a8c0d..59907ad3a 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,10 @@
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
get reasonable allocations for the statusbar and its
children. (#73359)
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c6d6a8c0d..59907ad3a 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,10 @@
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
get reasonable allocations for the statusbar and its
children. (#73359)
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index b02b3166f..5dd6e751d 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -1987,7 +1987,7 @@ draw_insertion_cursor (GtkLabel *label,
else
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,
is_primary, text_dir, draw_arrow);
}
@@ -2147,8 +2147,9 @@ gtk_label_expose (GtkWidget *widget,
x, y,
range,
1);
-
- /* FIXME should use gtk_paint, but it can't use a clip
+ gdk_region_intersect (clip, event->region);
+
+ /* FIXME should use gtk_paint, but it can't use a clip
* region
*/