alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

put buttons in the titlebar

Browse Source
This commit is contained in:
Marco Martin 2012-03-29 17:21:20 +02:00
parent 58d281d0b9
commit fb99635369
1 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
declarativeimports/plasmacomponents/platformcomponents/touch/Sheet.qml
View File

@ -132,7 +132,6 @@ Item {
property alias privateTitleHeight: titleBar.height
property alias privateButtonsHeight: buttonsRow.height
signal accepted
signal rejected
@ -216,10 +215,10 @@ Item {
anchors.left: parent.left
anchors.right: parent.right
//FIXME: +5 because of Plasma::Dialog margins
height: titleLabel.paintedHeight + margins.top + margins.bottom
height: Math.max(titleLabel.paintedHeight, acceptButton.height) + margins.top + margins.bottom
Column {
id: titleLayoutHelper // needed to make the text mirror correctly
Item {
id: titleLayoutHelper
anchors {
right: parent.right
@ -232,6 +231,15 @@ Item {
bottomMargin: parent.margins.bottom
}
Button {
id: acceptButton
onClicked: accept()
visible: text !== ""
anchors {
left: parent.left
verticalCenter: parent.verticalCenter
}
}
Label {
id: titleLabel
elide: Text.ElideRight
@ -241,12 +249,23 @@ Item {
style: Text.Raised
styleColor: Qt.rgba(1,1,1,0.8)
anchors {
left: parent.left
right: parent.right
left: acceptButton.visible ? acceptButton.right : parent.left
//still depends from acceptButton to make text more centered
right: acceptButton.visible ? rejectButton.right : parent.right
verticalCenter: parent.verticalCenter
}
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}
Button {
id: rejectButton
onClicked: reject()
visible: text !== ""
anchors {
right: parent.right
verticalCenter: parent.verticalCenter
}
}
}
}
@ -254,35 +273,15 @@ Item {
id: contentItem
clip: true
onChildrenRectChanged: mainItem.width = Math.max(childrenRect.width, buttonsRow.childrenRect.width)
onChildrenRectChanged: mainItem.width = childrenRect.width
anchors {
top: titleBar.bottom
left: parent.left
right: parent.right
bottom: buttonsRow.top
}
}
Row {
id: buttonsRow
spacing: 8
anchors {
bottom: parent.bottom
horizontalCenter: parent.horizontalCenter
//the bottom margin is disabled but we want it anyways
bottomMargin: theme.defaultFont.mSize.height*0.6
}
}
Button {
id: acceptButton
onClicked: accept()
}
Button {
id: rejectButton
onClicked: reject()
}
}
}
states: [