Merge branch 'develop' into 'master'

Develop

See merge request !43

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
 

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;