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

Fix RadioCheckbars layout getting out of wack sometimes

Browse Source 
CURA-6598
This commit is contained in:
Jaime van Kessel 2019-08-29 15:15:35 +02:00
parent 68d3cf8412
commit c80cd9679f
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml
View File

@ -78,7 +78,7 @@ Item
left: parent.left left: parent.left
right: parent.right right: parent.right
} }
height: childrenRect.height height: intentCategoryLabel.height
Label Label
{ {
@ -110,6 +110,11 @@ Item
// When user created profile is active, no quality tickbox should be active. // When user created profile is active, no quality tickbox should be active.
return false return false
} }
if(modelItem === null)
{
return false
}
return Cura.MachineManager.activeQualityType == modelItem.quality_type && Cura.MachineManager.activeIntentCategory == modelItem.intent_category return Cura.MachineManager.activeQualityType == modelItem.quality_type && Cura.MachineManager.activeIntentCategory == modelItem.intent_category
} }

3
resources/qml/RadioCheckbar.qml
View File

@ -57,10 +57,11 @@ Item
Item Item
{ {
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true
// The last item of the repeater needs to be shorter, as we don't need another part to fit // The last item of the repeater needs to be shorter, as we don't need another part to fit
// the horizontal bar. The others should essentially not be limited. // the horizontal bar. The others should essentially not be limited.
Layout.maximumWidth: index + 1 === repeater.count ? activeComponent.width: 200000000 Layout.maximumWidth: index + 1 === repeater.count ? activeComponent.width: 200000000
height: activeComponent.height
property bool isEnabled: model.available property bool isEnabled: model.available
// The horizontal bar between the checkable options. // The horizontal bar between the checkable options.
// Note that the horizontal bar points towards the previous item. // Note that the horizontal bar points towards the previous item.