diff options
| author | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-08-04 15:50:16 +0200 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-08-12 17:22:03 +0200 |
| commit | 580e7a3de51abc3451ca5835f852aa6d3317f1db (patch) | |
| tree | 2c0a59540a0d435452404c3dc2414cbcf5db282b /src | |
| parent | 4c772167d9e6adef4eab1b6ca40d3a060d1a7461 (diff) | |
Small fixes for transitions
Prevent the navigation bar to hide when error message is shown
or when the page view shows the 'tab' list.
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/HomeScreen.qml | 12 | ||||
| -rw-r--r-- | src/qml/NavigationBar.qml | 4 | ||||
| -rw-r--r-- | src/qml/PageView.qml | 1 |
3 files changed, 16 insertions, 1 deletions
diff --git a/src/qml/HomeScreen.qml b/src/qml/HomeScreen.qml index 4e62040..984b3cc 100644 --- a/src/qml/HomeScreen.qml +++ b/src/qml/HomeScreen.qml @@ -550,6 +550,10 @@ Rectangle { color: "transparent" visible: true } + PropertyChanges { + target: navigation + state: "enabled" + } }, State { name: "full" @@ -561,6 +565,10 @@ Rectangle { target: messageBox visible: true } + PropertyChanges { + target: navigation + state: "enabled" + } }, State { name: "tabsfull" @@ -572,6 +580,10 @@ Rectangle { target: messageBox visible: true } + PropertyChanges { + target: navigation + state: "enabled" + } } ] } diff --git a/src/qml/NavigationBar.qml b/src/qml/NavigationBar.qml index bb81139..29114aa 100644 --- a/src/qml/NavigationBar.qml +++ b/src/qml/NavigationBar.qml @@ -296,8 +296,10 @@ ToolBar { homeScreen.remove("", idx) return } + var count = homeScreen.count homeScreen.add(webView.title, webView.url, icon, engine.fallbackColor()) - bookmarked = true + if (count < homeScreen.count) + bookmarked = true } Component.onCompleted: refresh() } diff --git a/src/qml/PageView.qml b/src/qml/PageView.qml index 101d448..1ada1b4 100644 --- a/src/qml/PageView.qml +++ b/src/qml/PageView.qml @@ -408,6 +408,7 @@ Rectangle { PropertyChanges { target: wrapper; width: root.width; height: root.height; visibility: 0.0 } PropertyChanges { target: pathView; interactive: false } PropertyChanges { target: item; opacity: 1.0 } + PropertyChanges { target: navigation; state: "enabled" } }, State { name: "list" |