Skip to content

Commit 91d0bb8

Browse files
authored
Merge pull request #2414 from notiant/patch-9
NComboBox: remove hover animation
2 parents 57cdcb7 + 4e99e5d commit 91d0bb8

3 files changed

Lines changed: 4 additions & 24 deletions

File tree

Commons/I18n.qml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@ Singleton {
2121

2222
// Default date format per language (used by lock screen, etc.)
2323
readonly property var dateFormats: ({
24+
"cs": "dddd d. MMMM",
2425
"de": "dddd, d. MMMM",
2526
"en": "dddd, MMMM d",
2627
"es": "dddd, d 'de' MMMM",
2728
"fr": "dddd d MMMM",
28-
"hu": "dddd, MMMM d.",
29+
"hu": "MMMM d., dddd",
2930
"it": "dddd d MMMM",
3031
"ja": "yyyy年M月d日 dddd",
3132
"ko": "yyyy년 M월 d일 dddd",
@@ -34,11 +35,12 @@ Singleton {
3435
"nn": "dddd d. MMMM",
3536
"pl": "dddd, d MMMM",
3637
"pt": "dddd, d 'de' MMMM",
38+
"ro": "dddd, d MMMM",
3739
"ru": "dddd, d MMMM",
3840
"sv": "dddd d MMMM",
3941
"tr": "dddd, d MMMM",
4042
"uk": "dddd, d MMMM",
41-
"vi": "dddd, d MMMM",
43+
"vi": "dddd, d 'tháng' M",
4244
"zh": "yyyy年M月d日 dddd"
4345
})
4446

Widgets/NComboBox.qml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -274,12 +274,6 @@ RowLayout {
274274
radius: Style.iRadiusS
275275
color: isHighlighted ? Color.mHover : "transparent"
276276

277-
Behavior on color {
278-
ColorAnimation {
279-
duration: Style.animationFast
280-
}
281-
}
282-
283277
NText {
284278
id: delegateText
285279
anchors.fill: parent
@@ -293,12 +287,6 @@ RowLayout {
293287
var item = root.getItem(delegateRect.index);
294288
return item && item.name ? item.name : "";
295289
}
296-
297-
Behavior on color {
298-
ColorAnimation {
299-
duration: Style.animationFast
300-
}
301-
}
302290
}
303291

304292
MouseArea {

Widgets/NSearchableComboBox.qml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -336,11 +336,6 @@ RowLayout {
336336
verticalAlignment: Text.AlignVCenter
337337
elide: Text.ElideRight
338338
Layout.fillWidth: true
339-
Behavior on color {
340-
ColorAnimation {
341-
duration: Style.animationFast
342-
}
343-
}
344339
}
345340

346341
RowLayout {
@@ -396,11 +391,6 @@ RowLayout {
396391
anchors.fill: parent
397392
color: highlighted ? Color.mHover : "transparent"
398393
radius: Style.iRadiusS
399-
Behavior on color {
400-
ColorAnimation {
401-
duration: Style.animationFast
402-
}
403-
}
404394
}
405395
}
406396
}

0 commit comments

Comments
 (0)