TizenRefApp-9647 Fix moreOption hide/show

Change-Id: I16ddec15b8a9fb1129ddd1f4413c0eb41d3a9ffd
Signed-off-by: Evgen Servetnik <e.servetnik@samsung.com>

diff --git a/res/edje/default_layout.edc b/res/edje/default_layout.edc
index 15355ac2102dd544c956ac682e1e594a0e9d37c7..57f47e2a0f1ec48cef4921e66a3ae52354bbc69c 100755 (executable)
--- a/res/edje/default_layout.edc
+++ b/res/edje/default_layout.edc
@@ -68,16 +68,8 @@ collections {
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-                visible: 0;
-            }
-            description { state: "show" 0.0;
-                inherit: "default" 0.0;
                 visible: 1;
             }
-            description { state: "hide" 0.0;
-                inherit: "default" 0.0;
-                visible: 0;
-            }
          }
       }
       programs {
@@ -85,8 +77,6 @@ collections {
          SIG("show_nocontent", "show", "swl.nocontent");
          SIG("hide_content", "hide", "swl.content");
          SIG("show_content", "show", "swl.content");
-         SIG("hide_more_option", "hide", "swl.more_option");
-         SIG("show_more_option", "show", "swl.more_option");
          SIG("hide_select_button", "hide", "swl.select_button");
          SIG("show_select_button", "show", "swl.select_button");
          SIG("hide_bottom_button", "hide", "swl.bottom_button");

diff --git a/src/Common/View/inc/DefaultLayout.h b/src/Common/View/inc/DefaultLayout.h
index 190fdda9338f6c12f6560f92c351924155336c86..b21bd5c86e411d545b500a6d0ea02c619493c6ea 100644 (file)
--- a/src/Common/View/inc/DefaultLayout.h
+++ b/src/Common/View/inc/DefaultLayout.h
@@ -34,7 +34,6 @@ namespace Msg {
 
                        void showContent(bool show);
                        void showNoContent(bool show);
-                       void showMoreOption(bool show);
                        void showSelectButton(bool show);
                        void showBottomButton(bool show);
        };

diff --git a/src/Common/View/inc/MoreOption.h b/src/Common/View/inc/MoreOption.h
index d9f82fd2060b26d7d15a91b5f9dd7e11df47002c..1e8f41ff78e8500cd20682c803cc2e6f6b538cdb 100644 (file)
--- a/src/Common/View/inc/MoreOption.h
+++ b/src/Common/View/inc/MoreOption.h
@@ -71,6 +71,7 @@ namespace Msg {
                        bool getOpened() const;
                        void addOpenedCb(Evas_Smart_Cb cb, void *data);
                        void addClosedCb(Evas_Smart_Cb cb, void *data);
+                       void showCue(bool showed = true);
 
                private:
                        void onItemClicked(Evas_Object *obj, void *event);

diff --git a/src/Common/View/src/DefaultLayout.cpp b/src/Common/View/src/DefaultLayout.cpp
index a3af7d959b19f1845a4bf1eed810bdde217ae091..286bca067be9037d5f68c71a62924bb9f1df9e92 100644 (file)
--- a/src/Common/View/src/DefaultLayout.cpp
+++ b/src/Common/View/src/DefaultLayout.cpp
@@ -65,12 +65,6 @@ void DefaultLayout::showNoContent(bool show)
        emitSignal(sig);
 }
 
-void DefaultLayout::showMoreOption(bool show)
-{
-       const char *sig = show ? "show_more_option" : "hide_more_option";
-       emitSignal(sig);
-}
-
 void DefaultLayout::showSelectButton(bool show)
 {
        const char *sig = show ? "show_select_button" : "hide_select_button";

diff --git a/src/Common/View/src/MoreOption.cpp b/src/Common/View/src/MoreOption.cpp
index 120d2888a29b78828d9c8ad07fd70059586efcbf..4ecf44b07d9bd2d746201372408ed0bdf0c84e36 100644 (file)
--- a/src/Common/View/src/MoreOption.cpp
+++ b/src/Common/View/src/MoreOption.cpp
@@ -154,6 +154,13 @@ void MoreOption::addClosedCb(Evas_Smart_Cb cb, void *data)
        addSmartCb("more,option,closed", cb, data);
 }
 
+void MoreOption::showCue(bool showed)
+{
+       const char *sig = showed ? "cue,show" : "cue,hide";
+       Evas_Object *panelRight = getContent("elm.swallow.right");
+       emitSignal(panelRight, sig, "elm");
+}
+
 void MoreOption::onItemClicked(Evas_Object *obj, void *event)
 {
        MSG_LOG("");

diff --git a/src/Conversation/Controller/src/ConvFrame.cpp b/src/Conversation/Controller/src/ConvFrame.cpp
index f36c9995b8befcd8ec73a715fc708e2128b69d4e..2b0050ec30e9c731dbd987fbd27fa5a3fe0e46f5 100644 (file)
--- a/src/Conversation/Controller/src/ConvFrame.cpp
+++ b/src/Conversation/Controller/src/ConvFrame.cpp
@@ -77,7 +77,7 @@ void ConvFrame::setNormalMode(bool value)
 {
        MSG_LOG("");
        m_Mode = NormalMode;
-       m_pLayout->showMoreOption(true);
+       m_pMoreOption->showCue(true);
        m_pLayout->showBottomButton(false);
        if (m_pSelectButton)
                m_pSelectButton->showButton(false);
@@ -94,7 +94,7 @@ void ConvFrame::setDeleteMode(bool value)
                m_pSelectButton->showButton(true);
                m_pDeleteButton->disabled(true);
                m_pLayout->showBottomButton(true);
-               m_pLayout->showMoreOption(false);
+               m_pMoreOption->showCue(false);
                m_pList->setDeleteMode(true);
                updateDeleteViews();
        }

diff --git a/src/MsgThread/Controller/src/MsgThreadFrame.cpp b/src/MsgThread/Controller/src/MsgThreadFrame.cpp
index c5b99888b659a643315f8c474a8ccade10649efd..aaada65410e3b3bbf887d5e92a94479703af6837 100644 (file)
--- a/src/MsgThread/Controller/src/MsgThreadFrame.cpp
+++ b/src/MsgThread/Controller/src/MsgThreadFrame.cpp
@@ -83,7 +83,7 @@ void MsgThreadFrame::setNormalMode()
        MSG_LOG("");
        m_Mode = NormalMode;
        hideSelectPopup();
-       m_pLayout->showMoreOption(true);
+       m_pMoreOption->showCue(true);
        m_pLayout->showBottomButton(false);
        if (m_pSelectButton)
                m_pSelectButton->showButton(false);
@@ -101,7 +101,7 @@ void MsgThreadFrame::setDeleteMode()
                m_pSelectButton->showButton(true);
                m_pDeleteButton->disabled(true);
                m_pLayout->showBottomButton(true);
-               m_pLayout->showMoreOption(false);
+               m_pMoreOption->showCue(false);
                m_pThreadList->setDeleteMode(true);
        }
 }

diff --git a/src/Settings/Controller/src/SettingsBlockedMessagesFrame.cpp b/src/Settings/Controller/src/SettingsBlockedMessagesFrame.cpp
index e9477ad2cb97e9a95c45082c895029046af422da..a3f5845269599a788758e3c958271fc9bc83ffa9 100644 (file)
--- a/src/Settings/Controller/src/SettingsBlockedMessagesFrame.cpp
+++ b/src/Settings/Controller/src/SettingsBlockedMessagesFrame.cpp
@@ -90,7 +90,6 @@ void SettingsBlockedMessagesFrame::prepareMainLayout()
        if (!m_pLayout) {
                m_pLayout = new DefaultLayout(getParent());
                m_pLayout->showSelectButton(true);
-               m_pLayout->showMoreOption(true);
                m_pLayout->addHwButtonEvent(EEXT_CALLBACK_BACK, makeCbFirst(&SettingsBlockedMessagesFrame::onHwBackButtonPressed), this);
        }
 }
