layout fixes

This commit is contained in:
Marco Martin 2011-11-10 16:21:42 +01:00
parent 580c5540fa
commit 8138287161

View File

@ -123,19 +123,20 @@ Item{
fill: parent fill: parent
leftMargin: -margins.left leftMargin: -margins.left
rightMargin: -margins.right rightMargin: -margins.right
topMargin: toolBar.y <= 0 ? -margins.top : 0 //FIXME: difference between actial border and shadow
bottomMargin: toolBar.y >= toolBar.parent.height - toolBar.height ? -margins.bottom : 0 topMargin: toolBar.y <= 0 ? -margins.top : -margins.top/2
bottomMargin: toolBar.y >= toolBar.parent.height - toolBar.height ? -margins.bottom : -margins.bottom/2
} }
} }
Item { Item {
clip: true clip: containerAOpacityAnimation.running
anchors { anchors {
fill: parent fill: parent
leftMargin: parent.margins.left leftMargin: frameSvg.margins.left/2
topMargin: parent.margins.top topMargin: frameSvg.margins.top/2
rightMargin: parent.margins.right rightMargin: frameSvg.margins.right/2
bottomMargin: parent.margins.bottom bottomMargin: frameSvg.margins.bottom/2
} }
Item { Item {
@ -147,7 +148,10 @@ Item{
//this asymmetry just to not export a property //this asymmetry just to not export a property
property bool current: false property bool current: false
Behavior on opacity { Behavior on opacity {
PropertyAnimation { duration: 250 } PropertyAnimation {
id: containerAOpacityAnimation
duration: 250
}
} }
Behavior on x { Behavior on x {
enabled: containerA.animationsEnabled enabled: containerA.animationsEnabled