|
0 |
From d7ac9cd71c43689672a9796e518ef3b970197bf2 Mon Sep 17 00:00:00 2001
|
|
1 |
From: Matthias Clasen <mclasen@redhat.com>
|
|
2 |
Date: Mon, 20 Jun 2011 08:10:36 -0400
|
|
3 |
Subject: [PATCH] Revert "gdk: Make background changes queue a repaint"
|
|
4 |
|
|
5 |
This reverts commit 254b9a4c540e3dff1dcd17db2ceea6a9fa5df973.
|
|
6 |
---
|
|
7 |
gdk/gdkwindow.c | 20 ++++++--------------
|
|
8 |
1 files changed, 6 insertions(+), 14 deletions(-)
|
|
9 |
|
|
10 |
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
|
|
11 |
index 10d83ab..f058570 100644
|
|
12 |
--- a/gdk/gdkwindow.c
|
|
13 |
+++ b/gdk/gdkwindow.c
|
|
14 |
@@ -8004,15 +8004,11 @@ gdk_window_set_background (GdkWindow *window,
|
|
15 |
}
|
|
16 |
|
|
17 |
if (!GDK_WINDOW_DESTROYED (window) &&
|
|
18 |
+ gdk_window_has_impl (private) &&
|
|
19 |
!private->input_only)
|
|
20 |
{
|
|
21 |
- if (gdk_window_has_impl (private))
|
|
22 |
- {
|
|
23 |
- impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl);
|
|
24 |
- impl_iface->set_background (window, &private->bg_color);
|
|
25 |
- }
|
|
26 |
- else
|
|
27 |
- gdk_window_invalidate_rect_full (window, NULL, TRUE, CLEAR_BG_ALL);
|
|
28 |
+ impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl);
|
|
29 |
+ impl_iface->set_background (window, &private->bg_color);
|
|
30 |
}
|
|
31 |
}
|
|
32 |
|
|
33 |
@@ -8081,15 +8077,11 @@ gdk_window_set_back_pixmap (GdkWindow *window,
|
|
34 |
private->bg_pixmap = GDK_NO_BG;
|
|
35 |
|
|
36 |
if (!GDK_WINDOW_DESTROYED (window) &&
|
|
37 |
+ gdk_window_has_impl (private) &&
|
|
38 |
!private->input_only)
|
|
39 |
{
|
|
40 |
- if (gdk_window_has_impl (private))
|
|
41 |
- {
|
|
42 |
- impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl);
|
|
43 |
- impl_iface->set_back_pixmap (window, private->bg_pixmap);
|
|
44 |
- }
|
|
45 |
- else
|
|
46 |
- gdk_window_invalidate_rect_full (window, NULL, TRUE, CLEAR_BG_ALL);
|
|
47 |
+ impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl);
|
|
48 |
+ impl_iface->set_back_pixmap (window, private->bg_pixmap);
|
|
49 |
}
|
|
50 |
}
|
|
51 |
|
|
52 |
--
|
|
53 |
1.7.5.4
|
|
54 |
|