Refactor code to set left and right margin in emoticon layout

Change-Id: I2d8d05b2bc22bd39fce39c57d5cdf4605c7bb789
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>

diff --git a/src/ise-emoticon-mode.cpp b/src/ise-emoticon-mode.cpp
index 72e6764..24992f9 100644 (file)
--- a/src/ise-emoticon-mode.cpp
+++ b/src/ise-emoticon-mode.cpp
@@ -97,6 +97,8 @@
 #define EMOTICON_ICON_GAP_HEIGHT_LAND 0
 #endif
 
+#define EMOTICON_LAYOUT_LEFT_MARGIN 88
+
 #define EMOTICON_WIDTH_LAND (EMOTICON_ICON_WIDTH_LAND + EMOTICON_ICON_GAP_WIDTH_LAND)
 #define EMOTICON_HEIGHT_LAND (EMOTICON_ICON_HEIGHT_LAND + EMOTICON_ICON_GAP_HEIGHT_LAND)
 
@@ -326,16 +328,16 @@ void ise_show_emoticon_layout(emoticon_group_t emoticon_group, const int screen_
 #else
         if (screen_degree == 0 || screen_degree == 180) {
             if (landscape_device) {
-                evas_object_resize(layout, width - ui->get_scaled_y(88*2), ui->get_scaled_y(ISE_HEIGHT_LAND));
-                evas_object_move(layout, ui->get_scaled_y(88), y);
+                evas_object_resize(layout, width - ui->get_scaled_y(EMOTICON_LAYOUT_LEFT_MARGIN*2), ui->get_scaled_y(ISE_HEIGHT_LAND));
+                evas_object_move(layout, ui->get_scaled_y(EMOTICON_LAYOUT_LEFT_MARGIN), y);
             }
         } else {
             if (config_values->floating_mode) {
-                evas_object_resize(layout, (width - ui->get_scaled_y(88*2)) * FLOATING_SCALE_RATE, (ui->get_scaled_y(ISE_HEIGHT_LAND)) * FLOATING_SCALE_RATE);
-                evas_object_move(layout, ui->get_scaled_y(88), y + FLOATING_TITLE_BAR_HEIGHT);
+                evas_object_resize(layout, (width - ui->get_scaled_y(EMOTICON_LAYOUT_LEFT_MARGIN*2)) * FLOATING_SCALE_RATE, (ui->get_scaled_y(ISE_HEIGHT_LAND)) * FLOATING_SCALE_RATE);
+                evas_object_move(layout, ui->get_scaled_y(EMOTICON_LAYOUT_LEFT_MARGIN), y + FLOATING_TITLE_BAR_HEIGHT);
             } else {
-                evas_object_resize(layout, width - ui->get_scaled_y(88*2), ui->get_scaled_y(landscape_device ? ISE_HEIGHT_PORT : ISE_HEIGHT_LAND));
-                evas_object_move(layout, ui->get_scaled_y(88), y);
+                evas_object_resize(layout, width - ui->get_scaled_y(EMOTICON_LAYOUT_LEFT_MARGIN*2), ui->get_scaled_y(landscape_device ? ISE_HEIGHT_PORT : ISE_HEIGHT_LAND));
+                evas_object_move(layout, ui->get_scaled_y(EMOTICON_LAYOUT_LEFT_MARGIN), y);
             }
         }
 #endif