Merge branch 'tizen_6.0' into tizen

Change-Id: I246481d39f90103b73bef4b5156d1f5f345db93a

diff --git a/ise-default.xml b/ise-default.xml
index 867a6ca..cb90188 100644 (file)
--- a/ise-default.xml
+++ b/ise-default.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" api-version="4.0" package="ise-default" version="1.8.8" install-location="internal-only" support-mode="ultra-power-saving">
+<manifest xmlns="http://tizen.org/ns/packages" api-version="4.0" package="ise-default" version="1.8.9" install-location="internal-only" support-mode="ultra-power-saving">
 <author/>
 <description/>
 <label>Tizen keyboard</label>

diff --git a/packaging/ise-default.spec b/packaging/ise-default.spec
index eecc1b4..a54bd66 100644 (file)
--- a/packaging/ise-default.spec
+++ b/packaging/ise-default.spec
@@ -1,6 +1,6 @@
 Name:       ise-default
 Summary:    Tizen keyboard
-Version:    1.8.8
+Version:    1.8.9
 Release:    1
 Group:      Graphics & UI Framework/Input
 License:    Apache-2.0

diff --git a/src/ise-floating-mode.cpp b/src/ise-floating-mode.cpp
index e66cc89..1a16f37 100644 (file)
--- a/src/ise-floating-mode.cpp
+++ b/src/ise-floating-mode.cpp
@@ -21,9 +21,9 @@
 #undef LOG_TAG
 #define LOG_TAG "ISE_DEFAULT"
 
-#define IMG_MOVE_HANDLER_BG            RESDIR"/mobile/images/move_handler_bg.png"
-#define IMG_MOVE_HANDLER_CENTER        RESDIR"/mobile/images/move_handler_center.png"
-#define IMG_MOVE_HANDLER_RIGHT         RESDIR"/mobile/images/move_handler_hand.png"
+#define IMG_MOVE_HANDLER_BG            RESDIR "/" PROFILE_NAME"/images/move_handler_bg.png"
+#define IMG_MOVE_HANDLER_CENTER        RESDIR "/" PROFILE_NAME"/images/move_handler_center.png"
+#define IMG_MOVE_HANDLER_RIGHT         RESDIR "/" PROFILE_NAME"/images/move_handler_hand.png"
 #define MOVE_HANDLER_CENTER_WIDTH      48
 #define MOVE_HANDLER_CENTER_RIGHT      70
 
@@ -34,6 +34,7 @@ static Evas_Object* move_handler_right = NULL;
 void ise_show_move_handler(short int screen_w, short int screen_h)
 {
     move_handler_bg = evas_object_image_add(evas_object_evas_get(NATIVE_WINDOW_CAST(ime_get_main_window())));
+    LOGI("path : %s", IMG_MOVE_HANDLER_BG);
     evas_object_image_file_set(move_handler_bg, IMG_MOVE_HANDLER_BG, NULL);
     Evas_Load_Error err = evas_object_image_load_error_get(move_handler_bg);
     if (err != EVAS_LOAD_ERROR_NONE) {

diff --git a/src/ise.cpp b/src/ise.cpp
index ca4d508..2b36161 100644 (file)
--- a/src/ise.cpp
+++ b/src/ise.cpp
@@ -2465,7 +2465,7 @@ static void set_ime_size(bool floating_mode, ISE_CANDIDATE_REQUEST candidate_req
         ime_set_size(size_portrait.width, size_portrait.height + FLOATING_TITLE_BAR_HEIGHT,
             size_landscape.width, size_landscape.height + FLOATING_TITLE_BAR_HEIGHT);
 
-#ifdef _MOBILE
+#if defined(_MOBILE) || defined(_COMMON)
         ise_destroy_move_handler();
         int rotation = elm_win_rotation_get(NATIVE_WINDOW_CAST(ime_get_main_window()));
         int handler_width = (rotation == 0 || rotation == 180) ? size_portrait.width : size_landscape.width;
@@ -2503,7 +2503,7 @@ static void set_ime_size(bool floating_mode, ISE_CANDIDATE_REQUEST candidate_req
 
         ime_set_size(size_portrait.width, size_portrait.height, size_landscape.width, size_landscape.height);
 
-#ifdef _MOBILE
+#if defined(_MOBILE) || defined(_COMMON)
         ise_destroy_move_handler();
 #endif
     }