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

Move setting the dragged-to position to its own function. [CURA-6478]

Browse source
This commit is contained in:
Remco Burema 2019-04-23 14:33:42 +02:00
parent 78f15d8fcb
commit 7382798b6a
1 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

23
resources/qml/ExpandableComponent.qml
View file

@ -214,6 +214,19 @@ Item
border.color: UM.Theme.getColor("lining") border.color: UM.Theme.getColor("lining")
radius: UM.Theme.getSize("default_radius").width radius: UM.Theme.getSize("default_radius").width
function trySetPosition(posNewX, posNewY)
{
var margin = UM.Theme.getSize("narrow_margin");
var minPt = base.mapFromItem(null, margin.width, margin.height);
var maxPt = base.mapFromItem(null,
CuraApplication.appWidth() - (contentContainer.width + margin.width),
CuraApplication.appHeight() - (contentContainer.height + margin.height));
var initialY = background.height + base.shadowOffset + margin.height;
contentContainer.x = Math.min(maxPt.x, Math.max(minPt.x, posNewX));
contentContainer.y = Math.min(maxPt.y, Math.max(initialY, posNewY));
}
ExpandableComponentHeader ExpandableComponentHeader
{ {
id: contentHeader id: contentHeader
@ -247,15 +260,7 @@ Item
var delta = Qt.point(mouse.x - clickPos.x, mouse.y - clickPos.y); var delta = Qt.point(mouse.x - clickPos.x, mouse.y - clickPos.y);
if (delta.x !== 0 || delta.y !== 0) if (delta.x !== 0 || delta.y !== 0)
{ {
var margin = UM.Theme.getSize("narrow_margin"); contentContainer.trySetPosition(contentContainer.x + delta.x, contentContainer.y + delta.y);
var minPt = base.mapFromItem(null, margin.width, margin.height);
var maxPt = base.mapFromItem(null,
CuraApplication.appWidth() - (contentContainer.width + margin.width),
CuraApplication.appHeight() - (contentContainer.height + margin.width));
var initialY = background.height + base.shadowOffset + margin.height;
contentContainer.x = Math.min(maxPt.x, Math.max(minPt.x, contentContainer.x + delta.x));
contentContainer.y = Math.min(maxPt.y, Math.max(initialY, contentContainer.y + delta.y));
} }
} }
} }