@@ -221,7 +220,7 @@ void SettingsBlockedMessagesFrame::updateNoContent()
 
        m_pLayout->showNoContent(noContent);
        m_pLayout->showContent(!noContent);
-       m_pLayout->showMoreOption(!noContent);
+       m_pMoreOption->showCue(!noContent);
 }
 
 void SettingsBlockedMessagesFrame::deleteMessages(const std::vector<BlockedMsgListItem*> &items)

diff --git a/src/Settings/Controller/src/SettingsBlockedMsgDetailFrame.cpp b/src/Settings/Controller/src/SettingsBlockedMsgDetailFrame.cpp
index 4f9ab43c0b7b17525e65354b815bdd46b477dda8..c4906f042e2e282d05ad454c50339b9dd6950d63 100644 (file)
--- a/src/Settings/Controller/src/SettingsBlockedMsgDetailFrame.cpp
+++ b/src/Settings/Controller/src/SettingsBlockedMsgDetailFrame.cpp
@@ -100,7 +100,6 @@ void SettingsBlockedMsgDetailFrame::prepareMainLayout()
 {
        if (!m_pLayout) {
                m_pLayout = new DefaultLayout(getParent());
-               m_pLayout->showMoreOption(true);
        }
 }
 

diff --git a/src/Settings/Controller/src/SettingsBlockedNumbersFrame.cpp b/src/Settings/Controller/src/SettingsBlockedNumbersFrame.cpp
index d42605933a919528a0ca1f94edc4c78e106c08fb..39d551a5d38054da2df8d342a762e5f5e62ca93b 100644 (file)
--- a/src/Settings/Controller/src/SettingsBlockedNumbersFrame.cpp
+++ b/src/Settings/Controller/src/SettingsBlockedNumbersFrame.cpp
@@ -67,7 +67,7 @@ void SettingsBlockedNumbersFrame::setSelectMode(bool value)
 
        m_IsSelectMode = value;
        m_pLayout->showBottomButton(value);
-       m_pLayout->showMoreOption(!value);
+       m_pMoreOption->showCue(!value);
        m_pList->setCheckMode(value);
        m_pList->checkAllItems(false);
        m_pList->updateRealizedItems();
@@ -88,7 +88,6 @@ void SettingsBlockedNumbersFrame::prepareMainLayout()
        if (!m_pLayout) {
                m_pLayout = new DefaultLayout(getParent());
                m_pLayout->showSelectButton(true);
-               m_pLayout->showMoreOption(true);
                m_pLayout->addHwButtonEvent(EEXT_CALLBACK_BACK, makeCbFirst(&SettingsBlockedNumbersFrame::onHwBackButtonPressed), this);
        }
 }
@@ -213,7 +212,8 @@ void SettingsBlockedNumbersFrame::updateNoContent()
 
        m_pLayout->showNoContent(noContent);
        m_pLayout->showContent(!noContent);
-       m_pLayout->showMoreOption(!noContent);
+       m_pMoreOption->showCue(!noContent);
+
 }
 
 void SettingsBlockedNumbersFrame::deleteNumbers(const std::vector<BlockedNumberListItem*> &items)