GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 01:49:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix popups not maxing height at top of parent

Browse Source 
CURA-9793
This commit is contained in:
Joey de l'Arago 2022-12-05 16:18:03 +01:00
parent 7185b898a3
commit d2ff62485d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,7 +106,8 @@ Cura.MenuItem
// The popup is longer than the distance between the hovered item and the bottom of the item list.
// This pushes the popup upwards until the bottom lines up with the parent bottom.
// Only when popup is longer than the parent, the popup will flow out below the parent.
return -Math.max(parent.y - (materialBrandMenu.parent.height - popupHeight), 0) + (3 * UM.Theme.getSize("default_lining").height)
var topOfParent = parent.y + (3 * UM.Theme.getSize("default_lining").height)
return -Math.min(parent.y - (materialBrandMenu.parent.height - popupHeight ), topOfParent)
}
}
@ -259,7 +260,8 @@ Cura.MenuItem
// The popup is longer than the distance between the hovered item and the bottom of the item list.
// This pushes the popup upwards until the bottom lines up with the parent bottom.
// Only when popup is longer than the parent, the popup will flow out below the parent.
return -Math.max(parent.y - (materialTypesList.height - popupHeight), 0)
var topOfParent = parent.y + (3 * UM.Theme.getSize("default_lining").height)
return -Math.min(parent.y - (materialTypesList.height - popupHeight), parent.y)
}
}