Fixed: UI of recipients field(recipient-area border was overlapping message-bubbles)

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

diff --git a/res/edje/conv_layout.edc b/res/edje/conv_layout.edc
index eeda55ce8d6dc1c84d9792aa575d2c002f19a624..65c2d9caacdfd1eb7a2d3ca4d600dfe3bd50c5d2 100755 (executable)
--- a/res/edje/conv_layout.edc
+++ b/res/edje/conv_layout.edc
@@ -1,6 +1,8 @@
 #include "macros.inl"
 #include "colors_define.inl"
 
+#define RECIPIENT_TO_FIELD_MIN_H 81
+
 collections {
     BASE_SCALE;
     group
@@ -17,7 +19,7 @@ collections {
                     color: CONV_BG_COLOR;
                 }
             }
-            PADDING_TOP("conv_list.pad.top", 130);
+            PADDING_TOP("conv_list.pad.top", RECIPIENT_TO_FIELD_MIN_H);
             part {
                 name: "swl.bubble";
                 type: SWALLOW;

diff --git a/res/edje/recipient_panel.edc b/res/edje/recipient_panel.edc
index f90464d7891414018e74e5a6b2f631c3ba2bde3a..8f58ba835b6b564601bfb1da9c8bc5b63a62b70a 100755 (executable)
--- a/res/edje/recipient_panel.edc
+++ b/res/edje/recipient_panel.edc
@@ -1,7 +1,7 @@
 #include "macros.inl"
 #include "colors_define.inl"
 
-#define MSG_COMPOSER_RECIPIENT_TO_FIELD_MIN_H 80
+#define RECIPIENT_TO_FIELD_MIN_H 80
 #define BUTTON_SIZE 50 50
 #define BUTTON_RECT_SIZE 80 80
 #define RECIP_FAILED_COLOR 246 183 183 255
@@ -22,7 +22,7 @@ group {
             scale: 1;
             description {
                 state: "default" 0.0;
-                min: 0 MSG_COMPOSER_RECIPIENT_TO_FIELD_MIN_H;
+                min: 0 RECIPIENT_TO_FIELD_MIN_H;
                 rel1.to: "swl.mbe";
                 rel2.to: "entry.main.bg";
             }
@@ -72,7 +72,7 @@ group {
             }
             description {
                 state: "show" 0.0;
-                min: 0 MSG_COMPOSER_RECIPIENT_TO_FIELD_MIN_H;
+                min: 0 RECIPIENT_TO_FIELD_MIN_H;
                 fixed: 1 1;
                 visible: 1;
                 align: 0.0 0.0;
@@ -151,7 +151,7 @@ group {
             description {
                 state: "show" 0.0;
                 inherit: "default" 0.0;
-                min: 0 MSG_COMPOSER_RECIPIENT_TO_FIELD_MIN_H;
+                min: 0 RECIPIENT_TO_FIELD_MIN_H;
                 max: -1 -1;
                 rel1 { to_x: "entry_padding_left"; to_y: "entry_padding_top"; relative: 1.0 1.0; }
                 rel2 { to_x: "swl.contact_btn"; to_y: "entry_padding_bottom"; relative: 0.0 0.0; }

diff --git a/src/Conversation/Recipients/View/src/ConvRecipientsPanelView.cpp b/src/Conversation/Recipients/View/src/ConvRecipientsPanelView.cpp
index dcf5bf92b9e52441ef40573fce68749ca3b98851..02623e0864aa1ce387afb515a4a50d5b5367b647 100644 (file)
--- a/src/Conversation/Recipients/View/src/ConvRecipientsPanelView.cpp
+++ b/src/Conversation/Recipients/View/src/ConvRecipientsPanelView.cpp
@@ -192,7 +192,7 @@ Evas_Object *ConvRecipientsPanelView::getEntry()
         return m_pEntryLayout;
 
     m_pEntryLayout = elm_layout_add(m_pLayout);
-    elm_layout_theme_set(m_pEntryLayout, "layout", "searchfield", "singleline");
+    elm_layout_theme_set(m_pEntryLayout, "layout", "editfield", "singleline");
     evas_object_show(m_pEntryLayout);
     elm_object_part_content_set(m_pEntryLayout, "elm.swallow.button", createClearButton(m_pEntryLayout));
     elm_object_part_content_set(m_pLayout, "swl.entry", m_pEntryLayout);