From c1929f403eafd6b3a5a10d114f023e331363afea Mon Sep 17 00:00:00 2001 From: Jiwan Kim Date: Wed, 21 Sep 2016 13:12:25 +0900 Subject: [PATCH] Fix issues on network menu TSAM-7822 : Inputted number overlapping TSAM-7820 : Number field of DNS Change-Id: I7fe8e1906076608ea47b35de218dd43f374479c2 Signed-off-by: Jiwan Kim --- src/view/view_new_network.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/view/view_new_network.c b/src/view/view_new_network.c index d166fac..24e0ff0 100644 --- a/src/view/view_new_network.c +++ b/src/view/view_new_network.c @@ -593,9 +593,9 @@ static void _imf_panel_event_cb(void *data, Ecore_IMF_Context *ctx, int value) evas_object_geometry_get(priv->focused_entry, &x, &entry_y, &w, &entry_h); evas_object_geometry_get(priv->base, &x, &y, &w, &h); - if (entry_y + entry_h >= ELM_SCALE_SIZE(DEFAULT_KEYPAD_POS)) { + if (entry_y + entry_h >= (DEFAULT_KEYPAD_POS)) { Evas_Coord moved_height; - moved_height = ELM_SCALE_SIZE(DEFAULT_KEYPAD_POS - PADDING_VKEYBOARD) + moved_height = (DEFAULT_KEYPAD_POS - PADDING_VKEYBOARD) - (entry_y + entry_h); evas_object_move(priv->base, x, moved_height); } else { @@ -607,9 +607,9 @@ static void _imf_panel_event_cb(void *data, Ecore_IMF_Context *ctx, int value) /* If virtual keyboard is already displayed, * entry height need to be compensated. */ - if (entry_y - y + entry_h >= ELM_SCALE_SIZE(DEFAULT_KEYPAD_POS)) { + if (entry_y - y + entry_h >= (DEFAULT_KEYPAD_POS)) { Evas_Coord moved_height; - moved_height = ELM_SCALE_SIZE(DEFAULT_KEYPAD_POS - PADDING_VKEYBOARD) + moved_height = (DEFAULT_KEYPAD_POS - PADDING_VKEYBOARD) - (entry_y - y + entry_h); evas_object_move(priv->base, x, moved_height); } else { @@ -675,6 +675,8 @@ static void _markup_cb(void *data, Evas_Object *entry, char **text) ignore = true; } else if (!strcmp("", *text)) { ignore = true; + } else if (!strcmp("
", *text)) { + ignore = true; } if (ignore) { -- 2.7.4