From fb90bcfb1dd687d2ef54cf59f18d8e008d56378f Mon Sep 17 00:00:00 2001 From: Denis Dolzhenko Date: Tue, 18 Oct 2016 14:52:53 +0300 Subject: [PATCH] Fixed: reicp. entry focus Change-Id: I7e8538af720fbdff03adb8b053b233c1556b02f6 Signed-off-by: Denis Dolzhenko --- src/Conversation/Main/Controller/src/Conversation.cpp | 2 +- src/Conversation/Recipients/Controller/src/ConvRecipientsPanel.cpp | 2 +- src/Conversation/Recipients/View/src/ConvRecipientsPanelView.cpp | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Conversation/Main/Controller/src/Conversation.cpp b/src/Conversation/Main/Controller/src/Conversation.cpp index 15e846a..b6cb08f 100644 --- a/src/Conversation/Main/Controller/src/Conversation.cpp +++ b/src/Conversation/Main/Controller/src/Conversation.cpp @@ -375,7 +375,7 @@ void Conversation::setNewMessageMode() m_pRecipPanel->update(m_ThreadId); m_pRecipPanel->showMbe(!m_pRecipPanel->isMbeEmpty()); m_pRecipPanel->showEntry(true); - m_pRecipPanel->setFocus(true); // TODO: Not bad to remove from here + m_pRecipPanel->setEntryFocus(true); // TODO: Not bad to remove from here } void Conversation::setConversationMode() diff --git a/src/Conversation/Recipients/Controller/src/ConvRecipientsPanel.cpp b/src/Conversation/Recipients/Controller/src/ConvRecipientsPanel.cpp index 662a788..aae1b21 100644 --- a/src/Conversation/Recipients/Controller/src/ConvRecipientsPanel.cpp +++ b/src/Conversation/Recipients/Controller/src/ConvRecipientsPanel.cpp @@ -300,7 +300,7 @@ void ConvRecipientsPanel::onContactsPicked(const std::list &addressI else if(duplicateRecip != 0) appendStatusHandler(MbeRecipients::DuplicatedStatus); - setEntryFocus(true); //FIXME: appending of two contacts breaks focus handle. + setEntryFocus(true); } void ConvRecipientsPanel::onPopupBtnClicked(Popup &popup, int buttonId) diff --git a/src/Conversation/Recipients/View/src/ConvRecipientsPanelView.cpp b/src/Conversation/Recipients/View/src/ConvRecipientsPanelView.cpp index 4aad5cb..dcf5bf9 100644 --- a/src/Conversation/Recipients/View/src/ConvRecipientsPanelView.cpp +++ b/src/Conversation/Recipients/View/src/ConvRecipientsPanelView.cpp @@ -193,6 +193,7 @@ Evas_Object *ConvRecipientsPanelView::getEntry() m_pEntryLayout = elm_layout_add(m_pLayout); elm_layout_theme_set(m_pEntryLayout, "layout", "searchfield", "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); @@ -208,6 +209,7 @@ Evas_Object *ConvRecipientsPanelView::getEntry() elm_entry_autocapital_type_set(m_pEntry, ELM_AUTOCAPITAL_TYPE_NONE); elm_entry_input_panel_return_key_type_set(m_pEntry, ELM_INPUT_PANEL_RETURN_KEY_TYPE_NEXT); setText(m_pEntry, msgt("IDS_MSGF_BODY_RECIPIENTS"), "elm.guide"); + processSignal(m_pEntry); Elm_Entry_Filter_Limit_Size limitFilter = {}; limitFilter.max_char_count = m_EntryMaxCharCount; @@ -221,6 +223,8 @@ Evas_Object *ConvRecipientsPanelView::getEntry() evas_object_event_callback_add(m_pEntry, EVAS_CALLBACK_KEY_DOWN, EVAS_EVENT_CALLBACK(ConvRecipientsPanelView, onKeyDown), this); addGeometryChangedCb(m_pEntry); elm_object_content_set(m_pEntryLayout, m_pEntry); + processSignal(m_pEntryLayout); + return m_pEntryLayout; } -- 2.7.4