Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-30 22:26:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into hazeOnTransparent

Browse source
This commit is contained in:
Nissim Hadar 2017-12-15 13:45:31 -08:00
commit 8bf517b2f8
1 changed files with 5 additions and 1 deletions

6
interface/resources/qml/LoginDialog/LinkAccountBody.qml
View file

@ -52,7 +52,11 @@ Item {
targetHeight += hifi.dimensions.contentSpacing.y + additionalInformation.height
}
parent.width = root.width = Math.max(d.minWidth, Math.min(d.maxWidth, targetWidth));
var newWidth = Math.max(d.minWidth, Math.min(d.maxWidth, targetWidth));
if(!isNaN(newWidth)) {
parent.width = root.width = newWidth;
}
parent.height = root.height = Math.max(d.minHeight, Math.min(d.maxHeight, targetHeight))
+ (keyboardEnabled && keyboardRaised ? (200 + 2 * hifi.dimensions.contentSpacing.y) : hifi.dimensions.contentSpacing.y);
}