diff options
| author | Sam Spilsbury <sam.spilsbury@canonical.com> | 2011-02-01 23:01:04 +0800 |
|---|---|---|
| committer | Sam Spilsbury <sam.spilsbury@canonical.com> | 2011-02-01 23:01:04 +0800 |
| commit | bd14afde58b743a1a9ba94b98dd1e107c841ca06 (patch) | |
| tree | ec556f22663bc87e6b99d47de98e153e398cfd3d /gtk/window-decorator | |
| parent | ff085dc57497c0c0d5a87b0864cf09d5b7e5ff59 (diff) | |
| parent | 4ae95852e53075caed1558620127f0c1405fe474 (diff) | |
| download | compiz-with-glib-mainloop-bd14afde58b743a1a9ba94b98dd1e107c841ca06.tar.gz compiz-with-glib-mainloop-bd14afde58b743a1a9ba94b98dd1e107c841ca06.tar.bz2 | |
Merge branch 'master' of ../../../core
Conflicts:
include/core/core.h
src/window.cpp
Diffstat (limited to 'gtk/window-decorator')
| -rw-r--r-- | gtk/window-decorator/decorator.c | 3 | ||||
| -rw-r--r-- | gtk/window-decorator/decorprops.c | 3 | ||||
| -rw-r--r-- | gtk/window-decorator/metacity.c | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/gtk/window-decorator/decorator.c b/gtk/window-decorator/decorator.c index 703abee..17bb8f6 100644 --- a/gtk/window-decorator/decorator.c +++ b/gtk/window-decorator/decorator.c @@ -960,6 +960,7 @@ update_default_decorations (GdkScreen *screen) decor_quads_to_property (data, no_border_shadow->pixmap, &_shadow_extents, &_shadow_extents, + &_shadow_extents, &_shadow_extents, 0, 0, quads, nQuad); XChangeProperty (xdisplay, xroot, @@ -1032,6 +1033,7 @@ update_default_decorations (GdkScreen *screen) XRenderFreePicture (xdisplay, d.picture); decor_quads_to_property (data, GDK_PIXMAP_XID (d.pixmap), + &extents, &extents, &extents, &extents, 0, 0, quads, nQuad); XChangeProperty (xdisplay, xroot, @@ -1059,6 +1061,7 @@ update_default_decorations (GdkScreen *screen) XRenderFreePicture (xdisplay, d.picture); decor_quads_to_property (data, GDK_PIXMAP_XID (d.pixmap), + &extents, &extents, &extents, &extents, 0, 0, quads, nQuad); XChangeProperty (xdisplay, xroot, diff --git a/gtk/window-decorator/decorprops.c b/gtk/window-decorator/decorprops.c index 68b6ed5..b6b3820 100644 --- a/gtk/window-decorator/decorprops.c +++ b/gtk/window-decorator/decorprops.c @@ -36,7 +36,7 @@ decor_update_window_property (decor_t *d) else { decor_quads_to_property (data, GDK_PIXMAP_XID (d->pixmap), - &extents, &extents, + &extents, &extents, &extents, &extents, ICON_SPACE + d->button_width, 0, quads, nQuad); @@ -111,6 +111,7 @@ decor_update_switcher_property (decor_t *d) decor_quads_to_property (data, GDK_PIXMAP_XID (d->pixmap), &_switcher_extents, &_switcher_extents, + &_switcher_extents, &_switcher_extents, 0, 0, quads, nQuad); style = gtk_widget_get_style (style_window_rgba); diff --git a/gtk/window-decorator/metacity.c b/gtk/window-decorator/metacity.c index bbef354..204b608 100644 --- a/gtk/window-decorator/metacity.c +++ b/gtk/window-decorator/metacity.c @@ -69,7 +69,8 @@ decor_update_meta_window_property (decor_t *d, decor_gen_window_property (data, &extents, &max_extents, 20, 20); else decor_quads_to_property (data, GDK_PIXMAP_XID (d->pixmap), - &extents, &max_extents, + &extents, &extents, + &max_extents, &max_extents, ICON_SPACE + d->button_width, 0, quads, nQuad); |