diff options
| author | Oliver Eftevaag <[email protected]> | 2024-06-20 18:25:54 +0200 |
|---|---|---|
| committer | Oliver Eftevaag <[email protected]> | 2024-06-21 14:28:04 +0200 |
| commit | bae9699b203954c6abc1d62b6e070b40067d4f33 (patch) | |
| tree | a1e31b8268ffaf93db2f21f0ff2d08da205544de /src/quickcontrols | |
| parent | a6d0dcdb9dc5162659f84abceaf2e30775930e47 (diff) | |
Dialog: Hide title if inside a popup window
Popup windows with the Qt::Dialog flag, will display the title in its
window decoration.
Because of this, it's redundant to also display the title inside the
dialog.
Pick-to: 6.8
Change-Id: Ib052a950216248c889983361063c8e46f4cffdfa
Reviewed-by: Mitch Curtis <[email protected]>
Diffstat (limited to 'src/quickcontrols')
| -rw-r--r-- | src/quickcontrols/basic/Dialog.qml | 2 | ||||
| -rw-r--r-- | src/quickcontrols/fusion/Dialog.qml | 2 | ||||
| -rw-r--r-- | src/quickcontrols/imagine/Dialog.qml | 2 | ||||
| -rw-r--r-- | src/quickcontrols/material/Dialog.qml | 4 | ||||
| -rw-r--r-- | src/quickcontrols/universal/Dialog.qml | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/quickcontrols/basic/Dialog.qml b/src/quickcontrols/basic/Dialog.qml index c4c59b27fb..41cf18751d 100644 --- a/src/quickcontrols/basic/Dialog.qml +++ b/src/quickcontrols/basic/Dialog.qml @@ -26,7 +26,7 @@ T.Dialog { header: Label { text: control.title - visible: control.title + visible: parent?.parent === Overlay.overlay && control.title elide: Label.ElideRight font.bold: true padding: 12 diff --git a/src/quickcontrols/fusion/Dialog.qml b/src/quickcontrols/fusion/Dialog.qml index f17321bcc0..355f079b98 100644 --- a/src/quickcontrols/fusion/Dialog.qml +++ b/src/quickcontrols/fusion/Dialog.qml @@ -39,7 +39,7 @@ T.Dialog { header: Label { text: control.title - visible: control.title + visible: control.title && parent?.parent === Overlay.overlay elide: Label.ElideRight font.bold: true padding: 6 diff --git a/src/quickcontrols/imagine/Dialog.qml b/src/quickcontrols/imagine/Dialog.qml index 4d3c29633e..8797d980f4 100644 --- a/src/quickcontrols/imagine/Dialog.qml +++ b/src/quickcontrols/imagine/Dialog.qml @@ -40,7 +40,7 @@ T.Dialog { header: Label { text: control.title - visible: control.title + visible: parent?.parent === Overlay.overlay && control.title elide: Label.ElideRight font.bold: true padding: 12 diff --git a/src/quickcontrols/material/Dialog.qml b/src/quickcontrols/material/Dialog.qml index 014fcc67c5..26f8848edc 100644 --- a/src/quickcontrols/material/Dialog.qml +++ b/src/quickcontrols/material/Dialog.qml @@ -44,7 +44,7 @@ T.Dialog { background: Rectangle { // FullScale doesn't make sense for Dialog. - radius: control.Material.roundedScale + radius: parent?.parent === Overlay.overlay ? control.Material.roundedScale : 0 color: control.Material.dialogColor layer.enabled: control.Material.elevation > 0 @@ -56,7 +56,7 @@ T.Dialog { header: Label { text: control.title - visible: control.title + visible: parent?.parent === Overlay.overlay && control.title elide: Label.ElideRight padding: 24 bottomPadding: 0 diff --git a/src/quickcontrols/universal/Dialog.qml b/src/quickcontrols/universal/Dialog.qml index 0ed4e673c7..1d21b48574 100644 --- a/src/quickcontrols/universal/Dialog.qml +++ b/src/quickcontrols/universal/Dialog.qml @@ -28,7 +28,7 @@ T.Dialog { header: Label { text: control.title - visible: control.title + visible: parent?.parent === Overlay.overlay && control.title elide: Label.ElideRight topPadding: 18 leftPadding: 24 |