CMakeLists.txt

@@ -19,10 +19,6 @@ if (FLUENTUI_BUILD_EXAMPLES)
 endif ()
 
 if (FLUENTUI_BUILD_FRAMELESSHEPLER)
-    set(FRAMELESSHELPER_BUILD_STATIC ON)
-    set(FRAMELESSHELPER_NO_SUMMARY OFF)
-    set(FRAMELESSHELPER_NO_DEBUG_OUTPUT OFF)
-    set(FRAMELESSHELPER_BUILD_WIDGETS OFF)
     add_definitions(-DFRAMELESSHELPER_CORE_NO_DEBUG_OUTPUT)
     add_definitions(-DFRAMELESSHELPER_QUICK_NO_DEBUG_OUTPUT)
     add_subdirectory(framelesshelper)

example/qml/page/T_ComboBox.qml

@@ -46,7 +46,6 @@ FluScrollablePage{
             }
             FluComboBox {
                 editable: true
-                font:FluTextStyle.BodyStrong
                 model: ListModel {
                     id: model_2
                     ListElement { text: "Banana" }

framelesshelper

@@ -1 +1 @@
-Subproject commit 75ca85ec42ac651094cfc8dd21f79b0cfb440d57
+Subproject commit f977a78d0ee8cf5f5dc723e8c5e9da8846d420b9

src/imports/FluentUI/Controls/FluComboBox.qml

@@ -16,7 +16,7 @@ ComboBox {
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
                              implicitContentHeight + topPadding + bottomPadding,
                              implicitIndicatorHeight + topPadding + bottomPadding)
-    font: FluTextStyle.Body
+
     leftPadding: padding + (!control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing)
     rightPadding: padding + (control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing)
     enabled: !disabled
@@ -24,7 +24,6 @@ ComboBox {
         width: ListView.view.width
         text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData
         palette.text: control.palette.text
-        font: control.font
         palette.highlightedText: control.palette.highlightedText
         highlighted: control.highlightedIndex === index
         hoverEnabled: control.hoverEnabled
@@ -50,7 +49,7 @@ ComboBox {
         text: control.editable ? control.editText : control.displayText
         enabled: control.editable
         autoScroll: control.editable
-        font:control.font
+        font:FluTextStyle.Body
         readOnly: control.down
         color: FluTheme.dark ?  Qt.rgba(255/255,255/255,255/255,1) : Qt.rgba(27/255,27/255,27/255,1)
         inputMethodHints: control.inputMethodHints