summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorJihoon Kim <imfine98@gmail.com>2012-03-30 06:34:45 +0000
committerJihoon Kim <imfine98@gmail.com>2012-03-30 06:34:45 +0000
commite95b611cf2da4f92ac8fb1838a46fb1cb66f73da (patch)
tree40dd3819ac4494d94f32cece83de13f119a2a895 /legacy
parent65e1091a328666c76312e84625f158b08e73d1c2 (diff)
Fix number isn't inserted when NUMLOCK is locked and KEYPAD is pressed
SVN revision: 69784
Diffstat (limited to 'legacy')
-rw-r--r--legacy/edje/ChangeLog4
-rw-r--r--legacy/edje/src/lib/edje_entry.c27
2 files changed, 22 insertions, 9 deletions
diff --git a/legacy/edje/ChangeLog b/legacy/edje/ChangeLog
index 87de11eea5..fc078dd461 100644
--- a/legacy/edje/ChangeLog
+++ b/legacy/edje/ChangeLog
@@ -396,3 +396,7 @@
396 396
397 * Make it possible for edje to update size hint automatically. 397 * Make it possible for edje to update size hint automatically.
398 * Add min: SOURCE to GROUP's part. 398 * Add min: SOURCE to GROUP's part.
399
4002012-03-30 Jihoon Kim
401
402 * Fix number doesn't insert even though NUM LOCK is locked.
diff --git a/legacy/edje/src/lib/edje_entry.c b/legacy/edje/src/lib/edje_entry.c
index 87ad5815d2..2fcadd551c 100644
--- a/legacy/edje/src/lib/edje_entry.c
+++ b/legacy/edje/src/lib/edje_entry.c
@@ -1184,7 +1184,8 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
1184 _edje_emit(ed, "entry,key,escape", rp->part->name); 1184 _edje_emit(ed, "entry,key,escape", rp->part->name);
1185 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1185 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1186 } 1186 }
1187 else if (!strcmp(ev->keyname, "Up") || !strcmp(ev->keyname, "KP_Up")) 1187 else if (!strcmp(ev->keyname, "Up") ||
1188 (!strcmp(ev->keyname, "KP_Up") && !ev->string))
1188 { 1189 {
1189 if (multiline) 1190 if (multiline)
1190 { 1191 {
@@ -1204,7 +1205,8 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
1204 _edje_emit(ed, "entry,key,up", rp->part->name); 1205 _edje_emit(ed, "entry,key,up", rp->part->name);
1205 _edje_emit(rp->edje, "cursor,changed,manual", rp->part->name); 1206 _edje_emit(rp->edje, "cursor,changed,manual", rp->part->name);
1206 } 1207 }
1207 else if (!strcmp(ev->keyname, "Down") || !strcmp(ev->keyname, "KP_Down")) 1208 else if (!strcmp(ev->keyname, "Down") ||
1209 (!strcmp(ev->keyname, "KP_Down") && !ev->string))
1208 { 1210 {
1209 if (multiline) 1211 if (multiline)
1210 { 1212 {
@@ -1224,7 +1226,8 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
1224 _edje_emit(ed, "entry,key,down", rp->part->name); 1226 _edje_emit(ed, "entry,key,down", rp->part->name);
1225 _edje_emit(rp->edje, "cursor,changed,manual", rp->part->name); 1227 _edje_emit(rp->edje, "cursor,changed,manual", rp->part->name);
1226 } 1228 }
1227 else if (!strcmp(ev->keyname, "Left") || !strcmp(ev->keyname, "KP_Left")) 1229 else if (!strcmp(ev->keyname, "Left") ||
1230 (!strcmp(ev->keyname, "KP_Left") && !ev->string))
1228 { 1231 {
1229 if (en->select_allow) 1232 if (en->select_allow)
1230 { 1233 {
@@ -1243,7 +1246,8 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
1243 _edje_emit(rp->edje, "cursor,changed,manual", rp->part->name); 1246 _edje_emit(rp->edje, "cursor,changed,manual", rp->part->name);
1244 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1247 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1245 } 1248 }
1246 else if (!strcmp(ev->keyname, "Right") || !strcmp(ev->keyname, "KP_Right")) 1249 else if (!strcmp(ev->keyname, "Right") ||
1250 (!strcmp(ev->keyname, "KP_Right") && !ev->string))
1247 { 1251 {
1248 if (en->select_allow) 1252 if (en->select_allow)
1249 { 1253 {
@@ -1299,7 +1303,8 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
1299 _edje_emit(ed, "entry,key,backspace", rp->part->name); 1303 _edje_emit(ed, "entry,key,backspace", rp->part->name);
1300 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1304 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1301 } 1305 }
1302 else if (!strcmp(ev->keyname, "Delete") || !strcmp(ev->keyname, "KP_Delete")) 1306 else if (!strcmp(ev->keyname, "Delete") ||
1307 (!strcmp(ev->keyname, "KP_Delete") && !ev->string))
1303 { 1308 {
1304 if (control) 1309 if (control)
1305 { 1310 {
@@ -1333,7 +1338,8 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
1333 _edje_emit(ed, "entry,key,delete", rp->part->name); 1338 _edje_emit(ed, "entry,key,delete", rp->part->name);
1334 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1339 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1335 } 1340 }
1336 else if (!strcmp(ev->keyname, "Home") || !strcmp(ev->keyname, "KP_Home")) 1341 else if (!strcmp(ev->keyname, "Home") ||
1342 ((!strcmp(ev->keyname, "KP_Home")) && !ev->string))
1337 { 1343 {
1338 if (en->select_allow) 1344 if (en->select_allow)
1339 { 1345 {
@@ -1351,7 +1357,8 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
1351 _edje_emit(ed, "entry,key,home", rp->part->name); 1357 _edje_emit(ed, "entry,key,home", rp->part->name);
1352 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1358 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1353 } 1359 }
1354 else if (!strcmp(ev->keyname, "End") || !strcmp(ev->keyname, "KP_End")) 1360 else if (!strcmp(ev->keyname, "End") ||
1361 ((!strcmp(ev->keyname, "KP_End")) && !ev->string))
1355 { 1362 {
1356 if (en->select_allow) 1363 if (en->select_allow)
1357 { 1364 {
@@ -1463,7 +1470,8 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
1463 // remove a tab 1470 // remove a tab
1464 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1471 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1465 } 1472 }
1466 else if (!strcmp(ev->keyname, "Prior") || !strcmp(ev->keyname, "KP_Prior")) 1473 else if (!strcmp(ev->keyname, "Prior") ||
1474 (!strcmp(ev->keyname, "KP_Prior") && !ev->string))
1467 { 1475 {
1468 if (en->select_allow) 1476 if (en->select_allow)
1469 { 1477 {
@@ -1479,7 +1487,8 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
1479 _edje_emit(ed, "entry,key,pgup", rp->part->name); 1487 _edje_emit(ed, "entry,key,pgup", rp->part->name);
1480 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1488 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1481 } 1489 }
1482 else if (!strcmp(ev->keyname, "Next") || !strcmp(ev->keyname, "KP_Next")) 1490 else if (!strcmp(ev->keyname, "Next") ||
1491 (!strcmp(ev->keyname, "KP_Next") && !ev->string))
1483 { 1492 {
1484 if (en->select_allow) 1493 if (en->select_allow)
1485 { 1494 {