3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 07:33:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix various expandable/dragable/window interactions. [CURA-6478]

Browse source
This commit is contained in:
Remco Burema 2019-04-25 13:33:31 +02:00
parent 9283c3d321
commit baac2d1a0f
2 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
resources/qml/ExpandableComponent.qml
View file

@ -83,6 +83,11 @@ Item
contentContainer.visible = !expanded contentContainer.visible = !expanded
} }
function updateDragPosition()
{
contentContainer.trySetPosition(contentContainer.x, contentContainer.y);
}
// Add this binding since the background color is not updated otherwise // Add this binding since the background color is not updated otherwise
Binding Binding
{ {
@ -102,7 +107,8 @@ Item
{ {
if (!base.enabled && expanded) if (!base.enabled && expanded)
{ {
toggleContent() toggleContent();
updateDragPosition();
} }
} }
} }
@ -223,8 +229,8 @@ Item
CuraApplication.appHeight() - (contentContainer.height + margin.height)); CuraApplication.appHeight() - (contentContainer.height + margin.height));
var initialY = background.height + base.shadowOffset + margin.height; var initialY = background.height + base.shadowOffset + margin.height;
contentContainer.x = Math.min(maxPt.x, Math.max(minPt.x, posNewX)); contentContainer.x = Math.max(minPt.x, Math.min(maxPt.x, posNewX));
contentContainer.y = Math.min(maxPt.y, Math.max(initialY, posNewY)); contentContainer.y = Math.max(initialY, Math.min(maxPt.y, posNewY));
} }
ExpandableComponentHeader ExpandableComponentHeader
@ -248,7 +254,7 @@ Item
left: parent.left left: parent.left
right: contentHeader.xPosCloseButton right: contentHeader.xPosCloseButton
} }
property variant clickPos: Qt.point(0, 0) property var clickPos: Qt.point(0, 0)
onPressed: onPressed:
{ {

6
resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml
View file

@ -143,7 +143,11 @@ Item
iconSource: UM.Theme.getIcon("arrow_right") iconSource: UM.Theme.getIcon("arrow_right")
isIconOnRightSide: true isIconOnRightSide: true
visible: currentModeIndex == PrintSetupSelectorContents.Mode.Recommended visible: currentModeIndex == PrintSetupSelectorContents.Mode.Recommended
onClicked: currentModeIndex = PrintSetupSelectorContents.Mode.Custom onClicked:
{
currentModeIndex = PrintSetupSelectorContents.Mode.Custom
updateDragPosition();
}
} }
//Invisible area at the bottom with which you can resize the panel. //Invisible area at the bottom with which you can resize the panel.