Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-17 21:40:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

move subImage recalculation to it's own method

Browse source
This commit is contained in:
WolfGang 2018-04-04 22:10:54 +01:00
parent f9bcd23463
commit 787127b149
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
interface/resources/qml/hifi/overlays/ImageOverlay.qml
View file

@ -20,17 +20,7 @@ Overlay {
repeat: false repeat: false
running: false running: false
onTriggered: { onTriggered: {
if (image.xSize === 0) { recalculateMargins();
image.xSize = image.sourceSize.width - image.xStart;
}
if (image.ySize === 0) {
image.ySize = image.sourceSize.height - image.yStart;
}
image.anchors.leftMargin = -image.xStart * root.width / image.xSize;
image.anchors.topMargin = -image.yStart * root.height / image.ySize;
image.anchors.rightMargin = (image.xStart + image.xSize - image.sourceSize.width) * root.width / image.xSize;
image.anchors.bottomMargin = (image.yStart + image.ySize - image.sourceSize.height) * root.height / image.ySize;
} }
} }
@ -44,6 +34,20 @@ Overlay {
anchors.fill: parent anchors.fill: parent
} }
function recalculateMargins() {
if (image.xSize === 0) {
image.xSize = image.sourceSize.width - image.xStart;
}
if (image.ySize === 0) {
image.ySize = image.sourceSize.height - image.yStart;
}
image.anchors.leftMargin = -image.xStart * root.width / image.xSize;
image.anchors.topMargin = -image.yStart * root.height / image.ySize;
image.anchors.rightMargin = (image.xStart + image.xSize - image.sourceSize.width) * root.width / image.xSize;
image.anchors.bottomMargin = (image.yStart + image.ySize - image.sourceSize.height) * root.height / image.ySize;
}
ColorOverlay { ColorOverlay {
id: color id: color
anchors.fill: image anchors.fill: image
@ -62,7 +66,7 @@ Overlay {
case "height": image.ySize = value; break; case "height": image.ySize = value; break;
} }
} }
image.resizer.start(); recalculateMargins();
} }
function updatePropertiesFromScript(properties) { function updatePropertiesFromScript(properties) {