diff options
| author | Stefano Karapetsas <[email protected]> | 2014-01-02 11:05:15 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2014-01-02 11:05:15 -0800 |
| commit | 072fac32566430d72f9e8f5392288dbb8d2fc62c (patch) | |
| tree | 891e960008e88e8cf3cf6b67517b341a476ec788 /mate-screenshot/screenshot-utils.c | |
| parent | 2bc9b44ea369a6b9643b2d6a2d343fcc6aef0d9e (diff) | |
| parent | dc7123530e154dc4852c7f9900e693ecce5e2e2c (diff) | |
| download | mate-utils-072fac32566430d72f9e8f5392288dbb8d2fc62c.tar.bz2 mate-utils-072fac32566430d72f9e8f5392288dbb8d2fc62c.tar.xz | |
Merge pull request #53 from flexiondotorg/1.6
Cherry picks from `master` for `mate-utils` 1.6
Diffstat (limited to 'mate-screenshot/screenshot-utils.c')
| -rw-r--r-- | mate-screenshot/screenshot-utils.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mate-screenshot/screenshot-utils.c b/mate-screenshot/screenshot-utils.c index b41ae4b8..faed6762 100644 --- a/mate-screenshot/screenshot-utils.c +++ b/mate-screenshot/screenshot-utils.c @@ -670,7 +670,8 @@ GdkPixbuf * screenshot_get_pixbuf (GdkWindow *window, GdkRectangle *rectangle, gboolean include_pointer, - gboolean include_border) + gboolean include_border, + gboolean include_mask) { GdkWindow *root; GdkPixbuf *screenshot; @@ -738,7 +739,11 @@ screenshot_get_pixbuf (GdkWindow *window, x_orig, y_orig, 0, 0, width, height); - mask_monitors (screenshot, root); + /* + * Masking currently only works properly with full-screen shots + */ + if (include_mask) + mask_monitors (screenshot, root); #ifdef HAVE_X11_EXTENSIONS_SHAPE_H if (include_border) |