Merge pull request #516

8dc95a1 remove animation when swithing to basic layout (Jaquee)
d9a2b1a fix broken basic button (Jaquee)
This commit is contained in:
Riccardo Spagni
2017-03-03 16:26:02 +02:00
2 changed files with 17 additions and 30 deletions

View File

@@ -1046,19 +1046,15 @@ ApplicationWindow {
properties: "visible"
value: false
}
NumberAnimation {
PropertyAction {
target: appWindow
properties: "height"
to: 30
easing.type: Easing.InCubic
duration: 200
value: 30
}
NumberAnimation {
PropertyAction {
target: appWindow
properties: "width"
to: 470
easing.type: Easing.InCubic
duration: 200
value: 470
}
PropertyAction {
targets: [leftPanel, rightPanel]
@@ -1071,12 +1067,10 @@ ApplicationWindow {
value: true
}
NumberAnimation {
PropertyAction {
target: appWindow
properties: "height"
to: middlePanel.height
easing.type: Easing.InCubic
duration: 200
value: middlePanel.height
}
onStopped: {
@@ -1088,12 +1082,10 @@ ApplicationWindow {
SequentialAnimation {
id: goToProAnimation
NumberAnimation {
PropertyAction {
target: appWindow
properties: "height"
to: 30
easing.type: Easing.InCubic
duration: 200
value: 30
}
PropertyAction {
target: middlePanel
@@ -1105,19 +1097,15 @@ ApplicationWindow {
properties: "visible"
value: true
}
NumberAnimation {
PropertyAction {
target: appWindow
properties: "width"
to: rightPanelExpanded ? 1269 : 1269 - 300
easing.type: Easing.InCubic
duration: 200
value: rightPanelExpanded ? 1269 : 1269 - 300
}
NumberAnimation {
PropertyAction {
target: appWindow
properties: "height"
to: maxWindowHeight
easing.type: Easing.InCubic
duration: 200
value: maxWindowHeight
}
PropertyAction {
target: frameArea