isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-21 23:50:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

screen-cast-window-stream: Don't set the position property

Browse Source 
It was not meant to be set for window streams, and was set to (0, 0)
anyway. This removes the corresponding MetaScreenCastWindow API, as it's
not needed anymore.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/413
This commit is contained in:
Jonas Ådahl 2019-01-21 19:20:04 +01:00
parent 870f38542d
commit 11bd847896
4 changed files with 0 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/backends/meta-screen-cast-window-stream.c
View File

@ -116,16 +116,6 @@ meta_screen_cast_window_stream_set_parameters (MetaScreenCastStream *stream,
{ {
MetaScreenCastWindowStream *window_stream = MetaScreenCastWindowStream *window_stream =
META_SCREEN_CAST_WINDOW_STREAM (stream); META_SCREEN_CAST_WINDOW_STREAM (stream);
MetaScreenCastWindow *screen_cast_window =
META_SCREEN_CAST_WINDOW (meta_window_actor_from_window (window_stream->window));
MetaRectangle bounds;
meta_screen_cast_window_get_buffer_bounds (screen_cast_window, &bounds);
g_variant_builder_add (parameters_builder, "{sv}",
"position",
g_variant_new ("(ii)",
bounds.x, bounds.y));
g_variant_builder_add (parameters_builder, "{sv}", g_variant_builder_add (parameters_builder, "{sv}",
"size", "size",

8
src/backends/meta-screen-cast-window.c
View File

@ -29,14 +29,6 @@ meta_screen_cast_window_default_init (MetaScreenCastWindowInterface *iface)
{ {
} }
void
meta_screen_cast_window_get_buffer_bounds (MetaScreenCastWindow *screen_cast_window,
MetaRectangle *bounds)
{
META_SCREEN_CAST_WINDOW_GET_IFACE (screen_cast_window)->get_buffer_bounds (screen_cast_window,
bounds);
}
void void
meta_screen_cast_window_get_frame_bounds (MetaScreenCastWindow *screen_cast_window, meta_screen_cast_window_get_frame_bounds (MetaScreenCastWindow *screen_cast_window,
MetaRectangle *bounds) MetaRectangle *bounds)

6
src/backends/meta-screen-cast-window.h
View File

@ -36,9 +36,6 @@ struct _MetaScreenCastWindowInterface
{ {
GTypeInterface parent_iface; GTypeInterface parent_iface;
void (*get_buffer_bounds) (MetaScreenCastWindow *screen_cast_window,
MetaRectangle *bounds);
void (*get_frame_bounds) (MetaScreenCastWindow *screen_cast_window, void (*get_frame_bounds) (MetaScreenCastWindow *screen_cast_window,
MetaRectangle *bounds); MetaRectangle *bounds);
@ -53,9 +50,6 @@ struct _MetaScreenCastWindowInterface
uint8_t *data); uint8_t *data);
}; };
void meta_screen_cast_window_get_buffer_bounds (MetaScreenCastWindow *screen_cast_window,
MetaRectangle *bounds);
void meta_screen_cast_window_get_frame_bounds (MetaScreenCastWindow *screen_cast_window, void meta_screen_cast_window_get_frame_bounds (MetaScreenCastWindow *screen_cast_window,
MetaRectangle *bounds); MetaRectangle *bounds);

15
src/compositor/meta-window-actor.c
View File

@ -1850,20 +1850,6 @@ meta_window_actor_from_window (MetaWindow *window)
return META_WINDOW_ACTOR (meta_window_get_compositor_private (window)); return META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
} }
static void
meta_window_actor_get_buffer_bounds (MetaScreenCastWindow *screen_cast_window,
MetaRectangle *bounds)
{
MetaWindowActor *window_actor = META_WINDOW_ACTOR (screen_cast_window);
ClutterActor *clutter_actor;
clutter_actor = CLUTTER_ACTOR (meta_window_actor_get_texture (window_actor));
bounds->x = 0;
bounds->y = 0;
bounds->width = (int) clutter_actor_get_width (clutter_actor);
bounds->height = (int) clutter_actor_get_height (clutter_actor);
}
static void static void
meta_window_actor_get_frame_bounds (MetaScreenCastWindow *screen_cast_window, meta_window_actor_get_frame_bounds (MetaScreenCastWindow *screen_cast_window,
MetaRectangle *bounds) MetaRectangle *bounds)
@ -1978,7 +1964,6 @@ meta_window_actor_capture_into (MetaScreenCastWindow *screen_cast_window,
static void static void
screen_cast_window_iface_init (MetaScreenCastWindowInterface *iface) screen_cast_window_iface_init (MetaScreenCastWindowInterface *iface)
{ {
iface->get_buffer_bounds = meta_window_actor_get_buffer_bounds;
iface->get_frame_bounds = meta_window_actor_get_frame_bounds; iface->get_frame_bounds = meta_window_actor_get_frame_bounds;
iface->transform_relative_position = meta_window_actor_transform_relative_position; iface->transform_relative_position = meta_window_actor_transform_relative_position;
iface->capture_into = meta_window_actor_capture_into; iface->capture_into = meta_window_actor_capture_into;