Merge branch 'master' into editbubble

This commit is contained in:
Sebastian Kügler 2011-12-01 00:45:02 +01:00
commit b6f545c433
2 changed files with 3 additions and 7 deletions

View File

@ -107,7 +107,7 @@ Dialog {
LayoutMirroring.enabled: privateCloseIcon ? false : undefined
LayoutMirroring.childrenInherit: true
Item {
Column {
id: titleLayoutHelper // needed to make the text mirror correctly
anchors {
@ -123,11 +123,7 @@ Dialog {
Label {
id: titleAreaText
LayoutMirroring.enabled: root.LayoutMirroring.enabled
anchors.fill: parent
elide: Text.ElideRight
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter

View File

@ -79,7 +79,7 @@ CommonDialog {
content: Item {
id: contentItem
property alias filterText: filterField.filterText
implicitWidth: theme.defaultFont.mSize.width * 40
height: theme.defaultFont.mSize.height * 12
@ -132,7 +132,7 @@ CommonDialog {
flickableItem: listView
visible: listView.contentHeight > contentItem.height
//platformInverted: root.platformInverted
anchors { top: clipItem.top; right: clipItem.right }
anchors { top: contentItem.top; right: contentItem.right }
}
}