Index: sources/gui/qml/components/TextRect.qml =================================================================== diff -u -r2f7a4176a08ba884281b370d452f19c25501a4b4 -r442d1c4f53c96991d4103485ff5ff683ed00d4f7 --- sources/gui/qml/components/TextRect.qml (.../TextRect.qml) (revision 2f7a4176a08ba884281b370d452f19c25501a4b4) +++ sources/gui/qml/components/TextRect.qml (.../TextRect.qml) (revision 442d1c4f53c96991d4103485ff5ff683ed00d4f7) @@ -32,12 +32,14 @@ property string label : "" property string labelColor : Colors.textTextRectLabel property bool labelAutoSize : false - property int labelwidth : 80 // text:3 Digit "000" & pixel: 46 => width: 80 + property int labelWidth : 80 // text:3 Digit "000" & pixel: 46 => width: 80 + property alias labelHeight : _labelText.height + property alias labelFont : _labelText.font property string extra : "" property string extraColor : Colors.textTextRectExtra - readonly property int titleVSpacing : 5 + readonly property int titleVSpacing : 0 readonly property int textHSpacing : 5 width : _column.width @@ -47,8 +49,10 @@ width : Math.max(_titleText.width , _row.width ) height: _titleText.height + _row.height + spacing anchors.fill: parent - spacing: titleVSpacing + spacing: _root.title ? titleVSpacing : 0 Text { id: _titleText + width : _root.title ? contentWidth : 0 + height: _root.title ? contentHeight : 0 text: _root.title color: titleColor font.pixelSize: Fonts.fontPixelTextRectTitle @@ -59,14 +63,17 @@ height: _labelText.height + _extraText.height spacing: textHSpacing Text { id: _labelText - width: labelAutoSize ? contentWidth : labelwidth + width : labelAutoSize ? contentWidth : labelWidth + height: contentHeight text: _root.label color: labelColor font.pixelSize: Fonts.fontPixelTextRectLabel verticalAlignment: Text.AlignBottom horizontalAlignment: Text.AlignRight } Text { id: _extraText + width : contentWidth + height: contentHeight text: _root.extra color: extraColor font.pixelSize: Fonts.fontPixelTextRectExtra