summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Nowac <k.nowac@samsung.com>2016-10-10 09:37:59 +0200
committerHyeKyoung Hwang <cookie@samsung.com>2016-10-28 11:20:38 +0900
commit12176c996dfad4379e517f81be5d50e022e328bb (patch)
treed3033f490ce69fe9e4ed4b9bdd26a0180a2ebaf8
parent20410d3e6e1e702cc6f83703817551c970adb729 (diff)
downloadbrowser-12176c996dfad4379e517f81be5d50e022e328bb.tar.gz
browser-12176c996dfad4379e517f81be5d50e022e328bb.tar.bz2
browser-12176c996dfad4379e517f81be5d50e022e328bb.zip
Find on page does not hide on fullscreen
[Issue] http://suprem.sec.samsung.net/jira/browse/TWF-2257 [Problem] As in the title [Solution] Added signal [Verify] - Open youtube.com. open find on page. go to fullscreen in portrait mode. rotate while in fullscreen to landscape mode. find on page should not be visible. - turn off fullscreen mode find on page should be visible Change-Id: I0d300dada3806ed1568277dc56de314d5e4ed846
-rw-r--r--services/SimpleUI/SimpleUI.cpp1
-rwxr-xr-xservices/WebPageUI/WebPageUI.cpp9
-rw-r--r--services/WebPageUI/WebPageUI.h1
3 files changed, 9 insertions, 2 deletions
diff --git a/services/SimpleUI/SimpleUI.cpp b/services/SimpleUI/SimpleUI.cpp
index 2a2bb648..b83e559a 100644
--- a/services/SimpleUI/SimpleUI.cpp
+++ b/services/SimpleUI/SimpleUI.cpp
@@ -581,6 +581,7 @@ void SimpleUI::connectModelSignals()
m_webEngine->uriChanged.connect(boost::bind(&SimpleUI::webEngineURLChanged, this, _1));
m_webEngine->confirmationRequest.connect(boost::bind(&SimpleUI::handleConfirmationRequest, this, _1));
m_webEngine->getRotation.connect(boost::bind(&SimpleUI::getRotation, this));
+ m_webPageUI->isFindOnPageVisible.connect(boost::bind(&FindOnPageUI::isVisible, m_findOnPageUI.get()));
m_webEngine->openFindOnPage.connect(boost::bind(&SimpleUI::showFindOnPageUI, this, _1));
m_webEngine->closeFindOnPage.connect(boost::bind(&SimpleUI::closeFindOnPageUI, this));
m_webEngine->unsecureConnection.connect(boost::bind(&SimpleUI::showUnsecureConnectionPopup, this));
diff --git a/services/WebPageUI/WebPageUI.cpp b/services/WebPageUI/WebPageUI.cpp
index c2b4f982..f0248420 100755
--- a/services/WebPageUI/WebPageUI.cpp
+++ b/services/WebPageUI/WebPageUI.cpp
@@ -434,13 +434,18 @@ void WebPageUI::fullscreenModeSet(bool state)
{
BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
auto landscape = isLandscape();
+ auto findonpage = isFindOnPageVisible();
m_fullscreen = state;
- if (!state)
+ if (!state) {
elm_object_signal_emit(m_mainLayout, "show_uri_bar", "ui");
- else if (landscape && state) {
+ if (findonpage && *findonpage)
+ elm_object_signal_emit(m_mainLayout, "show_findonpage", "ui");
+ } else if (landscape && state) {
(*landscape) ?
elm_object_signal_emit(m_mainLayout, "hide_uri_bar_landscape", "ui") :
elm_object_signal_emit(m_mainLayout, "hide_uri_bar_vertical", "ui");
+ if (findonpage && *findonpage)
+ hideFindOnPage();
}
}
#endif
diff --git a/services/WebPageUI/WebPageUI.h b/services/WebPageUI/WebPageUI.h
index 459879db..89a6b1e7 100644
--- a/services/WebPageUI/WebPageUI.h
+++ b/services/WebPageUI/WebPageUI.h
@@ -110,6 +110,7 @@ public:
boost::signals2::signal<void ()> updateManualRotation;
boost::signals2::signal<void ()> hideMoreMenu;
boost::signals2::signal<void ()> qaOrientationChanged;
+ boost::signals2::signal<bool ()> isFindOnPageVisible;
#else
boost::signals2::signal<void ()> showZoomNavigation;
#endif