From 5cef1e1ea03700c329a30bb7c2777de2da5a3bd5 Mon Sep 17 00:00:00 2001 From: ChunEon Park Date: Mon, 4 Nov 2013 14:51:06 +0900 Subject: [PATCH] Revert "elm_conform.c: Added "virtualkeypad,size,changed" smart callback." This reverts commit cbd7446f0bf413ad821ac40703d2a2ca728758ef. Conflicts: ChangeLog NEWS Please be more considerable to add this feature. The function itself is not logical and we don't think it's proper for the conformant yet. --- legacy/elementary/ChangeLog | 4 ---- legacy/elementary/NEWS | 1 - legacy/elementary/src/lib/elm_conform.c | 7 ------- legacy/elementary/src/lib/elm_conform.h | 3 --- 4 files changed, 15 deletions(-) diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog index 9207326e2e..1cede7ac62 100644 --- a/legacy/elementary/ChangeLog +++ b/legacy/elementary/ChangeLog @@ -1728,10 +1728,6 @@ * image: Add support for "clicked" callback on Return/space/KP_Enter key press. -2013-10-30 Daniel Juyung Seo (SeoZ) - - * conform: Added "virtualkeypad,size,changed" callback on virtualkeypad min size change. - 2013-10-30 Shilpa Onkar Singh * slider: Added elm_slider_step_get(), elm_slider_step_set(). diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS index 2eac9927d0..23d93e304a 100644 --- a/legacy/elementary/NEWS +++ b/legacy/elementary/NEWS @@ -99,7 +99,6 @@ Additions: * Add elm_fileselector_hidden_visible_set/get() to show or hide hidden files/directories. * Add signals "spinner,drag,start" and "spinner,drag,stop" to the spinner widget. * Add support for "clicked" callback on Return/space/KP_Enter key press for image. - * Add "virtualkeypad,size,changed" callback on virtualkeypad min size change for conformant. * Add elm_slider_step_get(), elm_slider_step_set() for slider. * Add support elm_popup_move() for popup. * Add multi select mode for genlist/gengrid. diff --git a/legacy/elementary/src/lib/elm_conform.c b/legacy/elementary/src/lib/elm_conform.c index cb00888e35..9636ab8ae9 100644 --- a/legacy/elementary/src/lib/elm_conform.c +++ b/legacy/elementary/src/lib/elm_conform.c @@ -36,14 +36,12 @@ static const char SOFTKEY_PART[] = "elm.swallow.softkey"; static const char SIG_VIRTUALKEYPAD_STATE_ON[] = "virtualkeypad,state,on"; static const char SIG_VIRTUALKEYPAD_STATE_OFF[] = "virtualkeypad,state,off"; -static const char SIG_VIRTUALKEYPAD_SIZE_CHANGED[] = "virtualkeypad,size,changed"; static const char SIG_CLIPBOARD_STATE_ON[] = "clipboard,state,on"; static const char SIG_CLIPBOARD_STATE_OFF[] = "clipboard,state,off"; static const Evas_Smart_Cb_Description _smart_callbacks[] = { {SIG_VIRTUALKEYPAD_STATE_ON, ""}, {SIG_VIRTUALKEYPAD_STATE_OFF, ""}, - {SIG_VIRTUALKEYPAD_SIZE_CHANGED, ""}, {SIG_CLIPBOARD_STATE_ON, ""}, {SIG_CLIPBOARD_STATE_OFF, ""}, {NULL, NULL} @@ -168,8 +166,6 @@ _conformant_part_sizing_eval(Evas_Object *obj, if (part_type & ELM_CONFORMANT_VIRTUAL_KEYPAD_PART) { - Evas_Coord_Rectangle rect; - #ifdef HAVE_ELEMENTARY_X if ((!_conformant_part_geometry_get_from_env ("ILLUME_KBD", &sx, &sy, &sw, &sh)) && (xwin)) @@ -193,9 +189,6 @@ _conformant_part_sizing_eval(Evas_Object *obj, DBG("[KEYPAD]: size(%d,%d, %dx%d).", sx, sy, sw, sh); _conformant_part_size_hints_set (obj, sd->virtualkeypad, sx, sy, sw, sh); - - rect.x = sx; rect.y = sy; rect.w = sw; rect.h = sh; - evas_object_smart_callback_call(obj, SIG_VIRTUALKEYPAD_SIZE_CHANGED, (void *)&rect); } if (part_type & ELM_CONFORMANT_SOFTKEY_PART) diff --git a/legacy/elementary/src/lib/elm_conform.h b/legacy/elementary/src/lib/elm_conform.h index e1187b510c..a491b951bb 100644 --- a/legacy/elementary/src/lib/elm_conform.h +++ b/legacy/elementary/src/lib/elm_conform.h @@ -28,9 +28,6 @@ * (@since 1.8) * @li "virtualkeypad,state,off": if virtualkeypad state is switched to "off". * (@since 1.8) - * @li "virtualkeypad,size,changed": this is called when virtualkeypad size is - * changed. @c event_info parameter is the virtualkeypad size in - * Evas_Coord_Rectangle structure. (@since 1.8) * @li "clipboard,state,on": if clipboard state is switched to "on". * (@since 1.8) * @li "clipboard,state,off": if clipboard state is switched to "off".