Fix QML warning about state definition.

The following warning was fixed: <Unknown File>: QML StateGroup: Can't apply
a state change as part of a state definition.

Reviewed-by: Lauro Moura

2 files changed, 19 insertions, 12 deletions

diff --git a/src/mobile/qml/Main.qml b/src/mobile/qml/Main.qml
index 03de7f6..3afdffe 100644
--- a/src/mobile/qml/Main.qml
+++ b/src/mobile/qml/Main.qml
@@ -39,10 +39,12 @@ Rectangle {
         topSitesEnabled: BookmarkModel.count
         navigationEnabled: navigationPanel.hasOpennedTabs || !topSitesEnabled || panelToggle.overrideNavigationEnabled
         onTopSitesSelected: {
-            rootPage.state = "favorites";
+            if (state !== "navigationFullScreen")
+                rootPage.state = "favorites";
         }
         onTabsSelected: {
-            rootPage.state = "navigation";
+            if (state !== "navigationFullScreen")
+                rootPage.state = "navigation";
         }
     }
 
@@ -55,7 +57,10 @@ Rectangle {
             right: parent.right
             topMargin: 32
         }
-        onUrlSelected: navigationPanel.openUrlInNewTab(UrlTools.fromUserInput(url))
+        onUrlSelected: {
+            navigationPanel.openUrlInNewTab(UrlTools.fromUserInput(url));
+            panelToggle.topSitesButtonSelected = false;
+        }
     }
 
     TabsPanel {
@@ -174,7 +179,6 @@ Rectangle {
     states: [
         State {
             name: "favorites"
-            PropertyChanges { target: panelToggle; topSitesButtonSelected: true }
             PropertyChanges { target: plusButton; opacity: 1 }
             PropertyChanges { target: panelToggle; opacity: 1 }
             PropertyChanges { target: topSitesPanel; opacity: 1 }
@@ -183,7 +187,6 @@ Rectangle {
         },
         State {
             name: "navigation"
-            PropertyChanges { target: panelToggle; topSitesButtonSelected: false }
             PropertyChanges { target: plusButton; opacity: 1 }
             PropertyChanges { target: panelToggle; opacity: 1 }
             PropertyChanges { target: topSitesPanel; opacity: 0 }
@@ -192,7 +195,6 @@ Rectangle {
         },
         State {
             name: "navigationFullScreen"
-            PropertyChanges { target: panelToggle; topSitesButtonSelected: false }
             PropertyChanges { target: plusButton; opacity: 0 }
             PropertyChanges { target: panelToggle; opacity: 0 }
             PropertyChanges { target: topSitesPanel; opacity: 0 }
diff --git a/src/mobile/qml/PanelToggle.qml b/src/mobile/qml/PanelToggle.qml
index 64ee23c..d678bce 100644
--- a/src/mobile/qml/PanelToggle.qml
+++ b/src/mobile/qml/PanelToggle.qml
@@ -29,14 +29,13 @@ Image {
 
     onTopSitesEnabledChanged: {
         if (!topSitesEnabled) {
-            tabs.visible = true;
             topsites.visible = false;
+            tabsSelected();
         }
     }
 
     onNavigationEnabledChanged: {
-        if (!navigationEnabled && topSitesEnabled)
-            topsites.visible = true;
+        topsites.visible = !navigationEnabled && topSitesEnabled;
     }
 
     source: topSitesEnabled && navigationEnabled ? "qrc:///mobile/app/menu_unpressed" : "qrc:///mobile/app/menu_disabled"
@@ -44,12 +43,15 @@ Image {
     Image {
         id: topsites
         source: "qrc:///mobile/app/mysites_pressed"
-        onVisibleChanged: visible ? topSitesSelected() : tabsSelected()
+        visible: false
     }
     MouseArea {
         anchors.fill: topsites
         visible: topSitesEnabled
-        onClicked: topsites.visible = true
+        onClicked: {
+            topsites.visible = true;
+            topSitesSelected();
+        }
     }
 
     Image {
@@ -62,7 +64,10 @@ Image {
     MouseArea {
         anchors.fill: tabs
         visible: navigationEnabled || !topSitesEnabled
-        onClicked: topsites.visible = false
+        onClicked: {
+            topsites.visible = false;
+            tabsSelected();
+        }
     }
 }