isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shell: Get cairo surface via window actor

Browse Source 
Instead of going via the MetaShapedTexture to get the cairo surface, get
it from the window actor. The window actor can then handle this in a way
that makes it include potential subsurfaces.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/692
This commit is contained in:
Jonas Ådahl 2019-08-26 16:37:09 +03:00
parent 346d37ecbb
commit b73aace476
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/shell-screenshot.c
View File

@ -5,7 +5,6 @@
#include <meta/display.h> #include <meta/display.h>
#include <meta/util.h> #include <meta/util.h>
#include <meta/meta-plugin.h> #include <meta/meta-plugin.h>
#include <meta/meta-shaped-texture.h>
#include <meta/meta-cursor-tracker.h> #include <meta/meta-cursor-tracker.h>
#include <st/st.h> #include <st/st.h>
@ -457,7 +456,6 @@ grab_window_screenshot (ClutterActor *stage,
MetaWindow *window = meta_display_get_focus_window (display); MetaWindow *window = meta_display_get_focus_window (display);
ClutterActor *window_actor; ClutterActor *window_actor;
gfloat actor_x, actor_y; gfloat actor_x, actor_y;
MetaShapedTexture *stex;
MetaRectangle rect; MetaRectangle rect;
cairo_rectangle_int_t clip; cairo_rectangle_int_t clip;
@ -477,8 +475,8 @@ grab_window_screenshot (ClutterActor *stage,
clip.width = priv->screenshot_area.width = rect.width; clip.width = priv->screenshot_area.width = rect.width;
clip.height = priv->screenshot_area.height = rect.height; clip.height = priv->screenshot_area.height = rect.height;
stex = META_SHAPED_TEXTURE (meta_window_actor_get_texture (META_WINDOW_ACTOR (window_actor))); priv->image = meta_window_actor_get_image (META_WINDOW_ACTOR (window_actor),
priv->image = meta_shaped_texture_get_image (stex, &clip); &clip);
priv->datetime = g_date_time_new_now_local (); priv->datetime = g_date_time_new_now_local ();
if (priv->include_cursor) if (priv->include_cursor)

5
src/shell-util.c
View File

@ -20,7 +20,6 @@
#include <glib/gi18n-lib.h> #include <glib/gi18n-lib.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>
#include <meta/meta-shaped-texture.h>
#include <locale.h> #include <locale.h>
#ifdef HAVE__NL_TIME_FIRST_WEEKDAY #ifdef HAVE__NL_TIME_FIRST_WEEKDAY
@ -430,14 +429,12 @@ ClutterContent *
shell_util_get_content_for_window_actor (MetaWindowActor *window_actor, shell_util_get_content_for_window_actor (MetaWindowActor *window_actor,
MetaRectangle *window_rect) MetaRectangle *window_rect)
{ {
MetaShapedTexture *texture;
ClutterContent *content; ClutterContent *content;
cairo_surface_t *surface; cairo_surface_t *surface;
cairo_rectangle_int_t clip; cairo_rectangle_int_t clip;
gfloat actor_x, actor_y; gfloat actor_x, actor_y;
gfloat resource_scale; gfloat resource_scale;
texture = meta_window_actor_get_texture (window_actor);
clutter_actor_get_position (CLUTTER_ACTOR (window_actor), &actor_x, &actor_y); clutter_actor_get_position (CLUTTER_ACTOR (window_actor), &actor_x, &actor_y);
if (!clutter_actor_get_resource_scale (CLUTTER_ACTOR (window_actor), if (!clutter_actor_get_resource_scale (CLUTTER_ACTOR (window_actor),
@ -453,7 +450,7 @@ shell_util_get_content_for_window_actor (MetaWindowActor *window_actor,
clip.width = ceilf (window_rect->width * resource_scale); clip.width = ceilf (window_rect->width * resource_scale);
clip.height = ceilf (window_rect->height * resource_scale); clip.height = ceilf (window_rect->height * resource_scale);
surface = meta_shaped_texture_get_image (texture, &clip); surface = meta_window_actor_get_image (window_actor, &clip);
content = clutter_canvas_new (); content = clutter_canvas_new ();
clutter_canvas_set_size (CLUTTER_CANVAS (content), clutter_canvas_set_size (CLUTTER_CANVAS (content),