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

Code style

Browse Source 
CURA-9522
This commit is contained in:
Casper Lamboo 2022-12-23 13:51:32 +01:00 committed by GitHub
parent 93a51b6da9
commit 15761b6c59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@ Cura.MenuItem
id: materialBrandMenu id: materialBrandMenu
overrideShowArrow: true overrideShowArrow: true
property var rootHeight property int rootHeight
property var materialTypesModel property var materialTypesModel
text: materialTypesModel.name text: materialTypesModel.name
@ -99,15 +99,15 @@ Cura.MenuItem
var popupHeight = materialTypesModel.material_types.count * UM.Theme.getSize("menu").height var popupHeight = materialTypesModel.material_types.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
y = overflowY > 0 ? -overflowY : 0 menuPopup.y = overflowY > 0 ? -overflowY : 0
var defaultX = parent.width - UM.Theme.getSize("default_lining").width var defaultX = parent.width - UM.Theme.getSize("default_lining").width
var parentGlobalX = parent.mapToItem(null, 0, 0).x var parentGlobalX = parent.mapToItem(null, 0, 0).x
var overflowX = (parentGlobalX + defaultX + menuPopup.width) - mainWindow.width var overflowX = (parentGlobalX + defaultX + menuPopup.width) - mainWindow.width
x = overflowX > 0 ? overflowX : defaultX menuPopup.x = overflowX > 0 ? overflowX : defaultX
scrollViewMaterialType.height = popupHeight > mainWindow.height ? mainWindow.height : popupHeight scrollViewMaterialType.height = popupHeight > mainWindow.height ? mainWindow.height : popupHeight
menuPopup.height = popupHeight > mainWindow.height ? mainWindow.height: popupHeight menuPopup.height = popupHeight > mainWindow.height ? mainWindow.heigh : popupHeight
} }
padding: background.border.width padding: background.border.width
@ -169,7 +169,7 @@ Cura.MenuItem
color: materialTypeButton.containsMouse ? UM.Theme.getColor("background_2") : UM.Theme.getColor("background_1") color: materialTypeButton.containsMouse ? UM.Theme.getColor("background_2") : UM.Theme.getColor("background_1")
property var isFlipped: menuPopup.flipped property bool isFlipped: menuPopup.flipped
RowLayout RowLayout
{ {
@ -269,11 +269,11 @@ Cura.MenuItem
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
y = overflowY > 0 ? - overflowY - UM.Theme.getSize("default_lining").height: - UM.Theme.getSize("default_lining").height colorPopup.y = overflowY > 0 ? - overflowY - UM.Theme.getSize("default_lining").height : -UM.Theme.getSize("default_lining").height
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 colorPopup.x = overflowX > 0 ? parent.width - overflowX : parent.width
scrollView.height = popupHeight > mainWindow.height ? mainWindow.height : popupHeight scrollView.height = popupHeight > mainWindow.height ? mainWindow.height : popupHeight
colorPopup.height = popupHeight > mainWindow.height ? mainWindow.height : popupHeight colorPopup.height = popupHeight > mainWindow.height ? mainWindow.height : popupHeight
@ -306,7 +306,7 @@ Cura.MenuItem
Column Column
{ {
id: materialColorsList id: materialColorsList
property var brandColors: model.colors property color brandColors: model.colors
width: UM.Theme.getSize("menu").width width: UM.Theme.getSize("menu").width
height: parent.height height: parent.height
spacing: 0 spacing: 0