mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-01-28 23:42:51 -05:00
toast: handle error overflow better
This commit is contained in:
@@ -67,7 +67,7 @@ PanelWindow {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
width: shouldBeVisible ? Math.min(900, messageText.implicitWidth + statusIcon.width + Theme.spacingM + (ToastService.hasDetails ? (expandButton.width + closeButton.width + 4) : 0) + Theme.spacingL * 2 + Theme.spacingM * 2) : frozenWidth
|
width: shouldBeVisible ? Math.min(900, messageText.implicitWidth + statusIcon.width + Theme.spacingM + (ToastService.hasDetails ? (expandButton.width + closeButton.width + 4) : (ToastService.currentLevel === ToastService.levelError ? closeButton.width + Theme.spacingS : 0)) + Theme.spacingL * 2 + Theme.spacingM * 2) : frozenWidth
|
||||||
height: toastContent.height + Theme.spacingL * 2
|
height: toastContent.height + Theme.spacingL * 2
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
y: Theme.barHeight - 4 + SettingsData.dankBarSpacing + 2
|
y: Theme.barHeight - 4 + SettingsData.dankBarSpacing + 2
|
||||||
@@ -146,8 +146,10 @@ PanelWindow {
|
|||||||
font.weight: Font.Medium
|
font.weight: Font.Medium
|
||||||
anchors.left: statusIcon.right
|
anchors.left: statusIcon.right
|
||||||
anchors.leftMargin: Theme.spacingM
|
anchors.leftMargin: Theme.spacingM
|
||||||
|
anchors.right: ToastService.hasDetails ? expandButton.left : parent.right
|
||||||
|
anchors.rightMargin: ToastService.hasDetails ? Theme.spacingS : 0
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
width: implicitWidth
|
elide: Text.ElideRight
|
||||||
wrapMode: Text.NoWrap
|
wrapMode: Text.NoWrap
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -196,7 +198,7 @@ PanelWindow {
|
|||||||
buttonSize: Theme.iconSize + 8
|
buttonSize: Theme.iconSize + 8
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
visible: ToastService.hasDetails
|
visible: ToastService.hasDetails || ToastService.currentLevel === ToastService.levelError
|
||||||
|
|
||||||
onClicked: {
|
onClicked: {
|
||||||
ToastService.hideToast()
|
ToastService.hideToast()
|
||||||
|
|||||||
Reference in New Issue
Block a user