Swap: state of recipient entry

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

diff --git a/res/edje/recipient_panel.edc b/res/edje/recipient_panel.edc
index 7807f1c..712cb31 100755 (executable)
--- a/res/edje/recipient_panel.edc
+++ b/res/edje/recipient_panel.edc
@@ -73,6 +73,12 @@ group {
             scale: 1;
             description {
                 state: "default" 0.0;
+                min: 0 0;
+                max: -1 0;
+                visible: 0;
+            }
+            description {
+                state: "show" 0.0;
                 min: 0 MSG_COMPOSER_RECIPIENT_TO_FIELD_MIN_H;
                 fixed: 1 1;
                 visible: 1;
@@ -80,12 +86,6 @@ group {
                 rel1 { to_y: "swl.mbe"; relative: 0.0 1.0; }
                 rel2 { to_y: "swl.mbe"; relative: 1.0 1.0; }
             }
-            description {
-                state: "hide" 0.0;
-                min: 0 0;
-                max: -1 0;
-                visible: 0;
-            }
         }
         part {
             name: "entry_padding_left";
@@ -149,6 +149,13 @@ group {
             scale: 1;
             description {
                 state: "default" 0.0;
+                visible: 0;
+                min: 0 0;
+                max: -1 0;
+            }
+            description {
+                state: "show" 0.0;
+                inherit: "default" 0.0;
                 min: 0 MSG_COMPOSER_RECIPIENT_TO_FIELD_MIN_H;
                 fixed: 1 1;
                 visible: 1;
@@ -156,13 +163,6 @@ group {
                 rel2 { to_x: "contact_padding_left"; to_y: "entry_padding_bottom"; relative: 0.0 0.0; }
             }
             description {
-                state: "hide" 0.0;
-                inherit: "default" 0.0;
-                visible: 0;
-                min: 0 0;
-                max: -1 0;
-            }
-            description {
                 state: "with_invalid_icon" 0.0;
                 min: 0 MSG_COMPOSER_RECIPIENT_TO_FIELD_MIN_H;
                 fixed: 1 1;
@@ -206,7 +206,11 @@ group {
             scale: 1;
             mouse_events: 1;
             description {
-                state: "default" 0.0;
+                visible: 0;
+            }
+            description {
+                state: "show" 0.0;
+                inherit: "default" 0.0;
                 min: 1 1;
                 fixed: 1 1;
                 visible: 1;
@@ -214,11 +218,6 @@ group {
                 rel2 { to: "rect.btn"; relative: 1.0 1.0; }
                 align: 0.5 0.5;
             }
-            description {
-                state: "hide" 0.0;
-                inherit: "default" 0.0;
-                visible: 0;
-            }
         }
         part {
             name: "rect.btn";
@@ -285,7 +284,7 @@ group {
             name: "show_entry";
             signal: "show_entry";
             source: "*";
-            action: STATE_SET "default" 0.0;
+            action: STATE_SET "show" 0.0;
             target: "swl.entry";
             target: "entry.main.bg";
             target: "swl.contact_btn";
@@ -294,7 +293,7 @@ group {
             name: "hide_entry";
             signal: "hide_entry";
             source: "*";
-            action: STATE_SET "hide" 0.0;
+            action: STATE_SET "default" 0.0;
             target: "swl.entry";
             target: "entry.main.bg";
             target: "swl.contact_btn";

diff --git a/src/Conversation/Recipients/View/src/ConvRecipientsPanelView.cpp b/src/Conversation/Recipients/View/src/ConvRecipientsPanelView.cpp
index bbdc2dc..6a1e4e9 100644 (file)
--- a/src/Conversation/Recipients/View/src/ConvRecipientsPanelView.cpp
+++ b/src/Conversation/Recipients/View/src/ConvRecipientsPanelView.cpp
@@ -183,8 +183,6 @@ Evas_Object *ConvRecipientsPanelView::createEntry(Evas_Object *parent)
     limitFilter.max_char_count = m_EntryMaxCharCount;
     elm_entry_markup_filter_append(m_pEntry, elm_entry_filter_limit_size, &limitFilter);
 
-    evas_object_show(m_pEntry);
-
     evas_object_smart_callback_add(m_pEntry, "changed", SMART_CALLBACK(ConvRecipientsPanelView, onEntryChanged), this);
     evas_object_smart_callback_add(m_pEntry, "focused", SMART_CALLBACK(ConvRecipientsPanelView, onEntryFocusChanged), this);
     evas_object_smart_callback_add(m_pEntry, "unfocused", SMART_CALLBACK(ConvRecipientsPanelView, onEntryFocusChanged), this);