From: Kamil Nowac Date: Tue, 6 Sep 2016 13:29:33 +0000 (+0200) Subject: Hide bottom bar on IME open event X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ffb49a61debd775eb64611341d65bdd5c881bd61;p=profile%2Fcommon%2Fapps%2Fweb%2Fbrowser.git Hide bottom bar on IME open event [Issue] http://suprem.sec.samsung.net/jira/browse/TWF-1799 [Problem] Bottom bar is always shown [Solution] Added hide event [Verify] Open IME -> bottom bar should be invisible Close IME -> bottom bar should be visible Change-Id: Id39347c0d0ba24920c758fcd2b9482956a93d9df --- diff --git a/services/SimpleUI/SimpleUI.cpp b/services/SimpleUI/SimpleUI.cpp index f35689dd..c2670dec 100755 --- a/services/SimpleUI/SimpleUI.cpp +++ b/services/SimpleUI/SimpleUI.cpp @@ -915,6 +915,7 @@ void SimpleUI::onUrlIMEOpened(void* data, Evas_Object*, void*) { BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__); SimpleUI* self = reinterpret_cast(data); + self->m_webPageUI->showBottomBar(false); self->setwvIMEStatus(true); } @@ -922,6 +923,7 @@ void SimpleUI::onUrlIMEClosed(void* data, Evas_Object*, void*) { BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__); SimpleUI* self = reinterpret_cast(data); + self->m_webPageUI->showBottomBar(true); self->setwvIMEStatus(false); } #endif diff --git a/services/WebPageUI/WebPageUI.cpp b/services/WebPageUI/WebPageUI.cpp index e6de84c6..677a3368 100755 --- a/services/WebPageUI/WebPageUI.cpp +++ b/services/WebPageUI/WebPageUI.cpp @@ -711,6 +711,15 @@ void WebPageUI::setContentFocus() getURIEntry().clearFocus(); } +void WebPageUI::showBottomBar(bool isShown) +{ + BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__); + if (isShown) + elm_object_signal_emit(m_mainLayout, "show,bottom", ""); + else + elm_object_signal_emit(m_mainLayout, "hide,bottom", ""); +} + void WebPageUI::_content_clicked(void *data, Evas_Object *, void *) { BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__); diff --git a/services/WebPageUI/WebPageUI.h b/services/WebPageUI/WebPageUI.h index 8d9cdfb0..7c791c84 100755 --- a/services/WebPageUI/WebPageUI.h +++ b/services/WebPageUI/WebPageUI.h @@ -116,6 +116,7 @@ public: void mobileEntryFocused(); void mobileEntryUnfocused(); void setContentFocus(); + void showBottomBar(bool isShown); static Eina_Bool _hideDelay(void *data); void setDesktopMode(bool desktopMode) {m_desktopMode = desktopMode;} bool getDesktopMode() { return m_desktopMode; } diff --git a/services/WebPageUI/edc/WebPageUI.edc b/services/WebPageUI/edc/WebPageUI.edc index 3aaf483b..72c14b62 100644 --- a/services/WebPageUI/edc/WebPageUI.edc +++ b/services/WebPageUI/edc/WebPageUI.edc @@ -256,12 +256,7 @@ collections { base_scale: 2.6; rel2 { relative: 1.0 1.0; to: "bg"; } } description { - state: "hidden_vertical" 0.0; - inherit: "default" 0.0; - rel1 {relative: 0.0 1.0; to:"bg";} - } - description { - state: "hidden_landscape" 0.0; + state: "hidden" 0.0; inherit: "default" 0.0; rel1 {relative: 0.0 1.0; to:"bg";} } @@ -385,6 +380,16 @@ collections { base_scale: 2.6; action: STATE_SET "progress" 1.00; target: "progress_bar"; } + program { name: "hide,bottom"; + signal: "hide,bottom"; + action: STATE_SET "hidden" 0.0; + target: "bottom_toolbar"; + } + program { name: "show,bottom"; + signal: "show,bottom"; + action: STATE_SET "default" 0.0; + target: "bottom_toolbar"; + } } #include "WebPageUIUrlHistoryList.edc"