Apply multi scale

Change-Id: Id74508ce0b99be4c72022a333a2ffec82fd02bb3
Signed-off-by: jinwoo.shin <jw0227.shin@samsung.com>

diff --git a/data/infosquare-theme.edc b/data/infosquare-theme.edc
index 1a3c9fa..94fbdfb 100644 (file)
--- a/data/infosquare-theme.edc
+++ b/data/infosquare-theme.edc
@@ -17,6 +17,7 @@
 #include "../include/define.h"
 
 collections {
+       base_scale: 2.0;
        #include "widget/button.edc"
        #include "widget/gengrid.edc"
 }

diff --git a/data/infosquare.edc b/data/infosquare.edc
index b400846..fafa384 100644 (file)
--- a/data/infosquare.edc
+++ b/data/infosquare.edc
@@ -17,6 +17,7 @@
 #include "../include/define.h"
 
 collections {
+       base_scale: 2.0;
        #include "view/notification_view.edc"
        #include "view/square_view.edc"
        #include "view/action_menu_view.edc"

diff --git a/data/widget/gengrid.edc b/data/widget/gengrid.edc
index 6d0483b..c3c6469 100644 (file)
--- a/data/widget/gengrid.edc
+++ b/data/widget/gengrid.edc
@@ -48,24 +48,6 @@ group {
                        }
                }
                part {
-                       name: "map";
-                       type: RECT;
-                       scale: 1;
-                       description {
-                               state: "default" 0.0;
-                               perspective {
-                                       zplane: 0;
-                                       focal: 1000;
-                               }
-                               visible: 0;
-                       }
-                       description {
-                               state: "selected" 0.0;
-                               inherit: "default" 0.0;
-                               perspective.zplane: -100;
-                       }
-               }
-               part {
                        name: "bg";
                        type: RECT;
                        scale: 1;
@@ -92,15 +74,10 @@ group {
                                        relative: 0.0 1.0;
                                }
                                color: COLOR_ITEM_DEFAULT;
-                               map {
-                                       perspective_on: 1;
-                                       perspective: "map";
-                               }
                        }
                        description {
                                state: "selected" 0.0;
                                inherit: "default" 0.0;
-                               map.on: 1;
                        }
                }
                part {
@@ -121,15 +98,10 @@ group {
                                image.normal: "ic_thumb_connection.png";
                                min: 80 80;
                                fixed: 1 1;
-                               map {
-                                       perspective_on: 1;
-                                       perspective: "map";
-                               }
                        }
                        description {
                                state: "selected" 0.0;
                                inherit: "default" 0.0;
-                               map.on: 1;
                        }
                }
                part {
@@ -141,15 +113,10 @@ group {
                                state : "default" 0.0;
                                rel1.to: "defaultbg";
                                rel2.to: "defaultbg";
-                               map {
-                                       perspective_on: 1;
-                                       perspective: "map";
-                               }
                        }
                        description {
                                state: "selected" 0.0;
                                inherit: "default" 0.0;
-                               map.on: 1;
                        }
                }
                part {
@@ -169,15 +136,10 @@ group {
                                color: COLOR_ITEM_FOCUS;
                                fixed: 0 1;
                                visible: 0;
-                               map {
-                                       perspective_on: 1;
-                                       perspective: "map";
-                               }
                        }
                        description {
                                state: "selected" 0.0;
                                inherit: "default" 0.0;
-                               map.on: 1;
                                visible: 1;
                        }
                        description {
@@ -207,15 +169,10 @@ group {
                                color: COLOR_ITEM_FOCUS;
                                fixed: 1 0;
                                visible: 0;
-                               map {
-                                       perspective_on: 1;
-                                       perspective: "map";
-                               }
                        }
                        description {
                                state: "selected" 0.0;
                                inherit: "default" 0.0;
-                               map.on: 1;
                                visible: 1;
                        }
                        description {
@@ -245,15 +202,10 @@ group {
                                color: COLOR_ITEM_FOCUS;
                                fixed: 1 0;
                                visible: 0;
-                               map {
-                                       perspective_on: 1;
-                                       perspective: "map";
-                               }
                        }
                        description {
                                state: "selected" 0.0;
                                inherit: "default" 0.0;
-                               map.on: 1;
                                visible: 1;
                        }
                        description {
@@ -279,16 +231,11 @@ group {
                                align: 1.0 0.5;
                                color: COLOR_ITEM_BG;
                                fixed: 1 0;
-                               map {
-                                       perspective_on: 1;
-                                       perspective: "map";
-                               }
                        }
                        description {
                                state: "selected" 0.0;
                                inherit: "default" 0.0;
                                color: COLOR_ITEM_FOCUS;
-                               map.on: 1;
                        }
                }
                part {
@@ -301,16 +248,11 @@ group {
                                rel1.to: "defaultbg_text";
                                rel2.to: "defaultbg_text";
                                color: COLOR_ITEM_BG;
-                               map {
-                                       perspective_on: 1;
-                                       perspective: "map";
-                               }
                        }
                        description {
                                state: "selected" 0.0;
                                inherit: "default" 0.0;
                                color: COLOR_ITEM_FOCUS;
-                               map.on: 1;
                        }
                        description {
                                state: "selected_0" 0.0;
@@ -376,16 +318,11 @@ group {
                                align: 0.5 0.0;
                                color: COLOR_TEXT_TITLE;
                                fixed: 0 1;
-                               map {
-                                       perspective_on: 1;
-                                       perspective: "map";
-                               }
                        }
                        description {
                                state: "selected" 0.0;
                                inherit: "default" 0.0;
                                color: COLOR_TEXT_FOCUS;
-                               map.on: 1;
                        }
                        description {
                                state: "selected_0" 0.0;
@@ -447,16 +384,11 @@ group {
                                align: 0.5 0.0;
                                color: COLOR_TEXT_INFO;
                                fixed: 0 1;
-                               map {
-                                       perspective_on: 1;
-                                       perspective: "map";
-                               }
                        }
                        description {
                                state: "selected" 0.0;
                                inherit: "default" 0.0;
                                color: COLOR_TEXT_FOCUS;
-                               map.on: 1;
                        }
                        description {
                                state: "selected_0" 0.0;
@@ -499,16 +431,11 @@ group {
                                align: 0.5 0.0;
                                color: COLOR_TEXT_INFO;
                                fixed: 0 1;
-                               map {
-                                       perspective_on: 1;
-                                       perspective: "map";
-                               }
                        }
                        description {
                                state: "selected" 0.0;
                                inherit: "default" 0.0;
                                color: COLOR_TEXT_FOCUS;
-                               map.on: 1;
                        }
                        description {
                                state: "selected_0" 0.0;
@@ -659,18 +586,6 @@ group {
                        name: "selected";
                        signal: "elm,state,selected";
                        source: "elm";
-                       action: STATE_SET "selected" 0.0;
-                       target: "map";
-                       after: "after_selected";
-               }
-               program {
-                       name: "after_selected";
-                       action: STATE_SET "default" 0.0;
-                       target: "map";
-                       after: "item_selected";
-               }
-               program {
-                       name: "item_selected";
                        action: SIGNAL_EMIT SIGNAL_ITEM_SELECTED SOURCE_EDC;
                }
        }

diff --git a/src/action_menu_view.c b/src/action_menu_view.c
index 063c431..701341f 100644 (file)
--- a/src/action_menu_view.c
+++ b/src/action_menu_view.c
@@ -369,7 +369,8 @@ static bool _draw_menu_area(struct _priv *priv)
                _ERR("Add table failed.");
                return false;
        }
-       elm_table_padding_set(table, BUTTON_BORDER, BUTTON_BORDER);
+       elm_table_padding_set(table,
+                               ELM_SCALE_SIZE(BUTTON_BORDER), ELM_SCALE_SIZE(BUTTON_BORDER));
        evas_object_show(table);
        elm_object_part_content_set(priv->base, PART_MENU, table);
        evas_object_smart_callback_add(priv->table, SIGNAL_CHILD_REMOVED,

diff --git a/src/main.c b/src/main.c
index c70fc51..297a821 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -18,6 +18,7 @@
 #include <Elementary.h>
 #include <viewmgr.h>
 #include <app_debug.h>
+#include <app_define.h>
 
 #include "define.h"
 #include "notification_view.h"
@@ -72,6 +73,7 @@ static bool _create(void *data)
 
        ad = data;
 
+       elm_app_base_scale_set(APP_BASE_SCALE);
        elm_theme_overlay_add(NULL, THEMEFILE);
        elm_config_focus_move_policy_set(ELM_FOCUS_MOVE_POLICY_CLICK);
 

diff --git a/src/notification_view.c b/src/notification_view.c
index b1e5686..a6d29a1 100644 (file)
--- a/src/notification_view.c
+++ b/src/notification_view.c
@@ -177,8 +177,10 @@ static Evas_Object *_add_category_grid(Evas_Object *base)
        }
 
        elm_gengrid_item_size_set(grid,
-                       NOTIFICATION_ITEM_WIDTH + NOTIFICATION_ITEM_PADDING,
-                       NOTIFICATION_ITEM_HEIGHT + NOTIFICATION_ITEM_PADDING);
+                       ELM_SCALE_SIZE(NOTIFICATION_ITEM_WIDTH +
+                                       NOTIFICATION_ITEM_PADDING),
+                       ELM_SCALE_SIZE(NOTIFICATION_ITEM_HEIGHT +
+                                       NOTIFICATION_ITEM_PADDING));
        elm_gengrid_align_set(grid, 0.0, 0.0);
        elm_gengrid_horizontal_set(grid, EINA_TRUE);
        evas_object_size_hint_weight_set(grid,
@@ -298,9 +300,9 @@ static void _draw_notification(struct _priv *priv, int category,
        if (w > NOTIFICATION_CATEGORY_WIDTH)
                w = NOTIFICATION_CATEGORY_WIDTH;
        evas_object_size_hint_min_set(priv->category[category]->grid,
-                       w,
-                       NOTIFICATION_CATEGORY_HEIGHT +
-                       NOTIFICATION_ITEM_PADDING);
+                       ELM_SCALE_SIZE(w),
+                       ELM_SCALE_SIZE(NOTIFICATION_CATEGORY_HEIGHT +
+                       NOTIFICATION_ITEM_PADDING));
 }
 
 static void _update_list(struct _priv *priv)
@@ -445,15 +447,15 @@ static Evas_Object *_create(Evas_Object *win, void *data)
        evas_object_size_hint_align_set(scroller, 0.0, 0.0);
        elm_object_content_set(priv->base, scroller);
        elm_scroller_step_size_set(scroller,
-                       NOTIFICATION_CATEGORY_STEP_SIZE, 0);
+                       ELM_SCALE_SIZE(NOTIFICATION_CATEGORY_STEP_SIZE), 0);
 
        priv->category_container = elm_box_add(scroller);
        elm_object_content_set(scroller, priv->category_container);
        elm_box_align_set(priv->category_container, 0.0, 0.0);
        elm_box_horizontal_set(priv->category_container, EINA_TRUE);
        elm_box_padding_set(priv->category_container,
-                       NOTIFICATION_CATEGORY_PADDING_X,
-                       NOTIFICATION_CATEGORY_PADDING_Y);
+                       ELM_SCALE_SIZE(NOTIFICATION_CATEGORY_PADDING_X),
+                       ELM_SCALE_SIZE(NOTIFICATION_CATEGORY_PADDING_Y));
        elm_object_focus_allow_set(scroller, EINA_FALSE);
        elm_object_focus_allow_set(priv->category_container, EINA_FALSE);
 

diff --git a/src/square_view.c b/src/square_view.c
index 0d36bf2..89d50ae 100644 (file)
--- a/src/square_view.c
+++ b/src/square_view.c
@@ -323,8 +323,8 @@ static Evas_Object *_create(Evas_Object *win, void *data)
        }
        elm_box_align_set(priv->list, 0.0, 0.0);
        elm_box_padding_set(priv->list,
-                       NOTIFICATION_ITEM_PADDING_X,
-                       NOTIFICATION_ITEM_PADDING_Y);
+                       ELM_SCALE_SIZE(NOTIFICATION_ITEM_PADDING_X),
+                       ELM_SCALE_SIZE(NOTIFICATION_ITEM_PADDING_Y));
        evas_object_show(priv->list);
        elm_object_content_set(scroller, priv->list);
        evas_object_smart_callback_add(priv->list, SIGNAL_CHILD_REMOVED,