Index: src/lib/Elementary.h.in =================================================================== --- src/lib/Elementary.h.in (revision 58961) +++ src/lib/Elementary.h.in (working copy) @@ -2495,6 +2495,7 @@ extern "C" { EAPI void elm_conformant_content_set(Evas_Object *obj, Evas_Object *content) EINA_ARG_NONNULL(1); EAPI Evas_Object *elm_conformant_content_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); EAPI Evas_Object *elm_conformant_content_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); + EAPI Evas_Object *elm_conformant_content_area_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); /* mapbuf */ EAPI Evas_Object *elm_mapbuf_add(Evas_Object *parent) EINA_ARG_NONNULL(1); Index: src/lib/elm_conform.c =================================================================== --- src/lib/elm_conform.c (revision 58961) +++ src/lib/elm_conform.c (working copy) @@ -5,7 +5,7 @@ * @defgroup Conformant Conformant * * The aim is to provide a widget that can be used in elementary apps to - * account for space taken up by the indicator & softkey windows when running + * account for space taken up by the indicator, virtual keypad & softkey windows when running * the illume2 module of E17. */ @@ -13,9 +13,13 @@ typedef struct _Widget_Data Widget_Data; struct _Widget_Data { Evas_Object *base; - Evas_Object *shelf, *panel; + Evas_Object *shelf, *panel, *virtualkeypad; Evas_Object *content; + Evas_Object *scroller; Ecore_Event_Handler *prop_hdl; +#ifdef HAVE_ELEMENTARY_X + Ecore_X_Virtual_Keyboard_State vkb_state; +#endif struct { Ecore_Animator *animator; // animaton timer @@ -30,9 +34,13 @@ typedef enum _Conformant_Part_Type Conformant_Part enum _Conformant_Part_Type { ELM_CONFORM_INDICATOR_PART = 1, - ELM_CONFORM_SOFTKEY_PART = 2 + ELM_CONFORM_SOFTKEY_PART = 2, + ELM_CONFORM_VIRTUAL_KEYPAD_PART = 4 }; +#define SUB_TYPE_COUNT 2 +static char *sub_type[SUB_TYPE_COUNT] = { "scroller", "genlist" }; + /* local function prototypes */ static const char *widtype = NULL; static void _del_hook(Evas_Object *obj); @@ -141,6 +149,11 @@ _conformant_part_sizing_eval(Evas_Object *obj, Con ecore_x_e_illume_indicator_geometry_get(zone, &sx, &sy, &sw, &sh); _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); + } if (part_type & ELM_CONFORM_SOFTKEY_PART) { ecore_x_e_illume_softkey_geometry_get(zone, &sx, &sy, &sw, &sh); @@ -154,6 +167,7 @@ _swallow_conformant_parts(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); + wd->scroller = NULL; if (!wd->shelf) { wd->shelf = evas_object_rectangle_add(evas_object_evas_get(obj)); @@ -167,6 +181,20 @@ _swallow_conformant_parts(Evas_Object *obj) evas_object_color_set(wd->shelf, 0, 0, 0, 0); edje_object_part_swallow(wd->base, "elm.swallow.shelf", wd->shelf); + if (!wd->virtualkeypad) + { + wd->virtualkeypad = evas_object_rectangle_add(evas_object_evas_get(obj)); + elm_widget_sub_object_add(obj, wd->virtualkeypad); + evas_object_size_hint_min_set(wd->virtualkeypad, -1, 0); + evas_object_size_hint_max_set(wd->virtualkeypad, -1, 0); + } + else + _conformant_part_sizing_eval(obj, ELM_CONFORM_VIRTUAL_KEYPAD_PART); + + evas_object_color_set(wd->virtualkeypad, 0, 0, 0, 0); + edje_object_part_swallow(wd->base, "elm.swallow.virtualkeypad", + wd->virtualkeypad); + if (!wd->panel) { wd->panel = evas_object_rectangle_add(evas_object_evas_get(obj)); @@ -270,10 +298,77 @@ _conformant_move_resize_event_cb(void *data __UNUS if (!wd) return; part_type = (ELM_CONFORM_INDICATOR_PART | - ELM_CONFORM_SOFTKEY_PART); + ELM_CONFORM_SOFTKEY_PART | + ELM_CONFORM_VIRTUAL_KEYPAD_PART); _conformant_part_sizing_eval(obj, part_type); } +// showing the focused/important region. +static void +_content_resize_event_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj + __UNUSED__, void *event_info __UNUSED__) +{ + Evas_Object *focus_obj; + Evas_Object *conformant = (Evas_Object *) data; + Widget_Data *wd = elm_widget_data_get(conformant); + if (!wd) return; + if (wd->vkb_state == ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF) return; + + focus_obj = elm_widget_focused_object_get(conformant); + if (focus_obj) + { + Evas_Coord x, y, w, h; + + elm_widget_show_region_get(focus_obj, &x, &y, &w, &h); + + if (h < _elm_config->finger_size) + h = _elm_config->finger_size; + + elm_widget_show_region_set(focus_obj, x, y, w, h); + } +} + +static void +_update_autoscroll_objs(void *data) +{ + const char *type; + int i; + Evas_Object *sub, *top_scroller = NULL; + Evas_Object *conformant = (Evas_Object *) data; + Widget_Data *wd = elm_widget_data_get(data); + + if (!wd) return; + + sub = elm_widget_focused_object_get(conformant); + //Look up for Top most scroller in the Focus Object hierarchy inside Conformant. + + while (sub) + { + type = elm_widget_type_get(sub); + if (!strcmp(type, "conformant")) break; + for (i = 0; i < SUB_TYPE_COUNT; i++) + if (!strcmp(type, sub_type[i])) + { + top_scroller = sub; + break; + } + sub = elm_object_parent_widget_get(sub); + } + + //If the scroller got changed by app, replace it. + if (top_scroller != wd->scroller) + { + if (wd->scroller) evas_object_event_callback_del(wd->scroller, + EVAS_CALLBACK_RESIZE, + _content_resize_event_cb); + wd->scroller = top_scroller; + if (wd->scroller) evas_object_event_callback_add(wd->scroller, + EVAS_CALLBACK_RESIZE, + _content_resize_event_cb, + data); + } +} + static Eina_Bool _prop_change(void *data, int type __UNUSED__, void *event) { @@ -288,7 +383,8 @@ _prop_change(void *data, int type __UNUSED__, void Conformant_Part_Type part_type; part_type = (ELM_CONFORM_INDICATOR_PART | - ELM_CONFORM_SOFTKEY_PART); + ELM_CONFORM_SOFTKEY_PART | + ELM_CONFORM_VIRTUAL_KEYPAD_PART); _conformant_part_sizing_eval(data, part_type); evas_object_event_callback_add(data, EVAS_CALLBACK_RESIZE, _conformant_move_resize_event_cb, data); @@ -300,14 +396,22 @@ _prop_change(void *data, int type __UNUSED__, void else if (ev->atom == ECORE_X_ATOM_E_ILLUME_SOFTKEY_GEOMETRY) _conformant_part_sizing_eval(data, ELM_CONFORM_SOFTKEY_PART); else if (ev->atom == ECORE_X_ATOM_E_ILLUME_KEYBOARD_GEOMETRY) + _conformant_part_sizing_eval(data, ELM_CONFORM_VIRTUAL_KEYPAD_PART); + else if (ev->atom == ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_STATE) { Ecore_X_Window zone; int ky = -1; printf("Keyboard Geometry Changed\n"); zone = ecore_x_e_illume_zone_get(ev->win); - ecore_x_e_illume_keyboard_geometry_get(zone, NULL, &ky, NULL, NULL); - printf("\tGeom: %d\n", ky); + wd->vkb_state = ecore_x_e_virtual_keyboard_state_get(zone); + if (wd->vkb_state == ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF) + { + evas_object_size_hint_min_set(wd->virtualkeypad, -1, 0); + evas_object_size_hint_max_set(wd->virtualkeypad, -1, 0); + } + else + _update_autoscroll_objs(data); } #endif @@ -352,6 +456,7 @@ elm_conformant_add(Evas_Object *parent) _swallow_conformant_parts(obj); wd->prop_hdl = ecore_event_handler_add(ECORE_X_EVENT_WINDOW_PROPERTY, _prop_change, obj); + wd->vkb_state = ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF; } // FIXME: get kbd region prop #endif @@ -441,3 +546,23 @@ elm_conformant_content_unset(Evas_Object *obj) wd->content = NULL; return content; } +/** + * Returns the Evas_Object that represents the content area. + * + * @param obj The conformant object. + * @return The content area of the widget. + * + * @ingroup Conformant + */ +EAPI Evas_Object* +elm_conformant_content_area_get(const Evas_Object *obj) +{ + ELM_CHECK_WIDTYPE(obj, widtype) NULL; + Widget_Data *wd = elm_widget_data_get(obj); + + if (!wd) return NULL; + /*Finger waggle warning*/ + _elm_dangerous_call_check(__FUNCTION__); + return (Evas_Object*)edje_object_part_object_get(wd->base, "elm.swallow.content"); +} + Index: data/themes/default.edc =================================================================== --- data/themes/default.edc (revision 58961) +++ data/themes/default.edc (working copy) @@ -32642,6 +32642,17 @@ collections { rel1.relative: 0.0 1.0; rel1.to_y: "elm.swallow.shelf"; rel2.relative: 1.0 0.0; + rel2.to_y: "elm.swallow.virtualkeypad"; + } + } + part { name: "elm.swallow.virtualkeypad"; + type: SWALLOW; + description { state: "default" 0.0; + fixed: 1 1; + align: 0.0 1.0; + rel1.relative: 0.0 1.0; + rel1.to_y: "elm.swallow.content"; + rel2.relative: 1.0 0.0; rel2.to_y: "elm.swallow.panel"; } }