3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 21:44:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Fix layout of subitems

Browse source 
Contributes to issue CURA-8640.
This commit is contained in:
Ghostkeeper 2022-04-08 15:28:50 +02:00
parent 45bc498c7f
commit b40900e146
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
1 changed files with 40 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

59
resources/qml/Menus/MaterialBrandMenu.qml
View file

@ -116,6 +116,7 @@ Cura.MenuItem
Column
{
id: materialTypesList
spacing: 0
Repeater
{
@ -123,33 +124,53 @@ Cura.MenuItem
//Use a MouseArea and Rectangle, not a button, because the button grabs mouse events which makes the parent pop-up think it's no longer being hovered.
//With a custom MouseArea, we can prevent the events from being accepted.
delegate: Item
delegate: Rectangle
{
width: materialTypeLabel.width
height: materialTypeLabel.height
height: UM.Theme.getSize("menu").height
width: UM.Theme.getSize("menu").width
Rectangle
color: materialTypeButton.containsMouse ? UM.Theme.getColor("background_2") : UM.Theme.getColor("background_1")
MouseArea
{
width: materialTypesList.width
id: materialTypeButton
anchors.fill: parent
hoverEnabled: true
onEntered: menuPopup.itemHovered += 1
onExited: menuPopup.itemHovered -= 1
}
RowLayout
{
spacing: 0
opacity: materialBrandMenu.enabled ? 1 : 0.5
height: parent.height
color: materialTypeButton.containsMouse ? UM.Theme.getColor("background_2") : UM.Theme.getColor("background_1")
MouseArea
Item
{
id: materialTypeButton
anchors.fill: parent
hoverEnabled: true
onEntered: menuPopup.itemHovered += 1
onExited: menuPopup.itemHovered -= 1
// Spacer
width: UM.Theme.getSize("default_margin").width
}
}
UM.Label
{
id: materialTypeLabel
text: model.name
UM.Label
{
text: model.name
Layout.fillWidth: true
Layout.fillHeight: true
elide: Label.ElideRight
wrapMode: Text.NoWrap
}
Item
{
Layout.fillWidth: true
}
Item
{
// Right side margin
width: UM.Theme.getSize("default_margin").width
}
}
}
}