From 3b6bcea7986ba169367aff8506a2d6d81d077b1d Mon Sep 17 00:00:00 2001 From: Massimo Callegari Date: Mon, 28 Aug 2023 00:28:51 +0200 Subject: [PATCH] qmlui: improve custom items --- qmlui/qml/RobotoText.qml | 2 +- qmlui/qml/popup/CustomPopupDialog.qml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/qmlui/qml/RobotoText.qml b/qmlui/qml/RobotoText.qml index 972b1647ef..a5dd4a1b6a 100644 --- a/qmlui/qml/RobotoText.qml +++ b/qmlui/qml/RobotoText.qml @@ -23,7 +23,7 @@ import "." Rectangle { id: rtRoot - width: wrapText ? 100 : textBox.paintedWidth + rightMargin + width: wrapText ? 100 : leftMargin + textBox.paintedWidth + rightMargin height: UISettings.iconSizeDefault color: "transparent" diff --git a/qmlui/qml/popup/CustomPopupDialog.qml b/qmlui/qml/popup/CustomPopupDialog.qml index d3d905e485..e2b6742fc4 100644 --- a/qmlui/qml/popup/CustomPopupDialog.qml +++ b/qmlui/qml/popup/CustomPopupDialog.qml @@ -32,6 +32,7 @@ Dialog parent: mainView modal: true + closePolicy: Popup.CloseOnEscape title: "" standardButtons: Dialog.Ok | Dialog.Cancel onVisibleChanged: mainView.setDimScreen(visible)