[entry] fix number keypad issue

Change-Id: I2493d2ab3def0710d9924488670feecc57be8cee

diff --git a/debian/changelog b/debian/changelog
index c54dc4a..c247ff3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+edje (1.1.0+svn.69574slp2+build03) unstable; urgency=low
+
+  * Fix Number keypad issue
+  * Git: slp/pkgs/e/edje
+  * Tag: edje_1.1.0+svn.69574slp2+build03
+
+ -- Jihoon Kim <jihoon48.kim@samsung.com>  Fri, 30 Mar 2012 15:46:22 +0900
+
 edje (1.1.0+svn.69574slp2+build02) unstable; urgency=low
 
   * Package Upload

diff --git a/packaging/edje.spec b/packaging/edje.spec
index 51825d0..03d9948 100644 (file)
--- a/packaging/edje.spec
+++ b/packaging/edje.spec
@@ -1,7 +1,7 @@
-#sbs-git:slp/pkgs/e/edje edje 1.1.0+svn.69011slp2+build01 96cd9783918ce594c786d12a5107be27aec4d34b
+#sbs-git:slp/pkgs/e/edje edje 1.1.0+svn.69011slp2+build03 96cd9783918ce594c786d12a5107be27aec4d34b
 Name:       edje
 Summary:    Complex Graphical Design/Layout Engine
-Version:    1.1.0+svn.69574slp2+build01
+Version:    1.1.0+svn.69574slp2+build03
 Release:    1
 Group:      System/Libraries
 License:    BSD

diff --git a/src/lib/edje_entry.c b/src/lib/edje_entry.c
index 780fcc2..71095c8 100644 (file)
--- a/src/lib/edje_entry.c
+++ b/src/lib/edje_entry.c
@@ -1438,7 +1438,8 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
         _edje_emit(ed, "entry,key,escape", rp->part->name);
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
      }
-   else if (!strcmp(ev->keyname, "Up") || !strcmp(ev->keyname, "KP_Up"))
+   else if (!strcmp(ev->keyname, "Up") ||
+            (!strcmp(ev->keyname, "KP_Up") && !ev->string))
      {
         if (multiline)
           {
@@ -1458,7 +1459,8 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
         _edje_emit(ed, "entry,key,up", rp->part->name);
         _edje_emit(rp->edje, "cursor,changed,manual", rp->part->name);
      }
-   else if (!strcmp(ev->keyname, "Down") || !strcmp(ev->keyname, "KP_Down"))
+   else if (!strcmp(ev->keyname, "Down") ||
+            (!strcmp(ev->keyname, "KP_Down") && !ev->string))
      {
         if (multiline)
           {
@@ -1478,7 +1480,8 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
         _edje_emit(ed, "entry,key,down", rp->part->name);
         _edje_emit(rp->edje, "cursor,changed,manual", rp->part->name);
      }
-   else if (!strcmp(ev->keyname, "Left") || !strcmp(ev->keyname, "KP_Left"))
+   else if (!strcmp(ev->keyname, "Left") ||
+            (!strcmp(ev->keyname, "KP_Left") && !ev->string))
      {
         if (en->select_allow)
           {
@@ -1497,7 +1500,8 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
         _edje_emit(rp->edje, "cursor,changed,manual", rp->part->name);
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
      }
-   else if (!strcmp(ev->keyname, "Right") || !strcmp(ev->keyname, "KP_Right"))
+   else if (!strcmp(ev->keyname, "Right") ||
+            (!strcmp(ev->keyname, "KP_Right") && !ev->string))
      {
         if (en->select_allow)
           {
@@ -1553,7 +1557,8 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
         _edje_emit(ed, "entry,key,backspace", rp->part->name);
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
      }
-   else if (!strcmp(ev->keyname, "Delete") || !strcmp(ev->keyname, "KP_Delete"))
+   else if (!strcmp(ev->keyname, "Delete") ||
+            (!strcmp(ev->keyname, "KP_Delete") && !ev->string))
      {
         if (control)
           {
@@ -1587,7 +1592,8 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
         _edje_emit(ed, "entry,key,delete", rp->part->name);
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
      }
-   else if (!strcmp(ev->keyname, "Home") || !strcmp(ev->keyname, "KP_Home"))
+   else if (!strcmp(ev->keyname, "Home") ||
+            ((!strcmp(ev->keyname, "KP_Home")) && !ev->string))
      {
         if (en->select_allow)
           {
@@ -1605,7 +1611,8 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
         _edje_emit(ed, "entry,key,home", rp->part->name);
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
      }
-   else if (!strcmp(ev->keyname, "End") || !strcmp(ev->keyname, "KP_End"))
+   else if (!strcmp(ev->keyname, "End") ||
+            ((!strcmp(ev->keyname, "KP_End")) && !ev->string))
      {
         if (en->select_allow)
           {
@@ -1717,7 +1724,8 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
         // remove a tab
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
      }
-   else if (!strcmp(ev->keyname, "Prior") || !strcmp(ev->keyname, "KP_Prior"))
+   else if (!strcmp(ev->keyname, "Prior") ||
+            (!strcmp(ev->keyname, "KP_Prior") && !ev->string))
      {
         if (en->select_allow)
           {
@@ -1733,7 +1741,8 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
         _edje_emit(ed, "entry,key,pgup", rp->part->name);
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
      }
-   else if (!strcmp(ev->keyname, "Next") || !strcmp(ev->keyname, "KP_Next"))
+   else if (!strcmp(ev->keyname, "Next") ||
+            (!strcmp(ev->keyname, "KP_Next") && !ev->string))
      {
         if (en->select_allow)
           {