Commit dd70b5cc authored by Urs Fleisch's avatar Urs Fleisch
Browse files

QML: Common flickable for all collapsibles.

parent 5c82f866
......@@ -64,39 +64,45 @@ Page {
anchors.margins: constants.margins
width: parent.rightSideSpace
FileCollapsible {
id: collapsibleFile
anchors.topMargin: constants.margins
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
onMainMenuRequested: constants.openPopup(mainMenuPopoverComponent,
caller)
}
Tag1Collapsible {
id: collapsibleV1
anchors.topMargin: constants.margins
anchors.top: collapsibleFile.bottom
anchors.left: parent.left
anchors.right: parent.right
}
Tag2Collapsible {
id: collapsibleV2
anchors.topMargin: constants.margins
anchors.top: collapsibleV1.bottom
anchors.bottom: collapsiblePicture.top
anchors.left: parent.left
anchors.right: parent.right
}
PictureCollapsible {
id: collapsiblePicture
anchors.topMargin: constants.margins
anchors.bottom: parent.bottom
anchors.left: parent.left
anchors.right: parent.right
Flickable {
anchors.fill: parent
contentWidth: width
contentHeight: collapsibleColumn.height
clip: true
Column {
id: collapsibleColumn
width: parent.width
FileCollapsible {
id: collapsibleFile
anchors.topMargin: constants.margins
anchors.left: parent.left
anchors.right: parent.right
onMainMenuRequested: constants.openPopup(mainMenuPopoverComponent,
caller)
}
Tag1Collapsible {
id: collapsibleV1
anchors.topMargin: constants.margins
anchors.left: parent.left
anchors.right: parent.right
}
Tag2Collapsible {
id: collapsibleV2
anchors.topMargin: constants.margins
anchors.left: parent.left
anchors.right: parent.right
}
PictureCollapsible {
id: collapsiblePicture
anchors.topMargin: constants.margins
anchors.left: parent.left
anchors.right: parent.right
}
}
}
}
......
......@@ -64,7 +64,9 @@ Collapsible {
enabled: app.selectionInfo.tag1Used
clip: true
width: parent.width
height: 7 * constants.rowHeight
//height: count * constants.rowHeight //@QtQuick1
height: count ? contentHeight : 0 //@QtQuick2
interactive: false
model: app.frameModelV1
delegate: FrameDelegate {
width: frameTableV1.width
......
......@@ -87,7 +87,9 @@ Collapsible {
id: frameTableV2
clip: true
width: parent.width
height: collapsibleV2.height - constants.gu(4)
//height: count * constants.rowHeight //@QtQuick1
height: count ? contentHeight : 0 //@QtQuick2
interactive: false
model: app.frameModelV2
delegate: FrameDelegate {
width: frameTableV2.width
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment