Fixed: colors in edc.

Change-Id: Ia1f005f894dbcb386bfa9ace0fbe66d15e333e6d
Signed-off-by: Denis Dolzhenko <d.dolzhenko@samsung.com>

diff --git a/res/edje/colors_define.inl b/res/edje/colors_define.inl
index 7fc0336384c92e3c4edf0dc77835c7ef0bf9b63d..0dce2798569475e12f297e0e4f298859c881a45e 100644 (file)
--- a/res/edje/colors_define.inl
+++ b/res/edje/colors_define.inl
@@ -1,8 +1,7 @@
+#define CONV_BG_COLOR 250 250 250 255
 #define TITLE_BG_BLUE 61 185 204 255
-#define TITLE_BG_WHITE 250 250 250 255
+#define TITLE_BG_WHITE CONV_BG_COLOR
 
-#define BUBBLE_NAVI_TITLE_HEIGHT_POTRAIT 120
-#define BUBBLE_NAVI_TITLE_HEIGHT_LANDSCAPE 120
 #define BUBBLE_NAVI_TITLE_COLOR 250 250 250 255
 #define BUBBLE_NAVI_TITLE_TEXT_COLOR 46 139 153 255
 #define BUBBLE_NAVI_TITLE_ARROW_COLOR 61 185 204 255

diff --git a/res/edje/conv_layout.edc b/res/edje/conv_layout.edc
index 6cdd3988571356c5e0d6ea5ce7dca3a656c06ec6..380998bf561d929f764b6175a803c5f8eee57a81 100755 (executable)
--- a/res/edje/conv_layout.edc
+++ b/res/edje/conv_layout.edc
@@ -1,4 +1,5 @@
 #include "macros.inl"
+#include "colors_define.inl"
 
 collections {
     BASE_SCALE;
@@ -12,8 +13,8 @@ collections {
                 scale: 1;
                 mouse_events: 0;
                 description {
-                    //color_class: "B011";
                     state: "default" 0.0;
+                    color: CONV_BG_COLOR;
                 }
             }
             PADDING_TOP("conv_list.pad.top", 130);

diff --git a/res/edje/conv_list.edc b/res/edje/conv_list.edc
index 11c0174908ccb05a9fc7377a9c0e11a3f41b9a61..c9325b920a72bd59da26c7e11d608b5c9b8e96d5 100644 (file)
--- a/res/edje/conv_list.edc
+++ b/res/edje/conv_list.edc
@@ -1,6 +1,8 @@
+#include "macros.inl"
+
 #define SELECT_ALL_HEIGHT 120
 collections {
-   base_scale: 2.6;
+   BASE_SCALE;
    group { name: "conv_list_base";
       parts {
          part { name: "rect";

diff --git a/res/edje/msg_input_panel.edc b/res/edje/msg_input_panel.edc
index 4dce34a06da810020f37e2976a2793183a1dec45..27f6bfe4bde22d46d3b5fb0c8a8748a19b353273 100644 (file)
--- a/res/edje/msg_input_panel.edc
+++ b/res/edje/msg_input_panel.edc
@@ -1,4 +1,5 @@
 #include "macros.inl"
+#include "colors_define.inl"
 
 #define BODY_ADDBUTTON_SIZE 72 72
 #define BODY_SENDBUTTON_SIZE 72 68
@@ -8,6 +9,14 @@ collections {
     group {
         name: "conversation/msg_input_panel";
         parts {
+            part {
+                type: RECT;
+                scale: 1;
+                description {
+                    state: "default" 0.0;
+                    color: CONV_BG_COLOR;
+                }
+            }
             part {
                 name: "size";
                 type: SPACER;
@@ -26,7 +35,7 @@ collections {
                 description {
                     state: "default" 0.0;
                     fixed: 0 1;
-                    min: 0 4;
+                    min: 0 3;
                     rel1{relative: 0.0 0.0;}
                     rel2{relative: 1.0 0.0;}
                     align: 0.0 0.0;

diff --git a/res/edje/recipient_panel.edc b/res/edje/recipient_panel.edc
index 9021a02acc7f2745026d14affb117e45fda722b1..5d3d8c59a96b134687cd68bd39e0af4391af95da 100755 (executable)
--- a/res/edje/recipient_panel.edc
+++ b/res/edje/recipient_panel.edc
@@ -1,4 +1,5 @@
 #include "macros.inl"
+#include "colors_define.inl"
 
 #define MSG_COMPOSER_RECIPIENT_TO_FIELD_MIN_H 87
 #define CONTACT_BUTTON_PADDING_TOP 10
@@ -30,19 +31,18 @@ group {
                 rel2.to: "entry.main.bg";
             }
         }
-
         PADDING_TOP("padding_top", 0);
         PADDING_LEFT("padding_left", 0);
         PADDING_RIGHT("padding_right", 0);
         PADDING_BOTTOM("padding_bottom", 0);
         part {
-            name: "swl.mbe.bg";
+            name: "mbe.bg";
             type: RECT;
             scale: 1;
             description {
                 rel1 { to: "swl.mbe";}
                 rel2 { to: "swl.mbe";}
-                color_class: "B0211";
+                color: CONV_BG_COLOR;
             }
         }
         part {
@@ -80,6 +80,7 @@ group {
                 fixed: 1 1;
                 visible: 1;
                 align: 0.0 0.0;
+                color: CONV_BG_COLOR;
                 rel1 { to_y: "swl.mbe"; relative: 0.0 1.0; }
                 rel2 { to_y: "swl.mbe"; relative: 1.0 1.0; }
             }