rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=1473b23960342f6dc9ab3b84bdf79d26274142b0
commit 1473b23960342f6dc9ab3b84bdf79d26274142b0 Author: Vyacheslav Reutskiy <[email protected]> Date: Thu Jun 16 09:07:13 2016 +0300 editor: add diff to change in aff func with falback to default value it's fix copy past error Change-Id: Ife8d4aed475fed9d82ca98dabebe9c9cd0af4953 --- src/bin/editor/editor_macro.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/bin/editor/editor_macro.h b/src/bin/editor/editor_macro.h index b7ebb2f..04882f4 100644 --- a/src/bin/editor/editor_macro.h +++ b/src/bin/editor/editor_macro.h @@ -217,6 +217,7 @@ editor_state_## FUNC ##_set(Evas_Object *edit_object, Change *change, Eina_Bool { \ if (!edje_edit_state_## FUNC ##_set(edit_object, part_name, state_name, state_val, new_val)) \ { \ + TODO("i'm not sure that fallback is setted correctly, need to check") \ if (!edje_edit_state_## FUNC ##_set(edit_object, part_name, state_name, state_val, FALLBACK_VAL)) \ { \ if (diff) diff_free(diff); \ @@ -239,6 +240,16 @@ editor_state_## FUNC ##_set(Evas_Object *edit_object, Change *change, Eina_Bool _editor_project_changed(); \ if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win, SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute); \ } \ + else \ + { \ + if (change) /* we should add diff only after all changes to it */\ + { \ + if (merge) \ + change_diff_merge_add(change, diff); \ + else \ + change_diff_add(change, diff); \ + } \ + } \ return true; \ } --
