brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor/dnd-actor: Take geometry scale into account on DnD-cancel

Browse Source 
Technically this is still wrong if the source actor or dnd actor are
transformed in other ways. However geometry scale is the by far most
common case and we currently lack convenience API in Clutter to
easily compute the right values.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1683>
This commit is contained in:
Robert Mader 2021-01-31 17:33:21 +01:00
parent 04eeeb78d1
commit 7da34f154b
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/compositor/meta-dnd-actor.c
View File

@ -28,6 +28,7 @@
#include "config.h" #include "config.h"
#include "compositor/meta-dnd-actor-private.h" #include "compositor/meta-dnd-actor-private.h"
#include "compositor/meta-window-actor-private.h"
#include "clutter/clutter.h" #include "clutter/clutter.h"
@ -206,16 +207,29 @@ meta_dnd_actor_drag_finish (MetaDnDActor *self,
if (CLUTTER_ACTOR_IS_VISIBLE (self->drag_origin)) if (CLUTTER_ACTOR_IS_VISIBLE (self->drag_origin))
{ {
MetaWindowActor *origin_actor;
float anchor_x, anchor_y; float anchor_x, anchor_y;
graphene_point_t dest; graphene_point_t dest;
int origin_geometry_scale;
int feedback_geometry_scale;
clutter_actor_get_transformed_position (self->drag_origin, clutter_actor_get_transformed_position (self->drag_origin,
&dest.x, &dest.y); &dest.x, &dest.y);
origin_actor = meta_window_actor_from_actor (self->drag_origin);
g_return_if_fail (origin_actor);
origin_geometry_scale =
meta_window_actor_get_geometry_scale (origin_actor);
meta_feedback_actor_get_anchor (META_FEEDBACK_ACTOR (self), meta_feedback_actor_get_anchor (META_FEEDBACK_ACTOR (self),
&anchor_x, &anchor_y); &anchor_x, &anchor_y);
feedback_geometry_scale =
meta_feedback_actor_get_geometry_scale (META_FEEDBACK_ACTOR (self));
dest.x += self->drag_start_x - anchor_x; dest.x += ((self->drag_start_x * origin_geometry_scale) -
dest.y += self->drag_start_y - anchor_y; (anchor_x * feedback_geometry_scale));
dest.y += ((self->drag_start_y * origin_geometry_scale) -
(anchor_y * feedback_geometry_scale));
clutter_actor_set_position (actor, dest.x, dest.y); clutter_actor_set_position (actor, dest.x, dest.y);
} }