Skip to content
Snippets Groups Projects
Commit 266a6325 authored by Konstantin's avatar Konstantin
Browse files

[*]edit combobox

parent dcbe85f3
No related branches found
No related tags found
2 merge requests!11Bugs 2893,!10[+]add dapRadioButton
......@@ -11,12 +11,12 @@ DapComboBoxForm
height:{
if(index != currentIndex)
{
if(index == customComboBox.count - 2)
if(index == (count - 2))
{
if(index+1 == currentIndex) return heightListElement + bottomIntervalListElement
else return heightListElement + intervalListElement
}
if (index == customComboBox.count - 1) return heightListElement + bottomIntervalListElement
if (index == count - 1) return heightListElement + bottomIntervalListElement
return heightListElement + intervalListElement
}
else return 0
......@@ -27,9 +27,11 @@ DapComboBoxForm
anchors.fill: parent
anchors.topMargin: paddingTopItemDelegate
anchors.leftMargin: popup.visible ? sidePaddingActive : sidePaddingNormal
font.family: fontRobotoRegular.name
font.family: "Roboto"
font.pixelSize: fontSizeComboBox
text: {if(index != currentIndex) return modelData;}
text: if(index != currentIndex)
return modelData;
else return ""
color: hovered ? hilightColorText : normalColorText
}
......
......@@ -97,7 +97,7 @@ ComboBox {
anchors.fill: parent
anchors.leftMargin: popup.visible ? sidePaddingActive : sidePaddingNormal
text: parent.displayText
font.family: fontRobotoRegular.name
font.family: "Roboto"
font.pixelSize: fontSizeComboBox
color: popup.visible ? hilightColorTopText : normalColorTopText
verticalAlignment: Text.AlignVCenter
......@@ -117,7 +117,7 @@ ComboBox {
background: Rectangle {
width: customComboBox.background.width
color: parent.color
color: normalColor
Rectangle {
id: contentCorner
anchors.fill: parent
......@@ -141,9 +141,12 @@ ComboBox {
background
verticalOffset: if (topEffect)
9 * pt
else 0
samples: if (topEffect)
13 * pt
else 0
color: if (topEffect)
customComboBox.popup.visible ? colorDropShadow : colorTopNormalDropShadow
else "#00000000"
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment