From 7feafe0d7af27d0110bdbeba7e96126d6d38e080 Mon Sep 17 00:00:00 2001 From: prince Date: Fri, 23 Sep 2011 17:31:18 +0900 Subject: [PATCH] [Conformant] If no information of illumne geometry then, resetting the geometry. Change-Id: Ic365c17352365a0becde5fd4d0d121682c7ebcb7 --- src/lib/elm_conform.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c index d5faa27..823c723 100644 --- a/src/lib/elm_conform.c +++ b/src/lib/elm_conform.c @@ -158,6 +158,7 @@ _conformant_part_sizing_eval(Evas_Object *obj, Conformant_Part_Type part_type) { Ecore_X_Window zone, xwin; Evas_Object *top; + Eina_Bool ret; int sx = -1, sy = -1, sw = -1, sh = -1; Widget_Data *wd = elm_widget_data_get(obj); @@ -170,18 +171,27 @@ _conformant_part_sizing_eval(Evas_Object *obj, Conformant_Part_Type part_type) if (part_type & ELM_CONFORM_INDICATOR_PART) { - ecore_x_e_illume_indicator_geometry_get(zone, &sx, &sy, &sw, &sh); - _conformant_part_size_set(obj, wd->shelf, sx, sy, sw, sh); + ret = ecore_x_e_illume_indicator_geometry_get(zone, &sx, &sy, &sw, &sh); + if (!ret) //There is NO information of the indicator geometry, reset the geometry. + _conformant_part_size_set(obj, wd->shelf, 0, 0, 0, 0); + else + _conformant_part_size_set(obj, wd->shelf, sx, sy, sw, sh); } if (part_type & ELM_CONFORM_VIRTUAL_KEYPAD_PART) { - ecore_x_e_illume_keyboard_geometry_get(zone, &sx, &sy, &sw, &sh); - _conformant_part_size_set(obj,wd->virtualkeypad, sx, sy, sw, sh); + ret = ecore_x_e_illume_keyboard_geometry_get(zone, &sx, &sy, &sw, &sh); + if (!ret) //There is NO information of the keyboard geometry, reset the geometry. + _conformant_part_size_set(obj, wd->virtualkeypad, 0, 0, 0, 0); + else + _conformant_part_size_set(obj,wd->virtualkeypad, sx, sy, sw, sh); } if (part_type & ELM_CONFORM_SOFTKEY_PART) { - ecore_x_e_illume_softkey_geometry_get(zone, &sx, &sy, &sw, &sh); - _conformant_part_size_set(obj, wd->panel, sx, sy, sw, sh); + ret = ecore_x_e_illume_softkey_geometry_get(zone, &sx, &sy, &sw, &sh); + if (!ret) //There is NO information of the softkey geometry, reset the geometry. + _conformant_part_size_set(obj,wd->panel, 0, 0, 0, 0); + else + _conformant_part_size_set(obj, wd->panel, sx, sy, sw, sh); } } #endif -- 2.7.4