From 4347dd62b6bc14246cdc14b606d77b1f62616366 Mon Sep 17 00:00:00 2001
From: "andrey.daragan" <daragan.andrey@demlabs.net>
Date: Thu, 19 Mar 2020 07:03:02 +0000
Subject: [PATCH] Develop
---
widgets/DapButtonForm.ui.qml | 2 ++
widgets/DapText.qml | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/widgets/DapButtonForm.ui.qml b/widgets/DapButtonForm.ui.qml
index e1f3b62..e4917d1 100644
--- a/widgets/DapButtonForm.ui.qml
+++ b/widgets/DapButtonForm.ui.qml
@@ -41,6 +41,8 @@ Button
property string borderColorButton
///@detalis borderWidthButton Sets the width of the border.
property int borderWidthButton
+ ///@detalis dapHorizontalAlignment Horizontal text alignment.
+ property alias dapHorizontalAlignment: buttonText.horizontalAlignment
id: dapButton
diff --git a/widgets/DapText.qml b/widgets/DapText.qml
index 3718df5..1ab6504 100644
--- a/widgets/DapText.qml
+++ b/widgets/DapText.qml
@@ -23,8 +23,8 @@ DapTextForm
case Text.ElideRight:
elText = textMetric.elidedText.substring(0, textMetric.elidedText.length - 1) +
((fontMetric.tightBoundingRect(textMetric.elidedText.substring(0, textMetric.elidedText.length - 1)).width +
- fontMetric.tightBoundingRect(textMetric.text.charAt(textMetric.elidedText.length - 1) + '..').width) < textMetric.elideWidth ?
- (textMetric.text.charAt(textMetric.elidedText.length - 1) + '..'):
+ fontMetric.tightBoundingRect(textMetric.text.charAt(textMetric.elidedText.length - 1) + '..').width) < elText.elideWidth ?
+ (textMetric.text.charAt(textMetric.elidedText.length - 3) + '..'):
'..');
break;
--
GitLab