applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use single GDK includes

Browse source 
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=615292
This commit is contained in:
Javier Jardón 2010-06-30 16:07:30 +02:00 • committed by Thomas Wood
parent 8dc34e8695
commit a5b092326d
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
panels/display/scrollarea.c
View file

@ -16,8 +16,10 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#include <gdk/gdkprivate.h> /* For GDK_PARENT_RELATIVE_BG */
#include "scrollarea.h" #include "scrollarea.h"
#include <gdk/gdk.h>
#include "foo-marshal.h" #include "foo-marshal.h"
G_DEFINE_TYPE (FooScrollArea, foo_scroll_area, GTK_TYPE_CONTAINER); G_DEFINE_TYPE (FooScrollArea, foo_scroll_area, GTK_TYPE_CONTAINER);
@ -504,13 +506,14 @@ setup_background_cr (GdkWindow *window,
GdkWindow *parent; GdkWindow *parent;
gint x, y; gint x, y;
GdkColor bg_color; GdkColor bg_color;
gboolean parent_relative;
gdk_window_get_back_pixmap (window, &pixmap, NULL); gdk_window_get_back_pixmap (window, &pixmap, &parent_relative);
parent = gdk_window_get_effective_parent (window); parent = gdk_window_get_effective_parent (window);
gdk_window_get_geometry (window, &x, &y, NULL, NULL, NULL); gdk_window_get_geometry (window, &x, &y, NULL, NULL, NULL);
gdk_window_get_background (window, &bg_color); gdk_window_get_background (window, &bg_color);
if (pixmap == GDK_PARENT_RELATIVE_BG && parent) if (parent_relative && parent)
{ {
x_offset += x; x_offset += x;
y_offset += y; y_offset += y;
@ -518,7 +521,7 @@ setup_background_cr (GdkWindow *window,
setup_background_cr (parent, cr, x_offset, y_offset); setup_background_cr (parent, cr, x_offset, y_offset);
} }
else if (pixmap && else if (pixmap &&
pixmap != GDK_PARENT_RELATIVE_BG && !parent_relative &&
pixmap != GDK_NO_BG) pixmap != GDK_NO_BG)
{ {
gdk_cairo_set_source_pixmap (cr, pixmap, -x_offset, -y_offset); gdk_cairo_set_source_pixmap (cr, pixmap, -x_offset, -y_offset);