Skip to content

Commit cb50c31

Browse files
committed
update
1 parent 561b4ec commit cb50c31

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

example/qml/page/T_ComboBox.qml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ FluScrollablePage{
4646
}
4747
FluComboBox {
4848
editable: true
49+
font:FluTextStyle.BodyStrong
4950
model: ListModel {
5051
id: model_2
5152
ListElement { text: "Banana" }

src/imports/FluentUI/Controls/FluComboBox.qml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@ ComboBox {
1616
implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
1717
implicitContentHeight + topPadding + bottomPadding,
1818
implicitIndicatorHeight + topPadding + bottomPadding)
19-
19+
font: FluTextStyle.Body
2020
leftPadding: padding + (!control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing)
2121
rightPadding: padding + (control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing)
2222
enabled: !disabled
2323
delegate: FluItemDelegate {
2424
width: ListView.view.width
2525
text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData
2626
palette.text: control.palette.text
27+
font: control.font
2728
palette.highlightedText: control.palette.highlightedText
2829
highlighted: control.highlightedIndex === index
2930
hoverEnabled: control.hoverEnabled
@@ -49,7 +50,7 @@ ComboBox {
4950
text: control.editable ? control.editText : control.displayText
5051
enabled: control.editable
5152
autoScroll: control.editable
52-
font:FluTextStyle.Body
53+
font:control.font
5354
readOnly: control.down
5455
color: FluTheme.dark ? Qt.rgba(255/255,255/255,255/255,1) : Qt.rgba(27/255,27/255,27/255,1)
5556
inputMethodHints: control.inputMethodHints

0 commit comments

Comments
 (0)