Skip to content
Snippets Groups Projects
Commit 4050de03 authored by dmitriy.gerasimov's avatar dmitriy.gerasimov
Browse files

Merge branch 'features-3819' into 'develop' 

Features 3819

See merge request !50
parents 9ca4a1ca a1cfb0de
No related branches found
No related tags found
1 merge request!50Features 3819
Hide whitespace changes
Inline Side-by-side
libdap-qt-ui-qml.pri
+ 1
− 0
View file @ 4050de03
...@@ -13,3 +13,4 @@ RESOURCES += \ ...@@ -13,3 +13,4 @@ RESOURCES += \
widgets/DapComboBoxForm.ui.qml
+ 0
− 1
View file @ 4050de03
...@@ -87,7 +87,6 @@ ComboBox ...@@ -87,7 +87,6 @@ ComboBox
///@details isDefaultNeedToAppend Sign to add default data to the beginning of model ///@details isDefaultNeedToAppend Sign to add default data to the beginning of model
property bool isDefaultNeedToAppend: false property bool isDefaultNeedToAppend: false
width: popup.visible ? widthPopupComboBoxActive : widthPopupComboBoxNormal width: popup.visible ? widthPopupComboBoxActive : widthPopupComboBoxNormal
height: popup.visible ? heightComboBoxActive : heightComboBoxNormal height: popup.visible ? heightComboBoxActive : heightComboBoxNormal
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
......
widgets/DapText.qml
+ 1
− 0
View file @ 4050de03
...@@ -55,6 +55,7 @@ DapTextForm ...@@ -55,6 +55,7 @@ DapTextForm
} }
break; break;
case Text.ElideLeft: case Text.ElideLeft:
indexOfChar = textMetric.elidedText.length; indexOfChar = textMetric.elidedText.length;
firstString = textMetric.elidedText.substring(1, indexOfChar); firstString = textMetric.elidedText.substring(1, indexOfChar);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment