mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-08-14 03:25:56 +08:00
patch checking for base parent component of Combobox to check if it exists first. This should be refactored out some time.
CURA-9424
This commit is contained in:
parent
1764c338a0
commit
dbba1c4110
@ -18,6 +18,7 @@ ComboBox
|
|||||||
property var defaultTextOnEmptyModel: catalog.i18nc("@label", "No items to select from") // Text displayed in the combobox when the model is empty
|
property var defaultTextOnEmptyModel: catalog.i18nc("@label", "No items to select from") // Text displayed in the combobox when the model is empty
|
||||||
property var defaultTextOnEmptyIndex: "" // Text displayed in the combobox when the model has items but no item is selected
|
property var defaultTextOnEmptyIndex: "" // Text displayed in the combobox when the model has items but no item is selected
|
||||||
property alias textFormat: contentLabel.textFormat
|
property alias textFormat: contentLabel.textFormat
|
||||||
|
property alias backgroundColor: background.color
|
||||||
|
|
||||||
enabled: delegateModel.count > 0
|
enabled: delegateModel.count > 0
|
||||||
|
|
||||||
@ -45,7 +46,7 @@ ComboBox
|
|||||||
State
|
State
|
||||||
{
|
{
|
||||||
name: "highlighted"
|
name: "highlighted"
|
||||||
when: (base.hovered || control.hovered) && !control.activeFocus
|
when: ((base != undefined && base.hovered) || control.hovered) && !control.activeFocus
|
||||||
PropertyChanges
|
PropertyChanges
|
||||||
{
|
{
|
||||||
target: background
|
target: background
|
||||||
@ -56,6 +57,7 @@ ComboBox
|
|||||||
|
|
||||||
background: UM.UnderlineBackground
|
background: UM.UnderlineBackground
|
||||||
{
|
{
|
||||||
|
id: background
|
||||||
// Rectangle for highlighting when this combobox needs to pulse.
|
// Rectangle for highlighting when this combobox needs to pulse.
|
||||||
Rectangle
|
Rectangle
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user