yakov pushed a commit to branch master.
http://git.enlightenment.org/tools/erigo.git/commit/?id=fd596b976a6b623d3e305ee5aef3531d932e0339
commit fd596b976a6b623d3e305ee5aef3531d932e0339
Author: Yakov Goldberg <yako...@samsung.com>
Date: Tue Nov 24 16:45:38 2015 +0200
Remove unneeded check
In general it can not happen, that 'new_wdg' is NULL.
Even if it happens, something is terribly wrong and NULL check
should be in another place.
---
src/bin/gui/editor.c | 200 +++++++++++++++++++++++++--------------------------
1 file changed, 97 insertions(+), 103 deletions(-)
diff --git a/src/bin/gui/editor.c b/src/bin/gui/editor.c
index 8340450..0bc4f73 100644
--- a/src/bin/gui/editor.c
+++ b/src/bin/gui/editor.c
@@ -1755,128 +1755,122 @@ _drop_target_drop(Gui_Widget *drop_target_wdg, Eo
*canvas_drop_target, const cha
/* Dragging into win */
else if (drop_to_wdg == DROP_TO_WIN)
{
- if (new_wdg)
- {
- /* When dropping to window, new widget will be dropeed as resize
object.*/
- Object_Container *_old_container, *_new_container;
- _old_container = (Object_Container *)
wdg_obj_container_get(drop_target_wdg);
- _new_container = obj_container_copy(_old_container);
-
- memento_command_add(wdg_eid_get(drop_target_wdg),
- MEMENTO_OBJ_CONTAINER,
- _old_container, _new_container);
- /* Current memento is a memento created, during _factory
_widget_create earlier in this func. */
- wdg_obj_container_unset(drop_target_wdg);
- wdg_obj_container_set(drop_target_wdg, _new_container);
-
- const Op_Desc *op_desc =
db_container_desc_op_desc_get(db_container_desc_get(wdg_class_name_get(drop_target_wdg)),
CONTAINER_PACK);
- Gui_Widget_Property *prop = prop_create_for_op(op_desc);
- Gui_Value *val = prop_value_nth_get(prop, 0);
- gui_value_name_id_set(val, GUI_TYPE_OBJECT, wdg_eid_get(new_wdg));
-
- Object_Container_Item *ci = obj_container_item_new(prop,
wdg_eid_get(new_wdg));
- wdg_obj_container_item_add(drop_target_wdg, ci, -1);
-
- /* Commeting out positioning of dropped widget.
- * This part makes sens when DnD inside window changes position.
*/
+ /* When dropping to window, new widget will be dropeed as resize
object.*/
+ Object_Container *_old_container, *_new_container;
+ _old_container = (Object_Container *)
wdg_obj_container_get(drop_target_wdg);
+ _new_container = obj_container_copy(_old_container);
+
+ memento_command_add(wdg_eid_get(drop_target_wdg),
+ MEMENTO_OBJ_CONTAINER,
+ _old_container, _new_container);
+ /* Current memento is a memento created, during _factory
_widget_create earlier in this func. */
+ wdg_obj_container_unset(drop_target_wdg);
+ wdg_obj_container_set(drop_target_wdg, _new_container);
+
+ const Op_Desc *op_desc =
db_container_desc_op_desc_get(db_container_desc_get(wdg_class_name_get(drop_target_wdg)),
CONTAINER_PACK);
+ Gui_Widget_Property *prop = prop_create_for_op(op_desc);
+ Gui_Value *val = prop_value_nth_get(prop, 0);
+ gui_value_name_id_set(val, GUI_TYPE_OBJECT, wdg_eid_get(new_wdg));
+
+ Object_Container_Item *ci = obj_container_item_new(prop,
wdg_eid_get(new_wdg));
+ wdg_obj_container_item_add(drop_target_wdg, ci, -1);
+
+ /* Commeting out positioning of dropped widget.
+ * This part makes sens when DnD inside window changes position. */
#if 0
+ {
+ Gui_Widget_Property *old_prop, *prop;
+ Gui_Value *val;
+ old_prop = wdg_prop_get(new_wdg, DB_DEF_EFL_GFX_BASE_CLASS,
POSITION_SET);
+ if (!old_prop)
{
- Gui_Widget_Property *old_prop, *prop;
- Gui_Value *val;
- old_prop = wdg_prop_get(new_wdg, DB_DEF_EFL_GFX_BASE_CLASS,
POSITION_SET);
- if (!old_prop)
- {
- Op_Desc *op =
db_mro_op_desc_get(wdg_class_name_get(new_wdg), DB_DEF_EFL_GFX_BASE_CLASS,
POSITION_SET);
- prop = prop_create_for_op(op);
- }
- else
- {
- prop = prop_copy(old_prop);
- }
+ Op_Desc *op =
db_mro_op_desc_get(wdg_class_name_get(new_wdg), DB_DEF_EFL_GFX_BASE_CLASS,
POSITION_SET);
+ prop = prop_create_for_op(op);
+ }
+ else
+ {
+ prop = prop_copy(old_prop);
+ }
- val = prop_value_nth_get(prop, 0);
- gui_value_int_set(val, drop_x);
- val = prop_value_nth_get(prop, 1);
- gui_value_int_set(val, drop_y);
- propview_item_update(prop);
+ val = prop_value_nth_get(prop, 0);
+ gui_value_int_set(val, drop_x);
+ val = prop_value_nth_get(prop, 1);
+ gui_value_int_set(val, drop_y);
+ propview_item_update(prop);
- memento_command_add(wdg_eid_get(new_wdg), MEMENTO_PROPERTY,
old_prop, prop);
+ memento_command_add(wdg_eid_get(new_wdg), MEMENTO_PROPERTY,
old_prop, prop);
- if (old_prop)
- {
- wdg_prop_remove((Gui_Widget *) new_wdg, old_prop);
- }
- wdg_prop_add((Gui_Widget *) new_wdg, prop);
+ if (old_prop)
+ {
+ wdg_prop_remove((Gui_Widget *) new_wdg, old_prop);
}
-#endif
+ wdg_prop_add((Gui_Widget *) new_wdg, prop);
}
+#endif
}
else if (drop_to_wdg == DROP_TO_LAYOUT)
{
- if (new_wdg)
+ if (di->drop_to_item)
{
- if (di->drop_to_item)
+ Object_Container_Item *cit =
wdg_obj_container_item_get(drop_target_wdg, -1, eid_name_get(di->drop_to_item));
+ if (cit)
{
- Object_Container_Item *cit =
wdg_obj_container_item_get(drop_target_wdg, -1, eid_name_get(di->drop_to_item));
- if (cit)
- {
- Object_Container *_old_container, *_new_container;
- Gui_Widget_Property *i_prop, *new_prop;
- Gui_Value *val;
-
- _old_container = (Object_Container *)
wdg_obj_container_get(drop_target_wdg);
- _new_container = obj_container_copy(_old_container);
-
- memento_command_add(wdg_eid_get(drop_target_wdg),
- MEMENTO_OBJ_CONTAINER,
- _old_container, _new_container);
- wdg_obj_container_unset(drop_target_wdg);
- wdg_obj_container_set(drop_target_wdg, _new_container);
-
- i_prop = obj_container_item_prop_get(cit);
- new_prop = prop_copy(i_prop);
- val = prop_value_nth_get(new_prop, 1);
- /* Assign new widget as container item. */
- gui_value_name_id_set(val, GUI_TYPE_OBJECT,
wdg_eid_get(new_wdg));
- Object_Container_Item *ci =
obj_container_item_new(new_prop, wdg_eid_get(new_wdg));
-
- /* Get index of old item. */
- int idx =
wdg_obj_container_item_idx_get(drop_target_wdg, di->drop_to_item, EINA_FALSE);
- wdg_obj_container_item_remove(drop_target_wdg, cit);
- wdg_obj_container_item_add(drop_target_wdg, ci, idx);
- if (eid_is_dummy(di->drop_to_item))
- memento_command_add(di->drop_to_item, MEMENTO_WIDGET,
(void *) (intptr_t) EINA_TRUE, (void *) (intptr_t) EINA_FALSE);
- }
+ Object_Container *_old_container, *_new_container;
+ Gui_Widget_Property *i_prop, *new_prop;
+ Gui_Value *val;
+
+ _old_container = (Object_Container *)
wdg_obj_container_get(drop_target_wdg);
+ _new_container = obj_container_copy(_old_container);
+
+ memento_command_add(wdg_eid_get(drop_target_wdg),
+ MEMENTO_OBJ_CONTAINER,
+ _old_container, _new_container);
+ wdg_obj_container_unset(drop_target_wdg);
+ wdg_obj_container_set(drop_target_wdg, _new_container);
+
+ i_prop = obj_container_item_prop_get(cit);
+ new_prop = prop_copy(i_prop);
+ val = prop_value_nth_get(new_prop, 1);
+ /* Assign new widget as container item. */
+ gui_value_name_id_set(val, GUI_TYPE_OBJECT,
wdg_eid_get(new_wdg));
+ Object_Container_Item *ci = obj_container_item_new(new_prop,
wdg_eid_get(new_wdg));
+
+ /* Get index of old item. */
+ int idx = wdg_obj_container_item_idx_get(drop_target_wdg,
di->drop_to_item, EINA_FALSE);
+ wdg_obj_container_item_remove(drop_target_wdg, cit);
+ wdg_obj_container_item_add(drop_target_wdg, ci, idx);
+ if (eid_is_dummy(di->drop_to_item))
+ memento_command_add(di->drop_to_item, MEMENTO_WIDGET,
(void *) (intptr_t) EINA_TRUE, (void *) (intptr_t) EINA_FALSE);
+ }
+ }
+ else
+ {
+ Gui_Widget_Property *old_prop, *prop;
+ Gui_Value *val;
+ old_prop = wdg_prop_get(new_wdg, DB_DEF_EFL_GFX_BASE_CLASS,
POSITION_SET);
+ if (!old_prop)
+ {
+ Op_Desc *op =
db_mro_op_desc_get(wdg_class_name_get(new_wdg), DB_DEF_EFL_GFX_BASE_CLASS,
POSITION_SET);
+ prop = prop_create_for_op(op);
}
else
{
- Gui_Widget_Property *old_prop, *prop;
- Gui_Value *val;
- old_prop = wdg_prop_get(new_wdg, DB_DEF_EFL_GFX_BASE_CLASS,
POSITION_SET);
- if (!old_prop)
- {
- Op_Desc *op =
db_mro_op_desc_get(wdg_class_name_get(new_wdg), DB_DEF_EFL_GFX_BASE_CLASS,
POSITION_SET);
- prop = prop_create_for_op(op);
- }
- else
- {
- prop = prop_copy(old_prop);
- }
+ prop = prop_copy(old_prop);
+ }
- val = prop_value_nth_get(prop, 0);
- gui_value_int_set(val, drop_x);
- val = prop_value_nth_get(prop, 1);
- gui_value_int_set(val, drop_y);
- propview_item_update(prop);
+ val = prop_value_nth_get(prop, 0);
+ gui_value_int_set(val, drop_x);
+ val = prop_value_nth_get(prop, 1);
+ gui_value_int_set(val, drop_y);
+ propview_item_update(prop);
- memento_command_add(wdg_eid_get(new_wdg), MEMENTO_PROPERTY,
old_prop, prop);
+ memento_command_add(wdg_eid_get(new_wdg), MEMENTO_PROPERTY,
old_prop, prop);
- if (old_prop)
- {
- wdg_prop_remove((Gui_Widget *) new_wdg, old_prop);
- }
- wdg_prop_add((Gui_Widget *) new_wdg, prop);
+ if (old_prop)
+ {
+ wdg_prop_remove((Gui_Widget *) new_wdg, old_prop);
}
+ wdg_prop_add((Gui_Widget *) new_wdg, prop);
}
}
else if (drop_to_wdg == DROP_TO_BOX)
--
