rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=be9a56892e6a134912bea860c7442634162fdf1a

commit be9a56892e6a134912bea860c7442634162fdf1a
Author: Andrii Kroitor <an.kroi...@samsung.com>
Date:   Wed Jul 22 17:49:13 2015 +0300

    History: history redo for state works again
---
 src/bin/history/history_state.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/bin/history/history_state.c b/src/bin/history/history_state.c
index 4f76022..a7e16ae 100644
--- a/src/bin/history/history_state.c
+++ b/src/bin/history/history_state.c
@@ -190,8 +190,9 @@ _history_ui_state_update(Evas_Object *source, State_Diff 
*change)
              eina_stringshare_replace(&part->curr_state, "default");
              part->curr_state_value = 0.0;
           }
-        workspace_edit_object_part_state_set(app->workspace, part);
+        ui_property_part_set(prop_view, part);
         ui_property_state_set(prop_view, part);
+        workspace_edit_object_part_state_set(app->workspace, part);
      }
    ui_widget_list_part_selected_set(ui_block_widget_list_get(app), 
change->part,
                                     true);
@@ -373,9 +374,9 @@ _state_param_restore(Evas_Object *obj, Eina_Stringshare 
*part,
    assert(obj != NULL);
    assert(part != NULL);
    assert(state_diff != NULL);
-   assert(!edje_edit_state_exist(obj, part, state_diff->name, 
state_diff->value));
 
-   edje_edit_state_add(obj, part, state_diff->name, state_diff->value);
+   if (!edje_edit_state_exist(obj, part, state_diff->name, state_diff->value))
+     edje_edit_state_add(obj, part, state_diff->name, state_diff->value);
 
    edje_edit_state_visible_set(obj, part, state_diff->name,
                                state_diff->value, state_diff->visible);

-- 


Reply via email to