diff options
Diffstat (limited to 'src/st')
| -rw-r--r-- | src/st/st-bin.c | 8 | ||||
| -rw-r--r-- | src/st/st-entry.c | 2 | ||||
| -rw-r--r-- | src/st/st-scroll-bar.c | 2 | ||||
| -rw-r--r-- | src/st/st-scroll-view.c | 4 | ||||
| -rw-r--r-- | src/st/st-widget.c | 10 |
5 files changed, 13 insertions, 13 deletions
diff --git a/src/st/st-bin.c b/src/st/st-bin.c index 1e1827168..95a689c2f 100644 --- a/src/st/st-bin.c +++ b/src/st/st-bin.c @@ -101,7 +101,7 @@ st_bin_allocate (ClutterActor *self, clutter_actor_set_allocation (self, box, flags); - if (priv->child && CLUTTER_ACTOR_IS_VISIBLE (priv->child)) + if (priv->child && clutter_actor_is_visible (priv->child)) { StThemeNode *theme_node = st_widget_get_theme_node (ST_WIDGET (self)); ClutterActorBox childbox; @@ -128,7 +128,7 @@ st_bin_get_preferred_width (ClutterActor *self, st_theme_node_adjust_for_height (theme_node, &for_height); - if (priv->child == NULL || !CLUTTER_ACTOR_IS_VISIBLE (priv->child)) + if (priv->child == NULL || !clutter_actor_is_visible (priv->child)) { if (min_width_p) *min_width_p = 0; @@ -157,7 +157,7 @@ st_bin_get_preferred_height (ClutterActor *self, st_theme_node_adjust_for_width (theme_node, &for_width); - if (priv->child == NULL || !CLUTTER_ACTOR_IS_VISIBLE (priv->child)) + if (priv->child == NULL || !clutter_actor_is_visible (priv->child)) { if (min_height_p) *min_height_p = 0; @@ -209,7 +209,7 @@ st_bin_navigate_focus (StWidget *widget, if (from && clutter_actor_contains (bin_actor, from)) return FALSE; - if (CLUTTER_ACTOR_IS_MAPPED (bin_actor)) + if (clutter_actor_is_mapped (bin_actor)) { clutter_actor_grab_key_focus (bin_actor); return TRUE; diff --git a/src/st/st-entry.c b/src/st/st-entry.c index 1507c2df4..ca65e5105 100644 --- a/src/st/st-entry.c +++ b/src/st/st-entry.c @@ -304,7 +304,7 @@ st_entry_navigate_focus (StWidget *widget, if (from == priv->entry) return FALSE; else if (st_widget_get_can_focus (widget) && - CLUTTER_ACTOR_IS_MAPPED (priv->entry)) + clutter_actor_is_mapped (priv->entry)) { clutter_actor_grab_key_focus (priv->entry); return TRUE; diff --git a/src/st/st-scroll-bar.c b/src/st/st-scroll-bar.c index b8161ea35..b84ecd1a6 100644 --- a/src/st/st-scroll-bar.c +++ b/src/st/st-scroll-bar.c @@ -845,7 +845,7 @@ st_scroll_bar_notify_reactive (StScrollBar *self) { StScrollBarPrivate *priv = self->priv; - gboolean reactive = CLUTTER_ACTOR_IS_REACTIVE (self); + gboolean reactive = clutter_actor_get_reactive (CLUTTER_ACTOR (self)); clutter_actor_set_reactive (CLUTTER_ACTOR (priv->trough), reactive); clutter_actor_set_reactive (CLUTTER_ACTOR (priv->handle), reactive); diff --git a/src/st/st-scroll-view.c b/src/st/st-scroll-view.c index b34c7833b..cab16c280 100644 --- a/src/st/st-scroll-view.c +++ b/src/st/st-scroll-view.c @@ -313,7 +313,7 @@ get_scrollbar_width (StScrollView *scroll, { StScrollViewPrivate *priv = scroll->priv; - if (CLUTTER_ACTOR_IS_VISIBLE (priv->vscroll)) + if (clutter_actor_is_visible (priv->vscroll)) { gfloat min_size; @@ -331,7 +331,7 @@ get_scrollbar_height (StScrollView *scroll, { StScrollViewPrivate *priv = scroll->priv; - if (CLUTTER_ACTOR_IS_VISIBLE (priv->hscroll)) + if (clutter_actor_is_visible (priv->hscroll)) { gfloat min_size; diff --git a/src/st/st-widget.c b/src/st/st-widget.c index de0ed958a..d01c533a7 100644 --- a/src/st/st-widget.c +++ b/src/st/st-widget.c @@ -315,7 +315,7 @@ st_widget_texture_cache_changed (StTextureCache *cache, */ st_theme_node_paint_state_invalidate (current_paint_state (actor)); - if (CLUTTER_ACTOR_IS_MAPPED (CLUTTER_ACTOR (actor))) + if (clutter_actor_is_mapped (CLUTTER_ACTOR (actor))) clutter_actor_queue_redraw (CLUTTER_ACTOR (actor)); } } @@ -537,7 +537,7 @@ st_widget_style_changed (StWidget *widget) } /* update the style only if we are mapped */ - if (CLUTTER_ACTOR_IS_MAPPED (CLUTTER_ACTOR (widget))) + if (clutter_actor_is_mapped (CLUTTER_ACTOR (widget))) st_widget_recompute_style (widget, old_theme_node); if (old_theme_node) @@ -794,7 +794,7 @@ st_widget_get_paint_volume (ClutterActor *self, { const ClutterPaintVolume *child_volume; - if (!CLUTTER_ACTOR_IS_VISIBLE (child)) + if (!clutter_actor_is_visible (child)) continue; child_volume = clutter_actor_get_transformed_paint_volume (child, self); @@ -1926,7 +1926,7 @@ st_widget_real_navigate_focus (StWidget *widget, { if (!focus_child) { - if (CLUTTER_ACTOR_IS_MAPPED (widget_actor)) + if (clutter_actor_is_mapped (widget_actor)) { /* Accept focus from outside */ clutter_actor_grab_key_focus (widget_actor); @@ -2847,7 +2847,7 @@ check_labels (StWidgetAccessible *widget_accessible, * * Gets a list of the focusable children of @widget, in "Tab" * order. By default, this returns all visible - * (as in CLUTTER_ACTOR_IS_VISIBLE()) children of @widget. + * (as in clutter_actor_is_visible()) children of @widget. * * Returns: (element-type Clutter.Actor) (transfer container): * @widget's focusable children |