summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Kareh <[email protected]>2021-01-04 08:15:56 -0500
committerVictor Kareh <[email protected]>2021-01-04 08:15:56 -0500
commitef743d61cae7d0202dbc97c949c5209e38b71e3f (patch)
tree479f58d760e843c64a4386fd72c8ce76ebd88d79
parent755d6e73771bddfd192e47ef593460e8540591ca (diff)
downloadmate-panel-fix-stale-thumbnail.tar.bz2
mate-panel-fix-stale-thumbnail.tar.xz
Revert "window-list: remove intermediate steps to get scaled thumbnail"fix-stale-thumbnail
This reverts commit 08146a80fc1727cde7a6d02d8436f2c86c159b8c.
-rw-r--r--applets/wncklet/window-list.c38
1 files changed, 32 insertions, 6 deletions
diff --git a/applets/wncklet/window-list.c b/applets/wncklet/window-list.c
index 4851a823..140f1a9d 100644
--- a/applets/wncklet/window-list.c
+++ b/applets/wncklet/window-list.c
@@ -252,6 +252,7 @@ preview_window_thumbnail (WnckWindow *wnck_window,
int *thumbnail_scale)
{
GdkWindow *window;
+ cairo_surface_t *screenshot;
cairo_surface_t *thumbnail;
cairo_t *cr;
double ratio;
@@ -266,6 +267,29 @@ preview_window_thumbnail (WnckWindow *wnck_window,
width = gdk_window_get_width (window) * scale;
height = gdk_window_get_height (window) * scale;
+ /* Get reference to GdkWindow surface */
+ cairo_t *win_cr = gdk_cairo_create (window);
+ cairo_surface_t *win_surface = cairo_get_target (win_cr);
+ /* Flush to ensure all writing to the image was done */
+ cairo_surface_flush (win_surface);
+ cairo_destroy (win_cr);
+
+ /* Create screenshot surface with the GdkWindow as its source */
+ screenshot = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width, height);
+ cairo_surface_set_device_scale (screenshot, scale, scale);
+ cr = cairo_create (screenshot);
+ cairo_set_source_surface (cr, win_surface, 0, 0);
+ cairo_paint (cr);
+
+ /* Mark the image dirty so Cairo clears its caches */
+ cairo_surface_mark_dirty (win_surface);
+
+ cairo_destroy (cr);
+ g_object_unref (window);
+
+ if (screenshot == NULL)
+ return NULL;
+
/* Scale to configured size while maintaining aspect ratio */
if (width > height)
{
@@ -282,16 +306,18 @@ preview_window_thumbnail (WnckWindow *wnck_window,
*thumbnail_width = (int) ((double) width * ratio);
}
- thumbnail = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
- *thumbnail_width,
- *thumbnail_height);
- cairo_surface_set_device_scale (thumbnail, scale, scale);
+ thumbnail = cairo_surface_create_similar (screenshot,
+ cairo_surface_get_content (screenshot),
+ *thumbnail_width,
+ *thumbnail_height);
+
cr = cairo_create (thumbnail);
cairo_scale (cr, ratio, ratio);
- gdk_cairo_set_source_window (cr, window, 0, 0);
+ cairo_set_source_surface (cr, screenshot, 0, 0);
cairo_paint (cr);
+
cairo_destroy (cr);
- g_object_unref (window);
+ cairo_surface_destroy (screenshot);
return thumbnail;
}