GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 18:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add scrollview to material list

Browse Source 
CURA-6867
This commit is contained in:
Joey de l'Arago 2022-12-20 17:45:28 +01:00
parent 7174861bba
commit d4679515b6
1 changed files with 85 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

145
resources/qml/Menus/MaterialBrandMenu.qml
View File

@ -244,6 +244,8 @@ Cura.MenuItem
height: materialColorsList.height + padding * 2 height: materialColorsList.height + padding * 2
onOpened: onOpened:
{ {
// This will be resolved before opening the popup if directly assigned to the properties
// This forces these values to update whenever a popup is opened
var popupHeight = model.colors.count * UM.Theme.getSize("menu").height var popupHeight = model.colors.count * UM.Theme.getSize("menu").height
var parentGlobalY = parent.mapToItem(null, 0, 0).y var parentGlobalY = parent.mapToItem(null, 0, 0).y
var overflowY = (parentGlobalY + popupHeight) - mainWindow.height var overflowY = (parentGlobalY + popupHeight) - mainWindow.height
@ -252,6 +254,10 @@ Cura.MenuItem
var parentGlobalX = materialTypesList.mapToItem(null, 0, 0).x var parentGlobalX = materialTypesList.mapToItem(null, 0, 0).x
var overflowX = (parentGlobalX + parent.width + colorPopup.width) - mainWindow.width var overflowX = (parentGlobalX + parent.width + colorPopup.width) - mainWindow.width
x = overflowX > 0 ? parent.width - overflowX : parent.width x = overflowX > 0 ? parent.width - overflowX : parent.width
var popupHeight = model.colors.count * UM.Theme.getSize("menu").height
scrollView.height = popupHeight > mainWindow.height ? mainWindow.height: popupHeight
colorPopup.height = popupHeight > mainWindow.height ? mainWindow.height: popupHeight
} }
property int itemHovered: 0 property int itemHovered: 0
@ -263,79 +269,98 @@ Cura.MenuItem
border.color: UM.Theme.getColor("lining") border.color: UM.Theme.getColor("lining")
border.width: UM.Theme.getSize("default_lining").width border.width: UM.Theme.getSize("default_lining").width
} }
ScrollView
Column
{ {
id: materialColorsList id: scrollView
property var brandColors: model.colors width: UM.Theme.getSize("menu").width + scrollbar.width
spacing: 0 height: parent.height
clip: true
Repeater ScrollBar.vertical: UM.ScrollBar
{ {
model: parent.brandColors id: scrollbar
anchors.right: parent.right
anchors.top: parent.top
anchors.bottom: parent.bottom
}
delegate: Rectangle Column
{
id: materialColorsList
property var brandColors: model.colors
width: UM.Theme.getSize("menu").width
height: parent.height
spacing: 0
Repeater
{ {
height: UM.Theme.getSize("menu").height model: parent.brandColors
width: UM.Theme.getSize("menu").width
color: materialColorButton.containsMouse ? UM.Theme.getColor("background_2") : UM.Theme.getColor("background_1") delegate: Rectangle
Item
{ {
opacity: materialBrandMenu.enabled ? 1 : 0.5 height: UM.Theme.getSize("menu").height
anchors.fill: parent width: parent.width
//Checkmark, if the material is selected. // color: materialColorButton.containsMouse ? UM.Theme.getColor("background_2") : UM.Theme.getColor("background_1")
UM.ColorImage
Rectangle
{ {
id: checkmark height: parent.height
visible: model.id === materialMenu.activeMaterialId width: parent.width
height: UM.Theme.getSize("default_arrow").height opacity: materialBrandMenu.enabled ? 1 : 0.5
width: height anchors.fill: parent
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width //Checkmark, if the material is selected.
anchors.verticalCenter: parent.verticalCenter UM.ColorImage
source: UM.Theme.getIcon("Check", "low") {
color: UM.Theme.getColor("setting_control_text") id: checkmark
visible: model.id === materialMenu.activeMaterialId
height: UM.Theme.getSize("default_arrow").height
width: height
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width
anchors.verticalCenter: parent.verticalCenter
source: UM.Theme.getIcon("Check", "low")
color: UM.Theme.getColor("setting_control_text")
}
UM.Label
{
text: model.name
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width + UM.Theme.getSize("default_arrow").height
anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right
anchors.rightMargin: UM.Theme.getSize("default_margin").width
elide: Label.ElideRight
wrapMode: Text.NoWrap
}
} }
UM.Label MouseArea
{ {
text: model.name id: materialColorButton
anchors.left: parent.left anchors.fill: parent
anchors.leftMargin: UM.Theme.getSize("default_margin").width + UM.Theme.getSize("default_arrow").height
anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right
anchors.rightMargin: UM.Theme.getSize("default_margin").width
elide: Label.ElideRight hoverEnabled: true
wrapMode: Text.NoWrap onClicked:
} {
} Cura.MachineManager.setMaterial(extruderIndex, model.container_node);
menuPopup.close();
MouseArea colorPopup.close();
{ materialMenu.close();
id: materialColorButton }
anchors.fill: parent onEntered:
{
hoverEnabled: true menuPopup.itemHovered += 1;
onClicked: colorPopup.itemHovered += 1;
{ }
Cura.MachineManager.setMaterial(extruderIndex, model.container_node); onExited:
menuPopup.close(); {
colorPopup.close(); menuPopup.itemHovered -= 1;
materialMenu.close(); colorPopup.itemHovered -= 1;
} }
onEntered:
{
menuPopup.itemHovered += 1;
colorPopup.itemHovered += 1;
}
onExited:
{
menuPopup.itemHovered -= 1;
colorPopup.itemHovered -= 1;
} }
} }
} }