Solved Issue #318 and added states to back button

This commit is contained in:
Alexandre Van de Sande 2015-02-16 14:34:47 +01:00
parent 05f2808849
commit 1878630b59
6 changed files with 21 additions and 20 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 634 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 657 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

@ -485,7 +485,7 @@ ApplicationWindow {
label.visible = !on label.visible = !on
buttonLabel.visible = on buttonLabel.visible = on
} }
width: 192 width: 192
height: 55 height: 55
color: "#00000000" color: "#00000000"

View File

@ -129,9 +129,9 @@ Rectangle {
Button { Button {
id: back id: back
z: 30
onClicked: { onClicked: {
webview.goBack() webview.goBack()
} }
anchors { anchors {
@ -140,21 +140,23 @@ Rectangle {
} }
style: ButtonStyle { style: ButtonStyle {
background: Image { background: Image {
source: "../../backButton.png" source: (webview.canGoBack) ?
width: 20 (control.hovered ? "../../backButtonHover.png" : "../../backButton.png") :
height: 30 "../../backButtonDisabled.png"
} width: 20
height: 30
}
} }
} }
Rectangle { Rectangle {
id: appInfoPane id: appInfoPane
height: 28 height: 28
color: "#FFFFFF" color: "#FFFFFF"
radius: 6 radius: 6
z:2
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
z: 10 z: 10
hoverEnabled: true hoverEnabled: true
@ -247,7 +249,7 @@ Rectangle {
} }
} }
z:2
} }
Rectangle { Rectangle {
@ -256,6 +258,7 @@ Rectangle {
height: 30 height: 30
color: "#BDB6B6" color: "#BDB6B6"
radius: 6 radius: 6
z:1
anchors { anchors {
left: back.right left: back.right
@ -264,19 +267,17 @@ Rectangle {
rightMargin:10 rightMargin:10
top: parent.top top: parent.top
topMargin: 23 topMargin: 23
} }
z:1
} }
Rectangle { Rectangle {
id: navBarBackground id: navBarBackground
anchors.fill: parent anchors.fill: parent
z:-1
gradient: Gradient { gradient: Gradient {
GradientStop { position: 0.0; color: "#F6F1F2" } GradientStop { position: 0.0; color: "#F6F1F2" }
GradientStop { position: 1.0; color: "#DED5D5" } GradientStop { position: 1.0; color: "#DED5D5" }
} }
z:-1
} }
states: [ states: [