Merge pull request #206 from rainemak/currentPageActive

Keep current page active
sailfishos · Oct 20, 2014 · 29ab092 · 29ab092
2 parents f74bdb9 + 86901ec
commit 29ab092
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/declarativewebpage.cpp b/src/declarativewebpage.cpp
@@ -57,7 +57,10 @@ int DeclarativeWebPage::tabId() const
 
 void DeclarativeWebPage::setTabId(int tabId)
 {
-    m_tabId = tabId;
+    if (m_tabId != tabId) {
+        m_tabId = tabId;
+        emit tabIdChanged();
+    }
 }
 
 bool DeclarativeWebPage::domContentLoaded() const

diff --git a/src/declarativewebpage.h b/src/declarativewebpage.h
@@ -21,7 +21,7 @@ class DeclarativeWebContainer;
 class DeclarativeWebPage : public QuickMozView {
     Q_OBJECT
     Q_PROPERTY(DeclarativeWebContainer* container READ container NOTIFY containerChanged FINAL)
-    Q_PROPERTY(int tabId READ tabId FINAL)
+    Q_PROPERTY(int tabId READ tabId NOTIFY tabIdChanged FINAL)
     Q_PROPERTY(bool viewReady MEMBER m_viewReady NOTIFY viewReadyChanged FINAL)
     Q_PROPERTY(bool loaded MEMBER m_loaded NOTIFY loadedChanged FINAL)
     Q_PROPERTY(bool userHasDraggedWhileLoading MEMBER m_userHasDraggedWhileLoading NOTIFY userHasDraggedWhileLoadingChanged FINAL)
@@ -57,6 +57,7 @@ class DeclarativeWebPage : public QuickMozView {
 
 signals:
     void containerChanged();
+    void tabIdChanged();
     void viewReadyChanged();
     void loadedChanged();
     void userHasDraggedWhileLoadingChanged();

diff --git a/src/pages/components/WebView.qml b/src/pages/components/WebView.qml
@@ -148,7 +148,7 @@ WebContainer {
             enabled: container.active
             // Active could pause e.g. video in cover by anding
             // Qt.application.active to visible
-            active: visible
+            active: visible || container.tabId == tabId
 
             // There needs to be enough content for enabling chrome gesture
             chromeGestureThreshold: container.toolbarHeight / 2