diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/imports/controls/DialogButtonBox.qml | 2 | ||||
-rw-r--r-- | src/imports/controls/imagine/DialogButtonBox.qml | 2 | ||||
-rw-r--r-- | src/imports/controls/universal/DialogButtonBox.qml | 2 | ||||
-rw-r--r-- | src/quicktemplates2/qquickdialogbuttonbox.cpp | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/imports/controls/DialogButtonBox.qml b/src/imports/controls/DialogButtonBox.qml index 51a5cc49..3189967d 100644 --- a/src/imports/controls/DialogButtonBox.qml +++ b/src/imports/controls/DialogButtonBox.qml @@ -54,7 +54,7 @@ T.DialogButtonBox { } contentItem: ListView { - implicitWidth: contentWidth + implicitWidth: control.count === 1 ? 200 : contentWidth implicitHeight: 40 model: control.contentModel diff --git a/src/imports/controls/imagine/DialogButtonBox.qml b/src/imports/controls/imagine/DialogButtonBox.qml index d24ad4ee..69211ed9 100644 --- a/src/imports/controls/imagine/DialogButtonBox.qml +++ b/src/imports/controls/imagine/DialogButtonBox.qml @@ -60,7 +60,7 @@ T.DialogButtonBox { } contentItem: ListView { - implicitWidth: contentWidth + implicitWidth: control.count === 1 ? 200 : contentWidth implicitHeight: 32 model: control.contentModel diff --git a/src/imports/controls/universal/DialogButtonBox.qml b/src/imports/controls/universal/DialogButtonBox.qml index 7f28a144..17a9156d 100644 --- a/src/imports/controls/universal/DialogButtonBox.qml +++ b/src/imports/controls/universal/DialogButtonBox.qml @@ -58,7 +58,7 @@ T.DialogButtonBox { } contentItem: ListView { - implicitWidth: contentWidth + implicitWidth: control.count === 1 ? 200 : contentWidth implicitHeight: 32 model: control.contentModel diff --git a/src/quicktemplates2/qquickdialogbuttonbox.cpp b/src/quicktemplates2/qquickdialogbuttonbox.cpp index cd971139..f16f1b74 100644 --- a/src/quicktemplates2/qquickdialogbuttonbox.cpp +++ b/src/quicktemplates2/qquickdialogbuttonbox.cpp @@ -215,8 +215,8 @@ void QQuickDialogButtonBoxPrivate::resizeContent() QRectF geometry = q->boundingRect().adjusted(q->leftPadding(), q->topPadding(), -q->rightPadding(), -q->bottomPadding()); if (alignment != 0) { - qreal cw = (alignment & Qt::AlignHorizontal_Mask) == 0 ? q->availableWidth() : contentItem->implicitWidth(); - qreal ch = (alignment & Qt::AlignVertical_Mask) == 0 ? q->availableHeight() : contentItem->implicitHeight(); + qreal cw = (alignment & Qt::AlignHorizontal_Mask) == 0 ? q->availableWidth() : contentItem->property("contentWidth").toReal(); + qreal ch = (alignment & Qt::AlignVertical_Mask) == 0 ? q->availableHeight() : contentItem->property("contentHeight").toReal(); geometry = alignedRect(q->isMirrored() ? Qt::RightToLeft : Qt::LeftToRight, alignment, QSizeF(cw, ch), geometry); } |