From 2a7f105194f1883896a6263b23ed3f6ea137527f Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Wed, 25 Nov 2009 01:10:11 +0000 Subject: [PATCH] If CLANG needs this return there, then don't create o_control until after in case we do actually hit this return. SVN revision: 43967 --- src/bin/e_gadcon.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c index f032f2f39..d349413bd 100644 --- a/src/bin/e_gadcon.c +++ b/src/bin/e_gadcon.c @@ -903,16 +903,18 @@ e_gadcon_client_edit_begin(E_Gadcon_Client *gcc) E_OBJECT_CHECK(gcc); E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE); if (gcc->o_control) return; - e_gadcon_locked_set(gcc->gadcon, 1); - gcc->gadcon->editing = 1; - gcc->o_control = edje_object_add(gcc->gadcon->evas); - evas_object_layer_set(gcc->o_control, 100); + if (gcc->o_frame) evas_object_geometry_get(gcc->o_frame, &x, &y, &w, &h); else if (gcc->o_base) evas_object_geometry_get(gcc->o_base, &x, &y, &w, &h); -// FIXME -// else return; /* make clang happy */ + else return; /* make clang happy */ + + gcc->o_control = edje_object_add(gcc->gadcon->evas); + evas_object_layer_set(gcc->o_control, 100); + e_gadcon_locked_set(gcc->gadcon, 1); + gcc->gadcon->editing = 1; + evas_object_move(gcc->o_control, x, y); evas_object_resize(gcc->o_control, w, h); e_theme_edje_object_set(gcc->o_control, "base/theme/gadman",