st: Replace ClutterSize by graphene_size_t
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/421
This commit is contained in:
parent
0199857c5b
commit
7a92a9ba21
@ -48,19 +48,19 @@ static GParamSpec *props[N_PROPS] = { NULL, };
|
|||||||
|
|
||||||
struct _StIconPrivate
|
struct _StIconPrivate
|
||||||
{
|
{
|
||||||
ClutterActor *icon_texture;
|
ClutterActor *icon_texture;
|
||||||
ClutterActor *pending_texture;
|
ClutterActor *pending_texture;
|
||||||
guint opacity_handler_id;
|
guint opacity_handler_id;
|
||||||
|
|
||||||
GIcon *gicon;
|
GIcon *gicon;
|
||||||
gint prop_icon_size; /* icon size set as property */
|
gint prop_icon_size; /* icon size set as property */
|
||||||
gint theme_icon_size; /* icon size from theme node */
|
gint theme_icon_size; /* icon size from theme node */
|
||||||
gint icon_size; /* icon size we are using */
|
gint icon_size; /* icon size we are using */
|
||||||
GIcon *fallback_gicon;
|
GIcon *fallback_gicon;
|
||||||
|
|
||||||
CoglPipeline *shadow_pipeline;
|
CoglPipeline *shadow_pipeline;
|
||||||
StShadow *shadow_spec;
|
StShadow *shadow_spec;
|
||||||
ClutterSize shadow_size;
|
graphene_size_t shadow_size;
|
||||||
};
|
};
|
||||||
|
|
||||||
G_DEFINE_TYPE_WITH_PRIVATE (StIcon, st_icon, ST_TYPE_WIDGET)
|
G_DEFINE_TYPE_WITH_PRIVATE (StIcon, st_icon, ST_TYPE_WIDGET)
|
||||||
@ -290,7 +290,7 @@ st_icon_clear_shadow_pipeline (StIcon *icon)
|
|||||||
StIconPrivate *priv = icon->priv;
|
StIconPrivate *priv = icon->priv;
|
||||||
|
|
||||||
g_clear_pointer (&priv->shadow_pipeline, cogl_object_unref);
|
g_clear_pointer (&priv->shadow_pipeline, cogl_object_unref);
|
||||||
clutter_size_init (&priv->shadow_size, 0, 0);
|
graphene_size_init (&priv->shadow_size, 0, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@ -317,7 +317,7 @@ st_icon_update_shadow_pipeline (StIcon *icon)
|
|||||||
priv->icon_texture);
|
priv->icon_texture);
|
||||||
|
|
||||||
if (priv->shadow_pipeline)
|
if (priv->shadow_pipeline)
|
||||||
clutter_size_init (&priv->shadow_size, width, height);
|
graphene_size_init (&priv->shadow_size, width, height);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user