more work on render2 - still not working with smart objects
This commit is contained in:
parent
6c268d98e5
commit
6bf45900c8
|
@ -224,7 +224,6 @@ evas_object_change(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
|
||||||
obj->changed_move = EINA_FALSE;
|
obj->changed_move = EINA_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
// if (obj->smart.smart) printf("change smart %p %i\n", obj, obj->changed);
|
|
||||||
if (obj->changed) return;
|
if (obj->changed) return;
|
||||||
|
|
||||||
evas_render_object_recalc(eo_obj);
|
evas_render_object_recalc(eo_obj);
|
||||||
|
|
|
@ -310,10 +310,10 @@ _evas_render2_begin(Eo *eo_e, Eina_Bool make_updates,
|
||||||
// check viewport size is same as output - not allowed to differ
|
// check viewport size is same as output - not allowed to differ
|
||||||
if ((e->output.w != e->viewport.w) || (e->output.h != e->viewport.h))
|
if ((e->output.w != e->viewport.w) || (e->output.h != e->viewport.h))
|
||||||
ERR("viewport size != output size!");
|
ERR("viewport size != output size!");
|
||||||
// call canvas callbacks saying we are in the pre-render state
|
|
||||||
_evas_render2_always_call(eo_e, EVAS_CALLBACK_RENDER_PRE, NULL);
|
|
||||||
// we have to calculate smare objects before render so do that here
|
// we have to calculate smare objects before render so do that here
|
||||||
evas_call_smarts_calculate(eo_e);
|
evas_call_smarts_calculate(eo_e);
|
||||||
|
// call canvas callbacks saying we are in the pre-render state
|
||||||
|
_evas_render2_always_call(eo_e, EVAS_CALLBACK_RENDER_PRE, NULL);
|
||||||
// begin out actual rendering bits
|
// begin out actual rendering bits
|
||||||
_evas_render2_stage_generate_object_updates(e);
|
_evas_render2_stage_generate_object_updates(e);
|
||||||
_evas_render2_stage_explicit_updates(e);
|
_evas_render2_stage_explicit_updates(e);
|
||||||
|
|
Loading…
Reference in New Issue