rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=90678aca6356eefd34c42c04b866913d12327c58
commit 90678aca6356eefd34c42c04b866913d12327c58 Author: Andrii Kroitor <an.kroi...@samsung.com> Date: Wed Dec 9 17:22:45 2015 +0200 editor: add needed saves to part_item API --- src/bin/editor/editor_macro.h | 6 ++++-- src/bin/editor/editor_part.c | 31 ++++++++++++++++--------------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/src/bin/editor/editor_macro.h b/src/bin/editor/editor_macro.h index 8f1e012..2b38839 100644 --- a/src/bin/editor/editor_macro.h +++ b/src/bin/editor/editor_macro.h @@ -401,7 +401,7 @@ editor_part_item_## FUNC ##_set(Evas_Object *edit_object, Change *change, Eina_B return true; \ } -#define EDITOR_PART_ITEM_INT(FUNC, ATTRIBUTE) \ +#define EDITOR_PART_ITEM_INT(FUNC, ATTRIBUTE, SAVE) \ Eina_Bool \ editor_part_item_## FUNC ##_set(Evas_Object *edit_object, Change *change, Eina_Bool merge, \ const char *part_name, const char *item_name, int new_val) \ @@ -432,12 +432,13 @@ editor_part_item_## FUNC ##_set(Evas_Object *edit_object, Change *change, Eina_B } \ if (!edje_edit_part_item_## FUNC ##_set(edit_object, part_name, item_name, new_val)) \ return false; \ + if (SAVE) editor_save(edit_object); \ _editor_project_changed(); \ if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win, SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute); \ return true; \ } -#define EDITOR_PART_ITEM_USHORT(FUNC, ATTRIBUTE) \ +#define EDITOR_PART_ITEM_USHORT(FUNC, ATTRIBUTE, SAVE) \ Eina_Bool \ editor_part_item_## FUNC ##_set(Evas_Object *edit_object, Change *change, Eina_Bool merge, \ const char *part_name, const char *item_name, unsigned short new_val) \ @@ -468,6 +469,7 @@ editor_part_item_## FUNC ##_set(Evas_Object *edit_object, Change *change, Eina_B } \ if (!edje_edit_part_item_## FUNC ##_set(edit_object, part_name, item_name, new_val)) \ return false; \ + if (SAVE) editor_save(edit_object); \ _editor_project_changed(); \ if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win, SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute); \ return true; \ diff --git a/src/bin/editor/editor_part.c b/src/bin/editor/editor_part.c index 325da23..a90d186 100644 --- a/src/bin/editor/editor_part.c +++ b/src/bin/editor/editor_part.c @@ -185,21 +185,21 @@ EDITOR_PART_ITEM_DOUBLE(align_y, ATTRIBUTE_PART_ITEM_ALIGN_Y); EDITOR_PART_ITEM_DOUBLE(weight_x, ATTRIBUTE_PART_ITEM_WEIGHT_X); EDITOR_PART_ITEM_DOUBLE(weight_y, ATTRIBUTE_PART_ITEM_WEIGHT_Y); -EDITOR_PART_ITEM_INT(aspect_h, ATTRIBUTE_PART_ITEM_ASPECT_H); -EDITOR_PART_ITEM_INT(aspect_w, ATTRIBUTE_PART_ITEM_ASPECT_W); -EDITOR_PART_ITEM_INT(max_h, ATTRIBUTE_PART_ITEM_MAX_H); -EDITOR_PART_ITEM_INT(max_w, ATTRIBUTE_PART_ITEM_MAX_W); -EDITOR_PART_ITEM_INT(min_h, ATTRIBUTE_PART_ITEM_MIN_H); -EDITOR_PART_ITEM_INT(min_w, ATTRIBUTE_PART_ITEM_MIN_W); -EDITOR_PART_ITEM_INT(prefer_h, ATTRIBUTE_PART_ITEM_PREFER_H); -EDITOR_PART_ITEM_INT(prefer_w, ATTRIBUTE_PART_ITEM_PREFER_W); -EDITOR_PART_ITEM_INT(spread_h, ATTRIBUTE_PART_ITEM_SPREAD_H); -EDITOR_PART_ITEM_INT(spread_w, ATTRIBUTE_PART_ITEM_SPREAD_W); - -EDITOR_PART_ITEM_USHORT(span_col, ATTRIBUTE_PART_ITEM_SPAN_COL); -EDITOR_PART_ITEM_USHORT(span_row, ATTRIBUTE_PART_ITEM_SPAN_ROW); -EDITOR_PART_ITEM_USHORT(position_col, ATTRIBUTE_PART_ITEM_POSITION_COL); -EDITOR_PART_ITEM_USHORT(position_row, ATTRIBUTE_PART_ITEM_POSITION_ROW); +EDITOR_PART_ITEM_INT(aspect_h, ATTRIBUTE_PART_ITEM_ASPECT_H, false); +EDITOR_PART_ITEM_INT(aspect_w, ATTRIBUTE_PART_ITEM_ASPECT_W, false); +EDITOR_PART_ITEM_INT(max_h, ATTRIBUTE_PART_ITEM_MAX_H, false); +EDITOR_PART_ITEM_INT(max_w, ATTRIBUTE_PART_ITEM_MAX_W, false); +EDITOR_PART_ITEM_INT(min_h, ATTRIBUTE_PART_ITEM_MIN_H, false); +EDITOR_PART_ITEM_INT(min_w, ATTRIBUTE_PART_ITEM_MIN_W, false); +EDITOR_PART_ITEM_INT(prefer_h, ATTRIBUTE_PART_ITEM_PREFER_H, false); +EDITOR_PART_ITEM_INT(prefer_w, ATTRIBUTE_PART_ITEM_PREFER_W, false); +EDITOR_PART_ITEM_INT(spread_h, ATTRIBUTE_PART_ITEM_SPREAD_H, true); +EDITOR_PART_ITEM_INT(spread_w, ATTRIBUTE_PART_ITEM_SPREAD_W, true); + +EDITOR_PART_ITEM_USHORT(span_col, ATTRIBUTE_PART_ITEM_SPAN_COL, true); +EDITOR_PART_ITEM_USHORT(span_row, ATTRIBUTE_PART_ITEM_SPAN_ROW, true); +EDITOR_PART_ITEM_USHORT(position_col, ATTRIBUTE_PART_ITEM_POSITION_COL, true); +EDITOR_PART_ITEM_USHORT(position_row, ATTRIBUTE_PART_ITEM_POSITION_ROW, true); Eina_Bool editor_part_item_source_set(Evas_Object *edit_object, Change *change, Eina_Bool merge, @@ -528,6 +528,7 @@ editor_part_item_del(Evas_Object *edit_object, Change *change, Eina_Bool merge _ eina_stringshare_del(event_info.item_name); return false; } + editor_save(edit_object); _editor_project_changed(); eina_stringshare_del(event_info.part_name); eina_stringshare_del(event_info.item_name); --