rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=66e64ee12f385b7d8a6d99642800253a7a8109a3
commit 66e64ee12f385b7d8a6d99642800253a7a8109a3
Author: Andrii Kroitor <an.kroi...@samsung.com>
Date: Thu Jun 23 11:58:07 2016 +0300
editor: CRIT on edje_edit fails
---
src/bin/editor/editor_general.c | 9 ++---
src/bin/editor/editor_group.c | 36 ++++++-------------
src/bin/editor/editor_macro.h | 60 ++++++++++---------------------
src/bin/editor/editor_part.c | 79 +++++++++++++----------------------------
src/bin/editor/editor_program.c | 57 ++++++++++-------------------
src/bin/editor/editor_states.c | 48 ++++++++-----------------
src/bin/editor/editor_text.c | 6 ++--
7 files changed, 93 insertions(+), 202 deletions(-)
diff --git a/src/bin/editor/editor_general.c b/src/bin/editor/editor_general.c
index e44f0b0..e7463d9 100644
--- a/src/bin/editor/editor_general.c
+++ b/src/bin/editor/editor_general.c
@@ -29,8 +29,7 @@ _editor_save(Evas_Object *edit_object, Eina_Bool
current_group)
{
assert(edit_object != NULL);
- if (!edje_edit_without_source_save(edit_object, current_group))
- return false;
+ CRIT_ON_FAIL(edje_edit_without_source_save(edit_object, current_group));
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_SAVED, NULL);
return true;
@@ -55,10 +54,8 @@ editor_internal_group_add(Evas_Object *edit_object)
if (edje_edit_group_exist(edit_object, EFLETE_INTERNAL_GROUP_NAME))
return true;
- if (!edje_edit_group_add(edit_object, EFLETE_INTERNAL_GROUP_NAME))
- return false;
- if (!edje_edit_without_source_save(edit_object, false))
- return false;
+ CRIT_ON_FAIL(edje_edit_group_add(edit_object, EFLETE_INTERNAL_GROUP_NAME));
+ CRIT_ON_FAIL(edje_edit_without_source_save(edit_object, false));
return true;
}
diff --git a/src/bin/editor/editor_group.c b/src/bin/editor/editor_group.c
index 5062239..65e6476 100644
--- a/src/bin/editor/editor_group.c
+++ b/src/bin/editor/editor_group.c
@@ -32,8 +32,7 @@ editor_group_add(Evas_Object *obj, const char *name)
assert(obj != NULL);
assert(name != NULL);
- if (!edje_edit_group_add(obj, name))
- return false;
+ CRIT_ON_FAIL(edje_edit_group_add(obj, name));
if (!editor_save_all(obj))
return false; /* i hope it will never happen */
_editor_project_changed();
@@ -47,8 +46,7 @@ editor_group_copy(Evas_Object *obj, const char *group_src,
const char *group_des
assert(group_src != NULL);
assert(group_dest != NULL);
- if (!edje_edit_group_copy(obj, group_src, group_dest))
- return false;
+ CRIT_ON_FAIL(edje_edit_group_copy(obj, group_src, group_dest));
if (!editor_save_all(obj))
return false; /* i hope it will never happen */
_editor_project_changed();
@@ -62,8 +60,7 @@ editor_group_alias_add(Evas_Object *obj, const char
*group_src, const char *grou
assert(group_src != NULL);
assert(group_alias != NULL);
- if (!edje_edit_group_alias_add(obj, group_src, group_alias))
- return false;
+ CRIT_ON_FAIL(edje_edit_group_alias_add(obj, group_src, group_alias));
if (!editor_save_all(obj))
return false; /* i hope it will never happen */
_editor_project_changed();
@@ -76,8 +73,7 @@ editor_group_del(Evas_Object *obj, const char *name)
assert(obj != NULL);
assert(name != NULL);
- if (!edje_edit_group_del(obj, name))
- return false;
+ CRIT_ON_FAIL(edje_edit_group_del(obj, name));
if (!editor_save_all(obj))
return false; /* i hope it will never happen */
_editor_project_changed();
@@ -145,8 +141,7 @@ editor_group_max_## VAL ##_set(Evas_Object *obj, Change
*change, Eina_Bool merge
} \
if (apply) \
{ \
- if (!edje_edit_group_max_## VAL ##_set(obj, new_value)) \
- return false; \
+ CRIT_ON_FAIL(edje_edit_group_max_## VAL ##_set(obj, new_value)); \
_editor_project_changed(); \
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute); \
} \
@@ -191,8 +186,7 @@ editor_group_min_## VAL ##_set(Evas_Object *obj, Change
*change, Eina_Bool merge
} \
if (apply) \
{ \
- if (!edje_edit_group_min_## VAL ##_set(obj, new_value)) \
- return false; \
+ CRIT_ON_FAIL(edje_edit_group_min_## VAL ##_set(obj, new_value)); \
_editor_project_changed(); \
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute); \
} \
@@ -228,8 +222,7 @@ editor_group_name_set(Evas_Object *edit_object, Change
*change, Eina_Bool merge,
}
if (apply)
{
- if (!edje_edit_group_name_set(edit_object, new_val))
- return false;
+ CRIT_ON_FAIL(edje_edit_group_name_set(edit_object, new_val));
_editor_project_changed();
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute);
}
@@ -264,8 +257,7 @@ editor_group_data_value_set(Evas_Object *edit_object,
Change *change, Eina_Bool
}
if (apply)
{
- if (!edje_edit_group_data_value_set(edit_object, item_name, new_val))
- return false;
+ CRIT_ON_FAIL(edje_edit_group_data_value_set(edit_object, item_name,
new_val));
_editor_project_changed();
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute);
}
@@ -300,8 +292,7 @@ editor_group_data_name_set(Evas_Object *edit_object, Change
*change, Eina_Bool m
}
if (apply)
{
- if (!edje_edit_group_data_name_set(edit_object, item_name, new_val))
- return false;
+ CRIT_ON_FAIL(edje_edit_group_data_name_set(edit_object, item_name,
new_val));
_editor_project_changed();
ren.old_name = item_name;
ren.new_name = new_val;
@@ -335,8 +326,7 @@ editor_group_data_add(Evas_Object *edit_object, Change
*change, Eina_Bool merge
}
if (apply)
{
- if (!edje_edit_group_data_add(edit_object, item_name, ""))
- return false;
+ CRIT_ON_FAIL(edje_edit_group_data_add(edit_object, item_name, ""));
CRIT_ON_FAIL(editor_save(edit_object));
_editor_project_changed();
@@ -377,11 +367,7 @@ editor_group_data_del(Evas_Object *edit_object, Change
*change, Eina_Bool merge
}
if (apply)
{
- if (!edje_edit_group_data_del(edit_object, item_name))
- {
- eina_stringshare_del(event_info);
- return false;
- }
+ CRIT_ON_FAIL(edje_edit_group_data_del(edit_object, item_name));
eina_stringshare_del(event_info);
CRIT_ON_FAIL(editor_save(edit_object));
_editor_project_changed();
diff --git a/src/bin/editor/editor_macro.h b/src/bin/editor/editor_macro.h
index 04882f4..579ee7f 100644
--- a/src/bin/editor/editor_macro.h
+++ b/src/bin/editor/editor_macro.h
@@ -50,8 +50,7 @@ editor_state_## FUNC ##_set(Evas_Object *edit_object, Change
*change, Eina_Bool
} \
if (apply) \
{ \
- if (!edje_edit_state_## FUNC ##_set(edit_object, part_name, state_name,
state_val, new_val)) \
- return false; \
+ CRIT_ON_FAIL(edje_edit_state_## FUNC ##_set(edit_object, part_name,
state_name, state_val, new_val)); \
_editor_project_changed(); \
CRIT_ON_FAIL(editor_save(edit_object)); \
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute); \
@@ -92,8 +91,7 @@ editor_state_## FUNC ##_set(Evas_Object *edit_object, Change
*change, Eina_Bool
} \
if (apply) \
{ \
- if (!edje_edit_state_## FUNC ##_set(edit_object, part_name, state_name,
state_val, new_val)) \
- return false; \
+ CRIT_ON_FAIL(edje_edit_state_## FUNC ##_set(edit_object, part_name,
state_name, state_val, new_val)); \
_editor_project_changed(); \
CRIT_ON_FAIL(editor_save(edit_object)); \
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute); \
@@ -134,8 +132,7 @@ editor_state_## FUNC ##_set(Evas_Object *edit_object,
Change *change, Eina_Bool
} \
if (apply) \
{ \
- if (!edje_edit_state_## FUNC ##_set(edit_object, part_name, state_name,
state_val, new_val)) \
- return false; \
+ CRIT_ON_FAIL(edje_edit_state_## FUNC ##_set(edit_object, part_name,
state_name, state_val, new_val)); \
if (SAVE) CRIT_ON_FAIL(editor_save(edit_object)); \
_editor_project_changed(); \
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute); \
@@ -176,8 +173,7 @@ editor_state_## FUNC ##_set(Evas_Object *edit_object,
Change *change, Eina_Bool
} \
if (apply) \
{ \
- if (!edje_edit_state_## FUNC ##_set(edit_object, part_name, state_name,
state_val, new_val)) \
- return false; \
+ CRIT_ON_FAIL(edje_edit_state_## FUNC ##_set(edit_object, part_name,
state_name, state_val, new_val)); \
if (SAVE) CRIT_ON_FAIL(editor_save(edit_object)); \
_editor_project_changed(); \
if (!new_val) editor_state_## RESET ##_reset(edit_object, change, apply,
part_name, state_name, state_val); \
@@ -218,11 +214,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); \
- return false; \
- } \
+ CRIT_ON_FAIL(edje_edit_state_## FUNC ##_set(edit_object,
part_name, state_name, state_val, FALLBACK_VAL)); \
if (diff) \
{ \
eina_stringshare_del(diff->redo.args.type_ssds.s4); \
@@ -294,8 +286,7 @@ editor_state_## FUNC ##_set(Evas_Object *edit_object,
Change *change, Eina_Bool
} \
if (apply) \
{ \
- if (!edje_edit_state_## REAL_FUNC ##_set(edit_object, part_name,
state_name, state_val, n4, n5, n6, n7)) \
- return false; \
+ CRIT_ON_FAIL(edje_edit_state_## REAL_FUNC ##_set(edit_object,
part_name, state_name, state_val, n4, n5, n6, n7)); \
_editor_project_changed(); \
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute); \
} \
@@ -342,8 +333,7 @@ editor_state_## FUNC ##_## NUMBER ##_set(Evas_Object
*edit_object, Change *chang
} \
if (apply) \
{ \
- if (!edje_edit_state_## REAL_FUNC ##_set(edit_object, part_name,
state_name, state_val, NUMBER - 1, n4, n5, n6, n7)) \
- return false; \
+ CRIT_ON_FAIL(edje_edit_state_## REAL_FUNC ##_set(edit_object,
part_name, state_name, state_val, NUMBER - 1, n4, n5, n6, n7)); \
_editor_project_changed(); \
CRIT_ON_FAIL(editor_save(edit_object)); \
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute); \
@@ -384,8 +374,7 @@ editor_state_## FUNC ##_set(Evas_Object *edit_object,
Change *change, Eina_Bool
} \
if (apply) \
{ \
- if (!edje_edit_state_## FUNC ##_set(edit_object, part_name, state_name,
state_val, new_val)) \
- return false; \
+ CRIT_ON_FAIL(edje_edit_state_## FUNC ##_set(edit_object, part_name,
state_name, state_val, new_val)); \
_editor_project_changed(); \
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute); \
} \
@@ -420,8 +409,7 @@ editor_part_## FUNC ##_set(Evas_Object *edit_object, Change
*change, Eina_Bool m
} \
if (apply) \
{ \
- if (!edje_edit_part_## FUNC ##_set(edit_object, part_name, new_val)) \
- return false; \
+ CRIT_ON_FAIL(edje_edit_part_## FUNC ##_set(edit_object, part_name,
new_val)); \
_editor_project_changed(); \
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute); \
} \
@@ -456,8 +444,7 @@ editor_part_## FUNC ##_set(Evas_Object *edit_object, Change
*change, Eina_Bool m
} \
if (apply) \
{ \
- if (!edje_edit_part_## FUNC ##_set(edit_object, part_name, new_val)) \
- return false; \
+ CRIT_ON_FAIL(edje_edit_part_## FUNC ##_set(edit_object, part_name,
new_val)); \
_editor_project_changed(); \
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute); \
} \
@@ -492,8 +479,7 @@ editor_## FUNC ##_set(Evas_Object *edit_object, Change
*change, Eina_Bool merge,
} \
if (apply) \
{ \
- if (!edje_edit_## REAL_FUNC ##_set(edit_object, name, new_val)) \
- return false; \
+ CRIT_ON_FAIL(edje_edit_## REAL_FUNC ##_set(edit_object, name,
new_val)); \
_editor_project_changed(); \
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute); \
} \
@@ -531,8 +517,7 @@ editor_part_item_## FUNC ##_set(Evas_Object *edit_object,
Change *change, Eina_B
} \
if (apply) \
{ \
- if (!edje_edit_part_item_## FUNC ##_set(edit_object, part_name,
item_name, new_val)) \
- return false; \
+ CRIT_ON_FAIL(edje_edit_part_item_## FUNC ##_set(edit_object, part_name,
item_name, new_val)); \
_editor_project_changed(); \
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute); \
} \
@@ -570,8 +555,7 @@ editor_part_item_## FUNC ##_set(Evas_Object *edit_object,
Change *change, Eina_B
} \
if (apply) \
{ \
- if (!edje_edit_part_item_## FUNC ##_set(edit_object, part_name,
item_name, new_val)) \
- return false; \
+ CRIT_ON_FAIL(edje_edit_part_item_## FUNC ##_set(edit_object, part_name,
item_name, new_val)); \
if (SAVE) CRIT_ON_FAIL(editor_save(edit_object)); \
_editor_project_changed(); \
} \
@@ -610,8 +594,7 @@ editor_part_item_## FUNC ##_set(Evas_Object *edit_object,
Change *change, Eina_B
} \
if (apply) \
{ \
- if (!edje_edit_part_item_## FUNC ##_set(edit_object, part_name,
item_name, new_val)) \
- return false; \
+ CRIT_ON_FAIL(edje_edit_part_item_## FUNC ##_set(edit_object, part_name,
item_name, new_val)); \
if (SAVE) CRIT_ON_FAIL(editor_save(edit_object)); \
_editor_project_changed(); \
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute); \
@@ -652,8 +635,7 @@ editor_state_## FUNC ##_set(Evas_Object *edit_object,
Change *change, Eina_Bool
} \
if (apply) \
{ \
- if (!edje_edit_state_## FUNC ##_set(edit_object, part_name, state_name,
state_val, new_val)) \
- return false; \
+ CRIT_ON_FAIL(edje_edit_state_## FUNC ##_set(edit_object, part_name,
state_name, state_val, new_val)); \
_editor_project_changed(); \
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute); \
} \
@@ -694,8 +676,7 @@ editor_state_## FUNC ##_set(Evas_Object *edit_object,
Change *change, Eina_Bool
} \
if (apply) \
{ \
- if (!edje_edit_state_## FUNC ##_set(edit_object, part_name, state_name,
state_val, new_val)) \
- return false; \
+ CRIT_ON_FAIL(edje_edit_state_## FUNC ##_set(edit_object, part_name,
state_name, state_val, new_val)); \
CRIT_ON_FAIL(editor_save(edit_object)); \
_editor_project_changed(); \
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute); \
@@ -736,8 +717,7 @@ editor_state_## FUNC ##_set(Evas_Object *edit_object,
Change *change, Eina_Bool
} \
if (apply) \
{ \
- if (!edje_edit_state_## FUNC ##_set(edit_object, part_name, state_name,
state_val, new_val)) \
- return false; \
+ CRIT_ON_FAIL(edje_edit_state_## FUNC ##_set(edit_object, part_name,
state_name, state_val, new_val)); \
CRIT_ON_FAIL(editor_save(edit_object)); \
_editor_project_changed(); \
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute); \
@@ -773,8 +753,7 @@ editor_program_## FUNC ##_set(Evas_Object *edit_object,
Change *change, Eina_Boo
} \
if (apply) \
{ \
- if (!edje_edit_program_## REAL_FUNC ##_set(edit_object, program,
new_val)) \
- return false; \
+ CRIT_ON_FAIL(edje_edit_program_## REAL_FUNC ##_set(edit_object,
program, new_val)); \
_editor_project_changed(); \
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute); \
} \
@@ -809,8 +788,7 @@ editor_program_## FUNC ##_set(Evas_Object *edit_object,
Change *change, Eina_Boo
} \
if (apply) \
{ \
- if (!edje_edit_program_## REAL_FUNC ##_set(edit_object, program,
new_val)) \
- return false; \
+ CRIT_ON_FAIL(edje_edit_program_## REAL_FUNC ##_set(edit_object,
program, new_val)); \
_editor_project_changed(); \
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute); \
evas_object_smart_callback_call(ap.win, SIGNAL_EDITOR_PROGRAM_UPDATE,
(void *)program); \
diff --git a/src/bin/editor/editor_part.c b/src/bin/editor/editor_part.c
index 1f9e649..ce6e4e5 100644
--- a/src/bin/editor/editor_part.c
+++ b/src/bin/editor/editor_part.c
@@ -53,8 +53,7 @@ editor_part_text_effect_set(Evas_Object *edit_object, Change
*change, Eina_Bool
}
if (apply)
{
- if (!edje_edit_part_effect_set(edit_object, part_name, (new_val |
edje_edit_part_text_shadow_direction_get(edit_object, part_name))))
- return false;
+ CRIT_ON_FAIL(edje_edit_part_effect_set(edit_object, part_name,
(new_val | edje_edit_part_text_shadow_direction_get(edit_object, part_name))));
_editor_project_changed();
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute);
}
@@ -90,8 +89,7 @@ editor_part_text_shadow_direction_set(Evas_Object
*edit_object, Change *change,
}
if (apply)
{
- if (!edje_edit_part_effect_set(edit_object, part_name, (new_val |
edje_edit_part_text_effect_get(edit_object, part_name))))
- return false;
+ CRIT_ON_FAIL(edje_edit_part_effect_set(edit_object, part_name,
(new_val | edje_edit_part_text_effect_get(edit_object, part_name))));
_editor_project_changed();
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute);
}
@@ -125,8 +123,7 @@ editor_part_ignore_flags_set(Evas_Object *edit_object,
Change *change, Eina_Bool
}
if (apply)
{
- if (!edje_edit_part_ignore_flags_set(edit_object, part_name, new_val))
- return false;
+ CRIT_ON_FAIL(edje_edit_part_ignore_flags_set(edit_object, part_name,
new_val));
_editor_project_changed();
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute);
}
@@ -185,8 +182,7 @@ editor_part_name_set(Evas_Object *edit_object, Change
*change, Eina_Bool merge,
}
if (apply)
{
- if (!edje_edit_part_name_set(edit_object, name, new_val))
- return false;
+ CRIT_ON_FAIL(edje_edit_part_name_set(edit_object, name, new_val));
_editor_project_changed();
ren.old_name = name;
ren.new_name = new_val;
@@ -226,8 +222,7 @@ editor_part_item_aspect_mode_set(Evas_Object *edit_object,
Change *change, Eina_
}
if (apply)
{
- if (!edje_edit_part_item_aspect_mode_set(edit_object, part_name,
item_name, new_val))
- return false;
+ CRIT_ON_FAIL(edje_edit_part_item_aspect_mode_set(edit_object,
part_name, item_name, new_val));
_editor_project_changed();
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute);
}
@@ -285,8 +280,7 @@ editor_part_item_source_set(Evas_Object *edit_object,
Change *change, Eina_Bool
}
if (apply)
{
- if (!edje_edit_part_item_source_set(edit_object, part_name, item_name,
new_val))
- return false;
+ CRIT_ON_FAIL(edje_edit_part_item_source_set(edit_object, part_name,
item_name, new_val));
_editor_project_changed();
CRIT_ON_FAIL(editor_save(edit_object));
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute);
@@ -327,8 +321,7 @@ editor_part_item_padding_left_set(Evas_Object *edit_object,
Change *change, Eina
}
if (apply)
{
- if (!edje_edit_part_item_padding_set(edit_object, part_name,
item_name, n3, o4, o5, o6))
- return false;
+ CRIT_ON_FAIL(edje_edit_part_item_padding_set(edit_object, part_name,
item_name, n3, o4, o5, o6));
_editor_project_changed();
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute);
}
@@ -366,8 +359,7 @@ editor_part_item_padding_right_set(Evas_Object
*edit_object, Change *change, Ein
}
if (apply)
{
- if (!edje_edit_part_item_padding_set(edit_object, part_name,
item_name, o3, n4, o5, o6))
- return false;
+ CRIT_ON_FAIL(edje_edit_part_item_padding_set(edit_object, part_name,
item_name, o3, n4, o5, o6));
_editor_project_changed();
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute);
}
@@ -405,8 +397,7 @@ editor_part_item_padding_top_set(Evas_Object *edit_object,
Change *change, Eina_
}
if (apply)
{
- if (!edje_edit_part_item_padding_set(edit_object, part_name,
item_name, o3, o4, n5, o6))
- return false;
+ CRIT_ON_FAIL(edje_edit_part_item_padding_set(edit_object, part_name,
item_name, o3, o4, n5, o6));
_editor_project_changed();
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute);
}
@@ -444,8 +435,7 @@ editor_part_item_padding_bottom_set(Evas_Object
*edit_object, Change *change, Ei
}
if (apply)
{
- if (!edje_edit_part_item_padding_set(edit_object, part_name,
item_name, o3, o4, o5, n6))
- return false;
+ CRIT_ON_FAIL(edje_edit_part_item_padding_set(edit_object, part_name,
item_name, o3, o4, o5, n6));
_editor_project_changed();
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute);
}
@@ -481,8 +471,7 @@ editor_part_select_mode_set(Evas_Object *edit_object,
Change *change, Eina_Bool
}
if (apply)
{
- if (!edje_edit_part_select_mode_set(edit_object, part_name, new_val))
- return false;
+ CRIT_ON_FAIL(edje_edit_part_select_mode_set(edit_object, part_name,
new_val));
_editor_project_changed();
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute);
}
@@ -516,8 +505,7 @@ editor_part_entry_mode_set(Evas_Object *edit_object, Change
*change, Eina_Bool m
}
if (apply)
{
- if (!edje_edit_part_entry_mode_set(edit_object, part_name, new_val))
- return false;
+ CRIT_ON_FAIL(edje_edit_part_entry_mode_set(edit_object, part_name,
new_val));
_editor_project_changed();
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute);
}
@@ -551,8 +539,7 @@ editor_part_pointer_mode_set(Evas_Object *edit_object,
Change *change, Eina_Bool
}
if (apply)
{
- if (!edje_edit_part_pointer_mode_set(edit_object, part_name, new_val))
- return false;
+ CRIT_ON_FAIL(edje_edit_part_pointer_mode_set(edit_object, part_name,
new_val));
_editor_project_changed();
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute);
}
@@ -586,8 +573,7 @@ editor_part_cursor_mode_set(Evas_Object *edit_object,
Change *change, Eina_Bool
}
if (apply)
{
- if (!edje_edit_part_cursor_mode_set(edit_object, part_name, new_val))
- return false;
+ CRIT_ON_FAIL(edje_edit_part_cursor_mode_set(edit_object, part_name,
new_val));
_editor_project_changed();
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute);
}
@@ -671,12 +657,11 @@ editor_part_item_append(Evas_Object *edit_object, Change
*change, Eina_Bool merg
}
if (apply)
{
- if (!edje_edit_part_item_append(edit_object, part_name, item_name,
source_group))
- return false;
+ CRIT_ON_FAIL(edje_edit_part_item_append(edit_object, part_name,
item_name, source_group));
/* fixing incorrect default item position */
- edje_edit_part_item_position_row_set(edit_object, part_name,
item_name, 0);
- edje_edit_part_item_position_col_set(edit_object, part_name,
item_name, 0);
+ CRIT_ON_FAIL(edje_edit_part_item_position_row_set(edit_object,
part_name, item_name, 0));
+ CRIT_ON_FAIL(edje_edit_part_item_position_col_set(edit_object,
part_name, item_name, 0));
CRIT_ON_FAIL(editor_save(edit_object));
_editor_project_changed();
@@ -723,12 +708,7 @@ editor_part_item_del(Evas_Object *edit_object, Change
*change, Eina_Bool merge _
}
if (apply)
{
- if (!edje_edit_part_item_del(edit_object, part_name, item_name))
- {
- eina_stringshare_del(event_info.part_name);
- eina_stringshare_del(event_info.item_name);
- return false;
- }
+ CRIT_ON_FAIL(edje_edit_part_item_del(edit_object, part_name,
item_name));
CRIT_ON_FAIL(editor_save(edit_object));
_editor_project_changed();
eina_stringshare_del(event_info.part_name);
@@ -893,8 +873,7 @@ editor_part_add(Evas_Object *edit_object, Change *change,
Eina_Bool merge __UNUS
}
if (apply)
{
- if (!edje_edit_part_add(edit_object, part_name, type))
- return false;
+ CRIT_ON_FAIL(edje_edit_part_add(edit_object, part_name, type));
CRIT_ON_FAIL(editor_save(edit_object));
_editor_project_changed();
@@ -902,7 +881,7 @@ editor_part_add(Evas_Object *edit_object, Change *change,
Eina_Bool merge __UNUS
/* fix incorrect default values */
TODO("Fix edje_edit")
if (type == EDJE_PART_TYPE_BOX)
- edje_edit_state_box_layout_set(edit_object, part_name, "default",
0.0, "horizontal");
+ CRIT_ON_FAIL(edje_edit_state_box_layout_set(edit_object,
part_name, "default", 0.0, "horizontal"));
/* apply our default values */
if (!editor_part_reset(edit_object, NULL, apply, part_name))
@@ -939,8 +918,7 @@ editor_part_copy(Evas_Object *edit_object, Change *change,
Eina_Bool merge __UNU
}
if (apply)
{
- if (!edje_edit_part_copy(edit_object, part_name, part_name_copy))
- return false;
+ CRIT_ON_FAIL(edje_edit_part_copy(edit_object, part_name,
part_name_copy));
CRIT_ON_FAIL(editor_save(edit_object));
_editor_project_changed();
@@ -984,11 +962,7 @@ _editor_part_del(Evas_Object *edit_object, Change *change,
Eina_Bool merge __UNU
}
if (apply)
{
- if (!edje_edit_part_del(edit_object, part_name))
- {
- eina_stringshare_del(event_info);
- return false;
- }
+ CRIT_ON_FAIL(edje_edit_part_del(edit_object, part_name));
eina_stringshare_del(event_info);
CRIT_ON_FAIL(editor_save(edit_object));
_editor_project_changed();
@@ -1035,16 +1009,14 @@ editor_part_restack(Evas_Object *edit_object, Change
*change, Eina_Bool merge, E
{
if (relative_part)
{
- if (!edje_edit_part_restack_part_below(edit_object, part_name,
relative_part))
- return false;
+ CRIT_ON_FAIL(edje_edit_part_restack_part_below(edit_object,
part_name, relative_part));
}
else
{
/* edje_edit don't allows to restack_above part that is already
on top,
but it is needed to simplify adding part deletion to history */
if (old_relative_part != NULL)
- if (!edje_edit_part_restack_above(edit_object, part_name))
- return false;
+ CRIT_ON_FAIL(edje_edit_part_restack_above(edit_object,
part_name));
}
_editor_project_changed();
@@ -1187,8 +1159,7 @@ editor_part_selected_state_set(Evas_Object *edit_object,
Change *change, Eina_Bo
}
if (apply)
{
- if (!edje_edit_part_selected_state_set(edit_object, part_name,
state_name, state_val))
- return false;
+ CRIT_ON_FAIL(edje_edit_part_selected_state_set(edit_object, part_name,
state_name, state_val));
if (!_editor_signals_blocked)
{
event_info.part_name = eina_stringshare_add(part_name);
diff --git a/src/bin/editor/editor_program.c b/src/bin/editor/editor_program.c
index 052d604..4b12d3a 100644
--- a/src/bin/editor/editor_program.c
+++ b/src/bin/editor/editor_program.c
@@ -78,8 +78,7 @@ editor_program_transition_type_set(Evas_Object *edit_object,
Change *change, Ein
{
if (editor_program_transition_from_current_get(edit_object, program))
new_val = new_val | EDJE_TWEEN_MODE_OPT_FROM_CURRENT;
- if (!edje_edit_program_transition_set(edit_object, program, new_val))
- return false;
+ CRIT_ON_FAIL(edje_edit_program_transition_set(edit_object, program,
new_val));
_editor_project_changed();
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute);
}
@@ -119,8 +118,7 @@ editor_program_transition_from_current_set(Evas_Object
*edit_object, Change *cha
mode = editor_program_transition_type_get(edit_object, program);
if (new_val)
mode = mode | EDJE_TWEEN_MODE_OPT_FROM_CURRENT;
- if (!edje_edit_program_transition_set(edit_object, program, mode))
- return false;
+ CRIT_ON_FAIL(edje_edit_program_transition_set(edit_object, program,
mode));
_editor_project_changed();
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute);
}
@@ -154,8 +152,7 @@ editor_program_channel_set(Evas_Object *edit_object, Change
*change, Eina_Bool m
}
if (apply)
{
- if (!edje_edit_program_channel_set(edit_object, program, new_val))
- return false;
+ CRIT_ON_FAIL(edje_edit_program_channel_set(edit_object, program,
new_val));
_editor_project_changed();
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute);
}
@@ -223,13 +220,11 @@ editor_program_transition_factor_set(Evas_Object
*edit_object, Change *change, E
{
if (type == EDJE_TWEEN_MODE_DIVISOR_INTERP)
{
- if (!edje_edit_program_transition_value2_set(edit_object,
program, new_val))
- return false;
+ CRIT_ON_FAIL(edje_edit_program_transition_value2_set(edit_object,
program, new_val));
}
else
{
- if (!edje_edit_program_transition_value1_set(edit_object,
program, new_val))
- return false;
+ CRIT_ON_FAIL(edje_edit_program_transition_value1_set(edit_object,
program, new_val));
}
_editor_project_changed();
@@ -281,8 +276,7 @@ editor_program_transition_gradient_set(Evas_Object
*edit_object, Change *change,
}
if (apply)
{
- if (!edje_edit_program_transition_value1_set(edit_object, program,
new_val))
- return false;
+ CRIT_ON_FAIL(edje_edit_program_transition_value1_set(edit_object,
program, new_val));
_editor_project_changed();
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute);
}
@@ -334,8 +328,7 @@ editor_program_transition_decay_set(Evas_Object
*edit_object, Change *change, Ei
}
if (apply)
{
- if (!edje_edit_program_transition_value1_set(edit_object, program,
new_val))
- return false;
+ CRIT_ON_FAIL(edje_edit_program_transition_value1_set(edit_object,
program, new_val));
_editor_project_changed();
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute);
}
@@ -385,8 +378,7 @@ editor_program_transition_bounces_set(Evas_Object
*edit_object, Change *change,
}
if (apply)
{
- if (!edje_edit_program_transition_value2_set(edit_object, program,
new_val))
- return false;
+ CRIT_ON_FAIL(edje_edit_program_transition_value2_set(edit_object,
program, new_val));
_editor_project_changed();
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute);
}
@@ -436,8 +428,7 @@ editor_program_transition_swings_set(Evas_Object
*edit_object, Change *change, E
}
if (apply)
{
- if (!edje_edit_program_transition_value2_set(edit_object, program,
new_val))
- return false;
+ CRIT_ON_FAIL(edje_edit_program_transition_value2_set(edit_object,
program, new_val));
_editor_project_changed();
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute);
}
@@ -488,8 +479,7 @@ editor_program_transition_bezier_## VAL ##_set(Evas_Object
*edit_object, Change
} \
if (apply) \
{ \
- if (!edje_edit_program_transition_value## REAL_VAL##_set(edit_object,
program, new_val)) \
- return false; \
+ CRIT_ON_FAIL(edje_edit_program_transition_value##
REAL_VAL##_set(edit_object, program, new_val)); \
_editor_project_changed(); \
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute); \
} \
@@ -547,8 +537,7 @@ editor_program_name_set(Evas_Object *edit_object, Change
*change, Eina_Bool merg
}
if (apply)
{
- if (!edje_edit_program_name_set(edit_object, name, new_val))
- return false;
+ CRIT_ON_FAIL(edje_edit_program_name_set(edit_object, name, new_val));
_editor_project_changed();
ren.old_name = name;
ren.new_name = new_val;
@@ -585,8 +574,7 @@ editor_program_target_add(Evas_Object *edit_object, Change
*change, Eina_Bool me
}
if (apply)
{
- if (!edje_edit_program_target_add(edit_object, program_name, target))
- return false;
+ CRIT_ON_FAIL(edje_edit_program_target_add(edit_object, program_name,
target));
_editor_project_changed();
if (!_editor_signals_blocked)
evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute);
@@ -620,8 +608,7 @@ editor_program_target_del(Evas_Object *edit_object, Change
*change, Eina_Bool me
}
if (apply)
{
- if (!edje_edit_program_target_del(edit_object, program_name, target))
- return false;
+ CRIT_ON_FAIL(edje_edit_program_target_del(edit_object, program_name,
target));
_editor_project_changed();
if (!_editor_signals_blocked)
evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute);
@@ -656,8 +643,7 @@ editor_program_after_add(Evas_Object *edit_object, Change
*change, Eina_Bool mer
}
if (apply)
{
- if (!edje_edit_program_after_add(edit_object, program_name, after))
- return false;
+ CRIT_ON_FAIL(edje_edit_program_after_add(edit_object, program_name,
after));
_editor_project_changed();
if (!_editor_signals_blocked)
evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute);
@@ -691,8 +677,7 @@ editor_program_after_del(Evas_Object *edit_object, Change
*change, Eina_Bool mer
}
if (apply)
{
- if (!edje_edit_program_after_del(edit_object, program_name, after))
- return false;
+ CRIT_ON_FAIL(edje_edit_program_after_del(edit_object, program_name,
after));
_editor_project_changed();
if (!_editor_signals_blocked)
evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute);
@@ -826,10 +811,8 @@ editor_program_add(Evas_Object *edit_object, Change
*change, Eina_Bool merge __U
}
if (apply)
{
- if (!edje_edit_program_add(edit_object, program_name))
- return false;
- if (!edje_edit_program_action_set(edit_object, program_name, type))
- return false;
+ CRIT_ON_FAIL(edje_edit_program_add(edit_object, program_name));
+ CRIT_ON_FAIL(edje_edit_program_action_set(edit_object, program_name,
type));
CRIT_ON_FAIL(editor_save(edit_object));
_editor_project_changed();
@@ -872,11 +855,7 @@ _editor_program_del(Evas_Object *edit_object, Change
*change, Eina_Bool merge __
}
if (apply)
{
- if (!edje_edit_program_del(edit_object, program_name))
- {
- eina_stringshare_del(event_info);
- return false;
- }
+ CRIT_ON_FAIL(edje_edit_program_del(edit_object, program_name));
eina_stringshare_del(event_info);
CRIT_ON_FAIL(editor_save(edit_object));
_editor_project_changed();
diff --git a/src/bin/editor/editor_states.c b/src/bin/editor/editor_states.c
index 89757d8..dbf7713 100644
--- a/src/bin/editor/editor_states.c
+++ b/src/bin/editor/editor_states.c
@@ -97,8 +97,7 @@ editor_state_max_## VAL ##_set(Evas_Object *edit_object,
Change *change, Eina_Bo
} \
if (apply) \
{ \
- if (!edje_edit_state_max_## VAL ##_set(edit_object, part_name,
state_name, state_val, new_value)) \
- return false; \
+ CRIT_ON_FAIL(edje_edit_state_max_## VAL ##_set(edit_object, part_name,
state_name, state_val, new_value)); \
_editor_project_changed(); \
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute); \
} \
@@ -149,8 +148,7 @@ editor_state_min_## VAL ##_set(Evas_Object *edit_object,
Change *change, Eina_Bo
} \
if (apply) \
{ \
- if (!edje_edit_state_min_## VAL ##_set(edit_object, part_name,
state_name, state_val, new_value)) \
- return false; \
+ CRIT_ON_FAIL(edje_edit_state_min_## VAL ##_set(edit_object, part_name,
state_name, state_val, new_value)); \
_editor_project_changed(); \
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute); \
} \
@@ -218,8 +216,7 @@ editor_state_map_rotation_x_set(Evas_Object *edit_object,
Change *change, Eina_B
}
if (apply)
{
- if (!edje_edit_state_map_rotation_set(edit_object, part_name,
state_name, state_val, n4, o5, o6))
- return false;
+ CRIT_ON_FAIL(edje_edit_state_map_rotation_set(edit_object, part_name,
state_name, state_val, n4, o5, o6));
_editor_project_changed();
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute);
}
@@ -259,8 +256,7 @@ editor_state_map_rotation_y_set(Evas_Object *edit_object,
Change *change, Eina_B
}
if (apply)
{
- if (!edje_edit_state_map_rotation_set(edit_object, part_name,
state_name, state_val, o4, n5, o6))
- return false;
+ CRIT_ON_FAIL(edje_edit_state_map_rotation_set(edit_object, part_name,
state_name, state_val, o4, n5, o6));
_editor_project_changed();
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute);
}
@@ -300,8 +296,7 @@ editor_state_map_rotation_z_set(Evas_Object *edit_object,
Change *change, Eina_B
}
if (apply)
{
- if (!edje_edit_state_map_rotation_set(edit_object, part_name,
state_name, state_val, o4, o5, n6))
- return false;
+ CRIT_ON_FAIL(edje_edit_state_map_rotation_set(edit_object, part_name,
state_name, state_val, o4, o5, n6));
_editor_project_changed();
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute);
}
@@ -361,8 +356,7 @@ editor_state_image_border_left_set(Evas_Object
*edit_object, Change *change, Ein
}
if (apply)
{
- if (!edje_edit_state_image_border_set(edit_object, part_name,
state_name, state_val, n4, o5, o6, o7))
- return false;
+ CRIT_ON_FAIL(edje_edit_state_image_border_set(edit_object, part_name,
state_name, state_val, n4, o5, o6, o7));
_editor_project_changed();
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute);
}
@@ -402,8 +396,7 @@ editor_state_image_border_right_set(Evas_Object
*edit_object, Change *change, Ei
}
if (apply)
{
- if (!edje_edit_state_image_border_set(edit_object, part_name,
state_name, state_val, o4, n5, o6, o7))
- return false;
+ CRIT_ON_FAIL(edje_edit_state_image_border_set(edit_object, part_name,
state_name, state_val, o4, n5, o6, o7));
_editor_project_changed();
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute);
}
@@ -443,8 +436,7 @@ editor_state_image_border_top_set(Evas_Object *edit_object,
Change *change, Eina
}
if (apply)
{
- if (!edje_edit_state_image_border_set(edit_object, part_name,
state_name, state_val, o4, o5, n6, o7))
- return false;
+ CRIT_ON_FAIL(edje_edit_state_image_border_set(edit_object, part_name,
state_name, state_val, o4, o5, n6, o7));
_editor_project_changed();
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute);
}
@@ -484,8 +476,7 @@ editor_state_image_border_bottom_set(Evas_Object
*edit_object, Change *change, E
}
if (apply)
{
- if (!edje_edit_state_image_border_set(edit_object, part_name,
state_name, state_val, o4, o5, o6, n7))
- return false;
+ CRIT_ON_FAIL(edje_edit_state_image_border_set(edit_object, part_name,
state_name, state_val, o4, o5, o6, n7));
_editor_project_changed();
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute);
}
@@ -534,8 +525,7 @@ editor_state_tween_add(Evas_Object *edit_object, Change
*change, Eina_Bool merge
}
if (apply)
{
- if (!edje_edit_state_tween_add(edit_object, part_name, state_name,
state_val, name))
- return false;
+ CRIT_ON_FAIL(edje_edit_state_tween_add(edit_object, part_name,
state_name, state_val, name));
_editor_project_changed();
if (!_editor_signals_blocked)
evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute);
@@ -574,8 +564,7 @@ editor_state_tween_del(Evas_Object *edit_object, Change
*change, Eina_Bool merge
}
if (apply)
{
- if (!edje_edit_state_tween_del(edit_object, part_name, state_name,
state_val, name))
- return false;
+ CRIT_ON_FAIL(edje_edit_state_tween_del(edit_object, part_name,
state_name, state_val, name));
_editor_project_changed();
if (!_editor_signals_blocked)
evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute);
@@ -744,14 +733,13 @@ editor_state_add(Evas_Object *edit_object, Change
*change, Eina_Bool merge __UNU
}
if (apply)
{
- if (!edje_edit_state_add(edit_object, part_name, state_name,
state_val))
- return false;
+ CRIT_ON_FAIL(edje_edit_state_add(edit_object, part_name, state_name,
state_val));
/* fix incorrect default values */
TODO("Fix edje_edit")
type = edje_edit_part_type_get(edit_object, part_name);
if (type == EDJE_PART_TYPE_BOX)
- edje_edit_state_box_layout_set(edit_object, part_name, state_name,
state_val, "horizontal");
+ CRIT_ON_FAIL(edje_edit_state_box_layout_set(edit_object, part_name,
state_name, state_val, "horizontal"));
/* apply our default values */
if (!editor_state_reset(edit_object, NULL, apply, part_name,
state_name, state_val))
@@ -798,8 +786,7 @@ editor_state_copy(Evas_Object *edit_object, Change *change,
Eina_Bool merge __UN
}
if (apply)
{
- if (!edje_edit_state_copy(edit_object, part_name, from_name, from_val,
state_name, state_val))
- return false;
+ CRIT_ON_FAIL(edje_edit_state_copy(edit_object, part_name, from_name,
from_val, state_name, state_val));
_editor_project_changed();
event_info.part_name = eina_stringshare_add(part_name);
event_info.state_name = eina_stringshare_add(state_name);
@@ -844,12 +831,7 @@ editor_state_del(Evas_Object *edit_object, Change *change,
Eina_Bool merge __UNU
}
if (apply)
{
- if (!edje_edit_state_del(edit_object, part_name, state_name,
state_val))
- {
- eina_stringshare_del(event_info.part_name);
- eina_stringshare_del(event_info.state_name);
- return false;
- }
+ CRIT_ON_FAIL(edje_edit_state_del(edit_object, part_name, state_name,
state_val));
_editor_project_changed();
eina_stringshare_del(event_info.part_name);
eina_stringshare_del(event_info.state_name);
diff --git a/src/bin/editor/editor_text.c b/src/bin/editor/editor_text.c
index 62507bb..837b9c8 100644
--- a/src/bin/editor/editor_text.c
+++ b/src/bin/editor/editor_text.c
@@ -64,8 +64,7 @@ editor_state_text_size_set(Evas_Object *edit_object, Change
*change, Eina_Bool m
}
if (apply)
{
- if (!edje_edit_state_text_size_set(edit_object, part_name, state_name,
state_val, new_val))
- return false;
+ CRIT_ON_FAIL(edje_edit_state_text_size_set(edit_object, part_name,
state_name, state_val, new_val));
_editor_project_changed();
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute);
}
@@ -118,8 +117,7 @@ editor_state_text_set(Evas_Object *edit_object, Change
*change, Eina_Bool merge,
}
if (apply)
{
- if (!edje_edit_state_text_set(edit_object, part_name, state_name,
state_val, new_val ? new_val : ""))
- return false;
+ CRIT_ON_FAIL(edje_edit_state_text_set(edit_object, part_name,
state_name, state_val, new_val ? new_val : ""));
_editor_project_changed();
if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win,
SIGNAL_EDITOR_ATTRIBUTE_CHANGED, &attribute);
}
--
