isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-26 04:42:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

wayland/feedback-actor: Use float for position and anchor

Browse Source 
To be correct with fractional scaling. Furthermore, we currently
use it only with ClutterPoint values, which are floats already.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/684
This commit is contained in:
Robert Mader 2019-08-26 14:14:18 +03:00
parent acbefa5263
commit 7275cf60bd
3 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -206,7 +206,7 @@ meta_dnd_actor_drag_finish (MetaDnDActor *self,
if (CLUTTER_ACTOR_IS_VISIBLE (self->drag_origin))
{
int anchor_x, anchor_y;
float anchor_x, anchor_y;
ClutterPoint dest;
clutter_actor_get_transformed_position (self->drag_origin,

16
src/compositor/meta-feedback-actor-private.h
View File

@ -45,19 +45,19 @@ struct _MetaFeedbackActorClass
};
ClutterActor *meta_feedback_actor_new (int anchor_x,
int anchor_y);
ClutterActor *meta_feedback_actor_new (float anchor_x,
float anchor_y);
void meta_feedback_actor_set_anchor (MetaFeedbackActor *actor,
int anchor_x,
int anchor_y);
float anchor_x,
float anchor_y);
void meta_feedback_actor_get_anchor (MetaFeedbackActor *actor,
int *anchor_x,
int *anchor_y);
float *anchor_x,
float *anchor_y);
void meta_feedback_actor_set_position (MetaFeedbackActor *self,
int x,
int y);
float x,
float y);
void meta_feedback_actor_update (MetaFeedbackActor *self,
const ClutterEvent *event);

48
src/compositor/meta-feedback-actor.c
View File

@ -40,10 +40,10 @@ typedef struct _MetaFeedbackActorPrivate MetaFeedbackActorPrivate;
struct _MetaFeedbackActorPrivate
{
int anchor_x;
int anchor_y;
int pos_x;
int pos_y;
float anchor_x;
float anchor_y;
float pos_x;
float pos_y;
};
G_DEFINE_TYPE_WITH_PRIVATE (MetaFeedbackActor, meta_feedback_actor, CLUTTER_TYPE_ACTOR)
@ -106,10 +106,10 @@ meta_feedback_actor_get_property (GObject *object,
switch (prop_id)
{
case PROP_ANCHOR_X:
g_value_set_int (value, priv->anchor_x);
g_value_set_float (value, priv->anchor_x);
break;
case PROP_ANCHOR_Y:
g_value_set_int (value, priv->anchor_y);
g_value_set_float (value, priv->anchor_y);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -127,21 +127,21 @@ meta_feedback_actor_class_init (MetaFeedbackActorClass *klass)
object_class->set_property = meta_feedback_actor_set_property;
object_class->get_property = meta_feedback_actor_get_property;
pspec = g_param_spec_int ("anchor-x",
"Anchor X",
"The X axis of the anchor point",
0, G_MAXINT, 0,
G_PARAM_READWRITE);
pspec = g_param_spec_float ("anchor-x",
"Anchor X",
"The X axis of the anchor point",
0, G_MAXFLOAT, 0,
G_PARAM_READWRITE);
g_object_class_install_property (object_class,
PROP_ANCHOR_X,
pspec);
pspec = g_param_spec_int ("anchor-y",
"Anchor Y",
"The Y axis of the anchor point",
0, G_MAXINT, 0,
G_PARAM_READWRITE);
pspec = g_param_spec_float ("anchor-y",
"Anchor Y",
"The Y axis of the anchor point",
0, G_MAXFLOAT, 0,
G_PARAM_READWRITE);
g_object_class_install_property (object_class,
PROP_ANCHOR_Y,
@ -162,8 +162,8 @@ meta_feedback_actor_init (MetaFeedbackActor *self)
* Return value: the newly created background actor
*/
ClutterActor *
meta_feedback_actor_new (int anchor_x,
int anchor_y)
meta_feedback_actor_new (float anchor_x,
float anchor_y)
{
MetaFeedbackActor *self;
@ -177,8 +177,8 @@ meta_feedback_actor_new (int anchor_x,
void
meta_feedback_actor_set_anchor (MetaFeedbackActor *self,
int anchor_x,
int anchor_y)
float anchor_x,
float anchor_y)
{
MetaFeedbackActorPrivate *priv;
@ -206,8 +206,8 @@ meta_feedback_actor_set_anchor (MetaFeedbackActor *self,
void
meta_feedback_actor_get_anchor (MetaFeedbackActor *self,
int *anchor_x,
int *anchor_y)
float *anchor_x,
float *anchor_y)
{
MetaFeedbackActorPrivate *priv;
@ -223,8 +223,8 @@ meta_feedback_actor_get_anchor (MetaFeedbackActor *self,
void
meta_feedback_actor_set_position (MetaFeedbackActor *self,
int x,
int y)
float x,
float y)
{
MetaFeedbackActorPrivate *priv;