TizenRefApp-6488 Recipients List Covers Select all Checkbox

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

diff --git a/res/edje/recipient_panel.edc b/res/edje/recipient_panel.edc
index e79f93b..4c3a90f 100755 (executable)
--- a/res/edje/recipient_panel.edc
+++ b/res/edje/recipient_panel.edc
@@ -262,12 +262,27 @@ group {
             target: "swl.contact_btn";
         }
         program {
+            name: "show_to_mbe_anim";
+            signal: "show_to_mbe_anim";
+            source: "*";
+            action: STATE_SET "show" 0.0;
+            target: "swl.mbe";
+            transition: LINEAR  0.2;
+        }
+        program {
+            name: "hide_to_mbe_anim";
+            signal: "hide_to_mbe_anim";
+            source: "*";
+            action: STATE_SET "default" 0.0;
+            target: "swl.mbe";
+            transition: LINEAR  0.2;
+        }
+        program {
             name: "show_to_mbe";
             signal: "show_to_mbe";
             source: "*";
             action: STATE_SET "show" 0.0;
             target: "swl.mbe";
-            transition: LINEAR  0.3;
         }
         program {
             name: "hide_to_mbe";
@@ -275,7 +290,6 @@ group {
             source: "*";
             action: STATE_SET "default" 0.0;
             target: "swl.mbe";
-            transition: LINEAR  0.3;
         }
         program {
             name: "show_entry";

diff --git a/src/Conversation/Main/Controller/src/Conversation.cpp b/src/Conversation/Main/Controller/src/Conversation.cpp
index d05a4ab..0b12bff 100644 (file)
--- a/src/Conversation/Main/Controller/src/Conversation.cpp
+++ b/src/Conversation/Main/Controller/src/Conversation.cpp
@@ -744,6 +744,9 @@ void Conversation::updateNavibar()
             naviBar.showButton(NaviCancelButtonId, true);
             naviBar.showButton(NaviOkButtonId, true);
             naviBar.disabledButton(NaviOkButtonId, true);
+            naviBar.setDownButtonState(false);
+            if(m_pRecipPanel)
+                m_pRecipPanel->showMbe(false, false);
         }
         else
         {

diff --git a/src/Conversation/Recipients/View/inc/ConvRecipientsPanelView.h b/src/Conversation/Recipients/View/inc/ConvRecipientsPanelView.h
index 15fa807..8f58582 100644 (file)
--- a/src/Conversation/Recipients/View/inc/ConvRecipientsPanelView.h
+++ b/src/Conversation/Recipients/View/inc/ConvRecipientsPanelView.h
@@ -34,7 +34,7 @@ namespace Msg
             virtual ~ConvRecipientsPanelView();
 
             Evas_Object *getAreaRect() const;
-            void showMbe(bool show);
+            void showMbe(bool show, bool animation = true);
             void showEntry(bool show);
             std::string getEntryText() const;
             void setEntryText(const std::string &utf8);

diff --git a/src/Conversation/Recipients/View/src/ConvRecipientsPanelView.cpp b/src/Conversation/Recipients/View/src/ConvRecipientsPanelView.cpp
index fb9525c..9f8e8ea 100644 (file)
--- a/src/Conversation/Recipients/View/src/ConvRecipientsPanelView.cpp
+++ b/src/Conversation/Recipients/View/src/ConvRecipientsPanelView.cpp
@@ -116,10 +116,15 @@ void ConvRecipientsPanelView::clear()
     clearMbe();
 }
 
-void ConvRecipientsPanelView::showMbe(bool show)
+void ConvRecipientsPanelView::showMbe(bool show, bool animation)
 {
     m_IsMbeVisible = show;
-    const char *sig = show ? "show_to_mbe" : "hide_to_mbe";
+    const char *sig = nullptr;
+    if(animation)
+        sig = show ? "show_to_mbe_anim" : "hide_to_mbe_anim";
+    else
+        sig = show ? "show_to_mbe" : "hide_to_mbe";
+
     elm_object_signal_emit(m_pLayout, sig, "*");
 }