Fix issues on network menu 67/88867/1
authorJiwan Kim <ji-wan.kim@samsung.com>
Wed, 21 Sep 2016 04:12:25 +0000 (13:12 +0900)
committerJiwan Kim <ji-wan.kim@samsung.com>
Wed, 21 Sep 2016 04:12:25 +0000 (13:12 +0900)
   TSAM-7822 : Inputted number overlapping
   TSAM-7820 : Number field of DNS

Change-Id: I7fe8e1906076608ea47b35de218dd43f374479c2
Signed-off-by: Jiwan Kim <ji-wan.kim@samsung.com>
src/view/view_new_network.c

index d166fac..24e0ff0 100644 (file)
@@ -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("<tab/>", *text)) {
                ignore = true;
+       } else if (!strcmp("<br/>", *text)) {
+               ignore = true;
        }
 
        if (ignore) {