In landscape mode, Backspace button looks different for Number and Normal layout

diff --git a/debian/changelog b/debian/changelog
index 169236495bd6b6973cfe8f8fcb83a2864ae27099..388fbca0af8c83f7afee7ec4d2969f651c8f6691 100755 (executable)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ise-default (0.3.016-1) unstable; urgency=low
+
+  * In landscape mode, Backspace button looks different for Number and Normal layout
+  * Git: slp/pkgs/i/ise-default
+  * Tag: ise-default_0.3.016-1
+
+ -- Ankush Dua <ankush.d@samsung.com>  Thu, 31 Aug 2012 11:03:55 +0530
+
 ise-default (0.3.015-1) unstable; urgency=low
 
   * Enter Key not working

diff --git a/packaging/ise-default.spec b/packaging/ise-default.spec
index 4a5a0a8acc6e076f6b3e69dea941aac2eb140bbc..955af8cff9f0d2a252159437565ff06431543d5c 100755 (executable)
--- a/packaging/ise-default.spec
+++ b/packaging/ise-default.spec
@@ -1,6 +1,6 @@
 Name:       ise-default
 Summary:    Tizen keyboard
-Version:    0.3.015
+Version:    0.3.016
 Release:    1
 Group:      TO_BE/FILLED_IN
 License:    Flora Software License

diff --git a/res/mcfresource-port-qty-sym1.h b/res/mcfresource-port-qty-sym1.h
index fdea74fa507b93a3a9ca65bf6fadb9afa3060985..81a20bd799c73c22443a93ffc955808fe566323e 100755 (executable)
--- a/res/mcfresource-port-qty-sym1.h
+++ b/res/mcfresource-port-qty-sym1.h
@@ -46,7 +46,7 @@
        {USED, NOT_USED, BUTTON_TYPE_NORMAL, KEY_TYPE_UNICODE, POPUP_TYPE_NONE, TRUE, TRUE, TRUE, {NOT_USED,}},
        {USED, NOT_USED, BUTTON_TYPE_NORMAL, KEY_TYPE_UNICODE, POPUP_TYPE_NONE, TRUE, TRUE, TRUE, {NOT_USED,}},
        {USED, NOT_USED, BUTTON_TYPE_NORMAL, KEY_TYPE_UNICODE, POPUP_TYPE_NONE, TRUE, TRUE, TRUE, {NOT_USED,}},
-       {USED, NOT_USED, BUTTON_TYPE_NORMAL, KEY_TYPE_CONTROL, POPUP_TYPE_NONE, TRUE, TRUE, TRUE, {NOT_USED,}},
+       {USED, CUSTOMID_BACKSPACE, BUTTON_TYPE_NORMAL, KEY_TYPE_CONTROL, POPUP_TYPE_NONE, TRUE, TRUE, TRUE, {NOT_USED,}},
 
 
        /*option*/      {USED, NOT_USED, BUTTON_TYPE_NORMAL, KEY_TYPE_MODECHANGE, POPUP_TYPE_CONTEXT_POPUP, FALSE, FALSE, TRUE, {NOT_USED,}},

diff --git a/res/mcfresource-port-qty-sym2.h b/res/mcfresource-port-qty-sym2.h
index ea9c7789bd9ccd72bc95a7753b1d1f5c64622204..6b149edc249d0c93dc84b5390872b09907e22cb2 100755 (executable)
--- a/res/mcfresource-port-qty-sym2.h
+++ b/res/mcfresource-port-qty-sym2.h
@@ -46,7 +46,7 @@
        {USED, NOT_USED, BUTTON_TYPE_NORMAL, KEY_TYPE_UNICODE, POPUP_TYPE_NONE, TRUE, TRUE, TRUE, {NOT_USED,}},
        {USED, NOT_USED, BUTTON_TYPE_NORMAL, KEY_TYPE_UNICODE, POPUP_TYPE_NONE, TRUE, TRUE, TRUE, {NOT_USED,}},
        {USED, NOT_USED, BUTTON_TYPE_NORMAL, KEY_TYPE_UNICODE, POPUP_TYPE_NONE, TRUE, TRUE, TRUE, {NOT_USED,}},
-       {USED, NOT_USED, BUTTON_TYPE_NORMAL, KEY_TYPE_CONTROL, POPUP_TYPE_NONE, TRUE, TRUE, TRUE, {NOT_USED,}},
+       {USED, CUSTOMID_BACKSPACE, BUTTON_TYPE_NORMAL, KEY_TYPE_CONTROL, POPUP_TYPE_NONE, TRUE, TRUE, TRUE, {NOT_USED,}},
 
 
        /*option*/      {USED, NOT_USED, BUTTON_TYPE_NORMAL, KEY_TYPE_MODECHANGE, POPUP_TYPE_CONTEXT_POPUP, FALSE, FALSE, TRUE, {NOT_USED,}},

diff --git a/res/mcfresource.h b/res/mcfresource.h
index a76b11ff3f39fd24a827053706476fac91478059..d024a8ecbe2f60aa5f85f86f55ed1f7fac7f43d1 100755 (executable)
--- a/res/mcfresource.h
+++ b/res/mcfresource.h
@@ -76,6 +76,7 @@ enum _MCFCustomID {
        CUSTOMID_PREDICTION,
        CUSTOMID_ENTER,
        CUSTOMID_WWWCOM,
+       CUSTOMID_BACKSPACE,
        CUSTOMID_MAX
 };
 

diff --git a/src/ise.cpp b/src/ise.cpp
index 8f182074b02f657fa1538d8259f4f5bd348c5cb0..799e4f6984d8b04f0915ba6bb1d9177df93325b9 100755 (executable)
--- a/src/ise.cpp
+++ b/src/ise.cpp
@@ -138,6 +138,7 @@ static void ise_send_event(mcfulong keyEvent, mcfulong keyMask = 0);
 static void ise_forward_key_event(mcfulong keyEvent);
 
 static void _set_prediction_private_key();
+static void _set_backspace_private_key();
 static void _set_shift_private_key();
 
 static void ise_set_screen_rotation(int degree);
@@ -558,6 +559,7 @@ void _on_input_mode_changed(mcfchar * keyValue, mcfulong keyEvent, MCFKeyType ke
        }
 
        ise_update_cursor_position(g_cursor_position);
+       _set_backspace_private_key();
 
        for (int loop = 0; loop < MAX_KEY; loop++) {
                if (gDisableKeyBuffer[loop] != NOT_USED) {
@@ -682,6 +684,17 @@ static void _set_prediction_private_key()
        }
 }
 
+static void _set_backspace_private_key()
+{
+       mcf8 mode = gCore->get_input_mode();
+       mcf8 layout = -1;
+       if (gCore->get_display_mode() == MCFDISPLAY_PORTRAIT) {
+               ise_set_private_key(CUSTOMID_BACKSPACE, NULL, "B09_icon_back.png", MVK_BackSpace, NULL);
+       } else {
+               ise_set_private_key(CUSTOMID_BACKSPACE, NULL, "B09_icon_back_50x50.png", MVK_BackSpace, NULL);
+       }
+}
+
 /*
 *      _setup_info update on exit of setting menu
 *      It will be called before launching of keyboard
@@ -960,6 +973,7 @@ void ise_show(int ic)
        gCore->disable_input_events(FALSE);
 
        ise_update_cursor_position(g_cursor_position);
+       _set_backspace_private_key();
 
        for (int loop = 0; loop < MAX_KEY; loop++) {
                if (gDisableKeyBuffer[loop] != NOT_USED) {