isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 09:30:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

wayland/dnd-surface: Use new API to set geometry scale of feedback actor

Browse Source 
The removed parts are now all handled in MetaFeedbackActor.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1683>
This commit is contained in:
Robert Mader 2021-01-22 15:29:08 +01:00
parent dfa659b5b5
commit 04eeeb78d1
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/wayland/meta-wayland-dnd-surface.c
View File

@ -30,7 +30,6 @@ struct _MetaWaylandSurfaceRoleDND
MetaWaylandActorSurface parent; MetaWaylandActorSurface parent;
int32_t pending_offset_x; int32_t pending_offset_x;
int32_t pending_offset_y; int32_t pending_offset_y;
int geometry_scale;
}; };
G_DEFINE_TYPE (MetaWaylandSurfaceRoleDND, G_DEFINE_TYPE (MetaWaylandSurfaceRoleDND,
@ -122,27 +121,19 @@ dnd_subsurface_sync_actor_state (MetaWaylandActorSurface *actor_surface)
geometry_scale = geometry_scale =
meta_wayland_actor_surface_get_geometry_scale (actor_surface); meta_wayland_actor_surface_get_geometry_scale (actor_surface);
meta_feedback_actor_set_geometry_scale (feedback_actor, geometry_scale);
meta_feedback_actor_get_anchor (feedback_actor, &anchor_x, &anchor_y); meta_feedback_actor_get_anchor (feedback_actor, &anchor_x, &anchor_y);
anchor_x -= surface_role_dnd->pending_offset_x * geometry_scale; anchor_x -= surface_role_dnd->pending_offset_x;
anchor_y -= surface_role_dnd->pending_offset_y * geometry_scale; anchor_y -= surface_role_dnd->pending_offset_y;
meta_feedback_actor_set_anchor (feedback_actor, anchor_x, anchor_y); meta_feedback_actor_set_anchor (feedback_actor, anchor_x, anchor_y);
if (surface_role_dnd->geometry_scale != geometry_scale)
{
surface_role_dnd->geometry_scale = geometry_scale;
clutter_actor_set_scale (CLUTTER_ACTOR (surface_actor),
geometry_scale,
geometry_scale);
}
actor_surface_class->sync_actor_state (actor_surface); actor_surface_class->sync_actor_state (actor_surface);
} }
static void static void
meta_wayland_surface_role_dnd_init (MetaWaylandSurfaceRoleDND *role) meta_wayland_surface_role_dnd_init (MetaWaylandSurfaceRoleDND *role)
{ {
role->geometry_scale = 1;
} }
static void static void