diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index 8336892488..b6b01352aa 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -10819,26 +10819,29 @@ evas_object_textblock_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data (obj->cur->geometry.h != o->last_h)))) { _relayout(eo_obj); - o->redraw = 0; - evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, eo_obj, obj); - is_v = evas_object_is_visible(eo_obj, obj); - was_v = evas_object_was_visible(eo_obj, obj); - goto done; + o->redraw = 0; + evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, + eo_obj, obj); + is_v = evas_object_is_visible(eo_obj, obj); + was_v = evas_object_was_visible(eo_obj, obj); + goto done; } if (o->redraw) { - o->redraw = 0; - evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, eo_obj, obj); - is_v = evas_object_is_visible(eo_obj, obj); - was_v = evas_object_was_visible(eo_obj, obj); - goto done; + o->redraw = 0; + evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, + eo_obj, obj); + is_v = evas_object_is_visible(eo_obj, obj); + was_v = evas_object_was_visible(eo_obj, obj); + goto done; } /* if someone is clipping this obj - go calculate the clipper */ if (obj->cur->clipper) { - if (obj->cur->cache.clip.dirty) - evas_object_clip_recalc(obj->cur->clipper); - obj->cur->clipper->func->render_pre(obj->cur->clipper->object, obj->cur->clipper); + if (obj->cur->cache.clip.dirty) + evas_object_clip_recalc(obj->cur->clipper); + obj->cur->clipper->func->render_pre(obj->cur->clipper->object, + obj->cur->clipper); } /* now figure what changed and add draw rects */ /* if it just became visible or invisible */ @@ -10846,24 +10849,27 @@ evas_object_textblock_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data was_v = evas_object_was_visible(eo_obj, obj); if (is_v != was_v) { - evas_object_render_pre_visible_change(&obj->layer->evas->clip_changes, eo_obj, is_v, was_v); - goto done; + evas_object_render_pre_visible_change(&obj->layer->evas->clip_changes, + eo_obj, is_v, was_v); + goto done; } if (obj->changed_map || obj->changed_src_visible) { - evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, + evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, eo_obj, obj); goto done; } /* it's not visible - we accounted for it appearing or not so just abort */ if (!is_v) goto done; /* clipper changed this is in addition to anything else for obj */ - evas_object_render_pre_clipper_change(&obj->layer->evas->clip_changes, eo_obj); + evas_object_render_pre_clipper_change(&obj->layer->evas->clip_changes, + eo_obj); /* if we restacked (layer or just within a layer) and don't clip anyone */ if (obj->restack) { - evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, eo_obj, obj); - goto done; + evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, + eo_obj, obj); + goto done; } /* if it changed color */ if ((obj->cur->color.r != obj->prev->color.r) || @@ -10871,8 +10877,9 @@ evas_object_textblock_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data (obj->cur->color.b != obj->prev->color.b) || (obj->cur->color.a != obj->prev->color.a)) { - evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, eo_obj, obj); - goto done; + evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, + eo_obj, obj); + goto done; } /* if it changed geometry - and obviously not visibility or color */ /* calculate differences since we have a constant color fill */ @@ -10882,17 +10889,19 @@ evas_object_textblock_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data (obj->cur->geometry.w != obj->prev->geometry.w) || (obj->cur->geometry.h != obj->prev->geometry.h)) { - evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, eo_obj, obj); - goto done; + evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, + eo_obj, obj); + goto done; } - done: - evas_object_render_pre_effect_updates(&obj->layer->evas->clip_changes, eo_obj, is_v, was_v); +done: + evas_object_render_pre_effect_updates(&obj->layer->evas->clip_changes, + eo_obj, is_v, was_v); } static void evas_object_textblock_render_post(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj EINA_UNUSED) { -/* Evas_Object_Textblock *o; */ + /* Evas_Object_Textblock *o; */ /* this moves the current data to the previous state parts of the object */ /* in whatever way is safest for the object. also if we don't need object */