diff options
Diffstat (limited to 'clutter/clutter/clutter-text.c')
| -rw-r--r-- | clutter/clutter/clutter-text.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/clutter/clutter/clutter-text.c b/clutter/clutter/clutter-text.c index 1684a2bd2..3ad0d6152 100644 --- a/clutter/clutter/clutter-text.c +++ b/clutter/clutter/clutter-text.c @@ -157,7 +157,7 @@ struct _ClutterTextPrivate gint text_logical_y; /* Where to draw the cursor */ - ClutterRect cursor_rect; + graphene_rect_t cursor_rect; ClutterColor cursor_color; guint cursor_size; @@ -1304,7 +1304,7 @@ static inline void update_cursor_location (ClutterText *self) { ClutterTextPrivate *priv = self->priv; - ClutterRect rect; + graphene_rect_t rect; float x, y; if (!priv->editable) @@ -1312,7 +1312,7 @@ update_cursor_location (ClutterText *self) rect = priv->cursor_rect; clutter_actor_get_transformed_position (CLUTTER_ACTOR (self), &x, &y); - clutter_rect_offset (&rect, x, y); + graphene_rect_offset (&rect, x, y); clutter_input_focus_set_cursor_location (priv->input_focus, &rect); } @@ -1322,7 +1322,7 @@ clutter_text_ensure_cursor_position (ClutterText *self, { ClutterTextPrivate *priv = self->priv; gfloat x, y, cursor_height; - ClutterRect cursor_rect = CLUTTER_RECT_INIT_ZERO; + graphene_rect_t cursor_rect = GRAPHENE_RECT_INIT_ZERO; gint position; position = priv->position; @@ -1345,23 +1345,23 @@ clutter_text_ensure_cursor_position (ClutterText *self, &x, &y, &cursor_height); - clutter_rect_init (&cursor_rect, - x, - y + CURSOR_Y_PADDING * scale, - priv->cursor_size * scale, - cursor_height - 2 * CURSOR_Y_PADDING * scale); + graphene_rect_init (&cursor_rect, + x, + y + CURSOR_Y_PADDING * scale, + priv->cursor_size * scale, + cursor_height - 2 * CURSOR_Y_PADDING * scale); - if (!clutter_rect_equals (&priv->cursor_rect, &cursor_rect)) + if (!graphene_rect_equal (&priv->cursor_rect, &cursor_rect)) { ClutterGeometry cursor_pos; priv->cursor_rect = cursor_rect; /* XXX:2.0 - remove */ - cursor_pos.x = clutter_rect_get_x (&priv->cursor_rect); - cursor_pos.y = clutter_rect_get_y (&priv->cursor_rect); - cursor_pos.width = clutter_rect_get_width (&priv->cursor_rect); - cursor_pos.height = clutter_rect_get_height (&priv->cursor_rect); + cursor_pos.x = graphene_rect_get_x (&priv->cursor_rect); + cursor_pos.y = graphene_rect_get_y (&priv->cursor_rect); + cursor_pos.width = graphene_rect_get_width (&priv->cursor_rect); + cursor_pos.height = graphene_rect_get_height (&priv->cursor_rect); g_signal_emit (self, text_signals[CURSOR_EVENT], 0, &cursor_pos); g_signal_emit (self, text_signals[CURSOR_CHANGED], 0); @@ -2712,7 +2712,7 @@ clutter_text_paint (ClutterActor *self) if (actor_width < text_width) { - gint cursor_x = clutter_rect_get_x (&priv->cursor_rect); + gint cursor_x = graphene_rect_get_x (&priv->cursor_rect); if (priv->position == -1) { @@ -6780,8 +6780,8 @@ clutter_text_get_layout_offsets (ClutterText *self, * Since: 1.16 */ void -clutter_text_get_cursor_rect (ClutterText *self, - ClutterRect *rect) +clutter_text_get_cursor_rect (ClutterText *self, + graphene_rect_t *rect) { g_return_if_fail (CLUTTER_IS_TEXT (self)); g_return_if_fail (rect != NULL); |