Fix language display issue in space bar flick event 85/249185/1
authorJihoon Kim <jihoon48.kim@samsung.com>
Tue, 8 Dec 2020 10:37:47 +0000 (19:37 +0900)
committerJihoon Kim <jihoon48.kim@samsung.com>
Tue, 8 Dec 2020 10:37:47 +0000 (19:37 +0900)
Change-Id: I993292671b322d21b8c76fcc48da19e297c490dd
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>
src/ise-language-change.cpp

index b7199a6..4f83ba2 100644 (file)
@@ -45,6 +45,16 @@ extern CSCLUI *g_ui;
 #endif
 
 #ifdef _WEARABLE
+#define PROFILE_NAME "wearable"
+#elif _COMMON
+#define PROFILE_NAME "common"
+#elif _TV
+#define PROFILE_NAME "tv"
+#elif _MOBILE
+#define PROFILE_NAME "mobile"
+#endif
+
+#ifdef _WEARABLE
 #define IMG_ARROW_LEFT                  LAYOUTDIR"/wearable/image/button/B09_btn_arrow_left.png"
 #define IMG_ARROW_RIGHT                 LAYOUTDIR"/wearable/image/button/B09_btn_arrow_right.png"
 #define IMG_POPUP_FC_BG                 LAYOUTDIR"/wearable/image/button/language_change_popup_bg.png"
@@ -56,10 +66,10 @@ extern CSCLUI *g_ui;
 #define SPACE_PADDING_Y                 10
 #define SPACE_KEY_HEIGHT                60
 #else
-#define IMG_ARROW_LEFT                  LAYOUTDIR"/mobile/image/button/btn_arrow_s_left.png"
-#define IMG_ARROW_RIGHT                 LAYOUTDIR"/mobile/image/button/btn_arrow_s_right.png"
-#define IMG_POPUP_FC_BG                 LAYOUTDIR"/mobile/image/button/language_change_popup_bg.png"
-#define EDJ_FILE                        RESDIR"/edje/mobile/popup_custom.edj"
+#define IMG_ARROW_LEFT                  LAYOUTDIR "/" PROFILE_NAME"/image/button/btn_arrow_s_left.png"
+#define IMG_ARROW_RIGHT                 LAYOUTDIR "/" PROFILE_NAME"/image/button/btn_arrow_s_right.png"
+#define IMG_POPUP_FC_BG                 LAYOUTDIR "/" PROFILE_NAME"/image/button/language_change_popup_bg.png"
+#define EDJ_FILE                        RESDIR "/edje/" PROFILE_NAME"/popup_custom.edj"
 #endif
 
 static short int lang_popup_x = NOT_USED;
@@ -322,7 +332,6 @@ static void __ise_init_space_flick_lang_change_popup_variables(short int space_b
     lang_popup_y = (space_button_y - space_popup_height - arrow_image_y_padding);
 }
 
-
 static Eina_Bool __ise_space_flick_lang_popup_move_cb(void *data, int type, void *event_info)
 {
     Ecore_Event_Mouse_Move *ev = (Ecore_Event_Mouse_Move *)event_info;