summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--ChangeLog.pre-2-107
-rw-r--r--ChangeLog.pre-2-47
-rw-r--r--ChangeLog.pre-2-67
-rw-r--r--ChangeLog.pre-2-87
-rw-r--r--gdk/gdkwindow.c4
6 files changed, 34 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index b13a29e0c1..9020a70b2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
+Wed Feb 18 14:27:08 2004 Soeren Sandmann <sandmann@daimi.au.dk>
+
+ * gdk/gdkwindow.c (gdk_window_get_composite_drawable): Reset clip
+ region back to NULL on cached GC (rest of #134728)
+
Wed Feb 18 13:28:57 2004 Soeren Sandmann <sandmann@daimi.au.dk>
- Fix bug reported by Nam SungHyun.
+ Fix bug reported by Nam SungHyun (#134728)
* gdk/gdkpixbuf-render.c (gdk_pixbuf_render_threshold_alpha):
Don't use a cached GC here since the function needs to modify the
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b13a29e0c1..9020a70b2a 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,6 +1,11 @@
+Wed Feb 18 14:27:08 2004 Soeren Sandmann <sandmann@daimi.au.dk>
+
+ * gdk/gdkwindow.c (gdk_window_get_composite_drawable): Reset clip
+ region back to NULL on cached GC (rest of #134728)
+
Wed Feb 18 13:28:57 2004 Soeren Sandmann <sandmann@daimi.au.dk>
- Fix bug reported by Nam SungHyun.
+ Fix bug reported by Nam SungHyun (#134728)
* gdk/gdkpixbuf-render.c (gdk_pixbuf_render_threshold_alpha):
Don't use a cached GC here since the function needs to modify the
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b13a29e0c1..9020a70b2a 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,6 +1,11 @@
+Wed Feb 18 14:27:08 2004 Soeren Sandmann <sandmann@daimi.au.dk>
+
+ * gdk/gdkwindow.c (gdk_window_get_composite_drawable): Reset clip
+ region back to NULL on cached GC (rest of #134728)
+
Wed Feb 18 13:28:57 2004 Soeren Sandmann <sandmann@daimi.au.dk>
- Fix bug reported by Nam SungHyun.
+ Fix bug reported by Nam SungHyun (#134728)
* gdk/gdkpixbuf-render.c (gdk_pixbuf_render_threshold_alpha):
Don't use a cached GC here since the function needs to modify the
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b13a29e0c1..9020a70b2a 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,6 +1,11 @@
+Wed Feb 18 14:27:08 2004 Soeren Sandmann <sandmann@daimi.au.dk>
+
+ * gdk/gdkwindow.c (gdk_window_get_composite_drawable): Reset clip
+ region back to NULL on cached GC (rest of #134728)
+
Wed Feb 18 13:28:57 2004 Soeren Sandmann <sandmann@daimi.au.dk>
- Fix bug reported by Nam SungHyun.
+ Fix bug reported by Nam SungHyun (#134728)
* gdk/gdkpixbuf-render.c (gdk_pixbuf_render_threshold_alpha):
Don't use a cached GC here since the function needs to modify the
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b13a29e0c1..9020a70b2a 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,6 +1,11 @@
+Wed Feb 18 14:27:08 2004 Soeren Sandmann <sandmann@daimi.au.dk>
+
+ * gdk/gdkwindow.c (gdk_window_get_composite_drawable): Reset clip
+ region back to NULL on cached GC (rest of #134728)
+
Wed Feb 18 13:28:57 2004 Soeren Sandmann <sandmann@daimi.au.dk>
- Fix bug reported by Nam SungHyun.
+ Fix bug reported by Nam SungHyun (#134728)
* gdk/gdkpixbuf-render.c (gdk_pixbuf_render_threshold_alpha):
Don't use a cached GC here since the function needs to modify the
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 817aba27a4..a1fc8294bd 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -1033,6 +1033,7 @@ gdk_window_end_paint (GdkWindow *window)
clip_box.x - x_offset, clip_box.y - y_offset,
clip_box.width, clip_box.height);
+ /* Reset clip region of the cached GdkGC */
gdk_gc_set_clip_region (tmp_gc, NULL);
g_object_unref (paint->pixmap);
@@ -1424,6 +1425,9 @@ gdk_window_get_composite_drawable (GdkDrawable *drawable,
0, 0, width, height);
}
+ /* Reset clip region of the cached GdkGC */
+ gdk_gc_set_clip_region (tmp_gc, NULL);
+
/* Set these to location of tmp_pixmap within the window */
*composite_x_offset = x;
*composite_y_offset = y;