Compare commits
3 Commits
561b4ec8c0
...
47c84ed60e
Author | SHA1 | Date |
---|---|---|
|
47c84ed60e | |
|
d5ca38dec2 | |
|
cb50c31e1e |
|
@ -19,6 +19,10 @@ if (FLUENTUI_BUILD_EXAMPLES)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
if (FLUENTUI_BUILD_FRAMELESSHEPLER)
|
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_CORE_NO_DEBUG_OUTPUT)
|
||||||
add_definitions(-DFRAMELESSHELPER_QUICK_NO_DEBUG_OUTPUT)
|
add_definitions(-DFRAMELESSHELPER_QUICK_NO_DEBUG_OUTPUT)
|
||||||
add_subdirectory(framelesshelper)
|
add_subdirectory(framelesshelper)
|
||||||
|
|
|
@ -46,6 +46,7 @@ FluScrollablePage{
|
||||||
}
|
}
|
||||||
FluComboBox {
|
FluComboBox {
|
||||||
editable: true
|
editable: true
|
||||||
|
font:FluTextStyle.BodyStrong
|
||||||
model: ListModel {
|
model: ListModel {
|
||||||
id: model_2
|
id: model_2
|
||||||
ListElement { text: "Banana" }
|
ListElement { text: "Banana" }
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit f977a78d0ee8cf5f5dc723e8c5e9da8846d420b9
|
Subproject commit 75ca85ec42ac651094cfc8dd21f79b0cfb440d57
|
|
@ -16,7 +16,7 @@ ComboBox {
|
||||||
implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
|
implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
|
||||||
implicitContentHeight + topPadding + bottomPadding,
|
implicitContentHeight + topPadding + bottomPadding,
|
||||||
implicitIndicatorHeight + topPadding + bottomPadding)
|
implicitIndicatorHeight + topPadding + bottomPadding)
|
||||||
|
font: FluTextStyle.Body
|
||||||
leftPadding: padding + (!control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing)
|
leftPadding: padding + (!control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing)
|
||||||
rightPadding: padding + (control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing)
|
rightPadding: padding + (control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing)
|
||||||
enabled: !disabled
|
enabled: !disabled
|
||||||
|
@ -24,6 +24,7 @@ ComboBox {
|
||||||
width: ListView.view.width
|
width: ListView.view.width
|
||||||
text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData
|
text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData
|
||||||
palette.text: control.palette.text
|
palette.text: control.palette.text
|
||||||
|
font: control.font
|
||||||
palette.highlightedText: control.palette.highlightedText
|
palette.highlightedText: control.palette.highlightedText
|
||||||
highlighted: control.highlightedIndex === index
|
highlighted: control.highlightedIndex === index
|
||||||
hoverEnabled: control.hoverEnabled
|
hoverEnabled: control.hoverEnabled
|
||||||
|
@ -49,7 +50,7 @@ ComboBox {
|
||||||
text: control.editable ? control.editText : control.displayText
|
text: control.editable ? control.editText : control.displayText
|
||||||
enabled: control.editable
|
enabled: control.editable
|
||||||
autoScroll: control.editable
|
autoScroll: control.editable
|
||||||
font:FluTextStyle.Body
|
font:control.font
|
||||||
readOnly: control.down
|
readOnly: control.down
|
||||||
color: FluTheme.dark ? Qt.rgba(255/255,255/255,255/255,1) : Qt.rgba(27/255,27/255,27/255,1)
|
color: FluTheme.dark ? Qt.rgba(255/255,255/255,255/255,1) : Qt.rgba(27/255,27/255,27/255,1)
|
||||||
inputMethodHints: control.inputMethodHints
|
inputMethodHints: control.inputMethodHints
|
||||||
|
|
Loading…
Reference in New Issue