From 6d86cbf03cf7b3ce4a24e98202bccb68a44e1687 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 11 Jun 2020 16:58:28 +0200 Subject: [PATCH] Convert the account details into an item No idea why it was a column. CURA-7454 --- resources/qml/Account/AccountDetails.qml | 10 +++------- resources/qml/Account/AccountWidget.qml | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/resources/qml/Account/AccountDetails.qml b/resources/qml/Account/AccountDetails.qml index e81fdb1fb2..031e376a21 100644 --- a/resources/qml/Account/AccountDetails.qml +++ b/resources/qml/Account/AccountDetails.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2020 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 @@ -7,20 +7,16 @@ import QtQuick.Controls 2.3 import UM 1.4 as UM import Cura 1.1 as Cura -Column +Item { property var profile: Cura.API.account.userProfile property bool loggedIn: Cura.API.account.isLoggedIn property var profileImage: Cura.API.account.profileImageUrl - - padding: UM.Theme.getSize("wide_margin").height - spacing: UM.Theme.getSize("wide_margin").height - Loader { id: accountOperations - anchors.horizontalCenter: parent.horizontalCenter + anchors.centerIn: parent sourceComponent: loggedIn ? userOperations : generalOperations } diff --git a/resources/qml/Account/AccountWidget.qml b/resources/qml/Account/AccountWidget.qml index 8c4d4c91e8..22c876b857 100644 --- a/resources/qml/Account/AccountWidget.qml +++ b/resources/qml/Account/AccountWidget.qml @@ -131,7 +131,7 @@ Item opacity: opened ? 1 : 0 Behavior on opacity { NumberAnimation { duration: 100 } } - + padding: UM.Theme.getSize("wide_margin").height contentItem: AccountDetails {}