diff --git a/src/qml/UserPage/UserDelegateItem.qml b/src/qml/UserPage/UserDelegateItem.qml index 88fdd18..7dabc06 100644 --- a/src/qml/UserPage/UserDelegateItem.qml +++ b/src/qml/UserPage/UserDelegateItem.qml @@ -31,11 +31,6 @@ Item { } } - MouseArea { - anchors.fill: parent - onDoubleClicked: additionalSettings.toggle() - } - ColumnLayout { id: mainLayout anchors.fill: parent @@ -45,72 +40,89 @@ Item { id: _itemLayout spacing: 0 - Image { - id: _userImage - width: 50 - height: 50 - sourceSize: Qt.size(width, height) - source: iconFileName ? "file:///" + iconFileName : "image://icontheme/default-user" - visible: status === Image.Ready - - layer.enabled: true - layer.effect: OpacityMask { - maskSource: Item { - width: _userImage.width - height: width - - Rectangle { - anchors.fill: parent - radius: width / 2 + Item { + id: _topItem + + Layout.fillWidth: true + height: _topLayout.implicitHeight + + MouseArea { + anchors.fill: parent + onDoubleClicked: additionalSettings.toggle() + } + + RowLayout { + id: _topLayout + anchors.fill: parent + + Image { + id: _userImage + width: 50 + height: 50 + sourceSize: Qt.size(width, height) + source: iconFileName ? "file:///" + iconFileName : "image://icontheme/default-user" + visible: status === Image.Ready + + layer.enabled: true + layer.effect: OpacityMask { + maskSource: Item { + width: _userImage.width + height: width + + Rectangle { + anchors.fill: parent + radius: width / 2 + } + } } } - } - } - Label { - Layout.alignment: Qt.AlignVCenter - text: userName - font.pointSize: 16 - bottomPadding: Meui.Units.smallSpacing - leftPadding: Meui.Units.largeSpacing - } + Label { + Layout.alignment: Qt.AlignVCenter + text: userName + font.pointSize: 16 + bottomPadding: Meui.Units.smallSpacing + leftPadding: Meui.Units.largeSpacing + } - Label { - Layout.alignment: Qt.AlignVCenter - text: realName - color: Meui.Theme.disabledTextColor - visible: realName !== userName - font.pointSize: 16 - bottomPadding: Meui.Units.smallSpacing - } + Label { + Layout.alignment: Qt.AlignVCenter + text: realName + color: Meui.Theme.disabledTextColor + visible: realName !== userName + font.pointSize: 16 + bottomPadding: Meui.Units.smallSpacing + } - Item { - Layout.fillWidth: true - } + Item { + Layout.fillWidth: true + } - Label { - text: qsTr("Currently logged") - rightPadding: Meui.Units.largeSpacing - visible: currentUser.userId === loggedUser.userId - } + Label { + text: qsTr("Currently logged") + rightPadding: Meui.Units.largeSpacing + visible: currentUser.userId === loggedUser.userId + } - Button { - onClicked: additionalSettings.toggle() + Button { + onClicked: additionalSettings.toggle() - implicitWidth: height + implicitWidth: height - background: Item {} + background: Item {} - Image { - anchors.centerIn: parent - width: 22 - height: 22 - sourceSize: Qt.size(width, height) - source: Meui.Theme.darkMode ? additionalSettings.shown ? "qrc:/images/dark/up.svg" : "qrc:/images/dark/down.svg" - : additionalSettings.shown ? "qrc:/images/light/up.svg" : "qrc:/images/light/down.svg" + Image { + anchors.centerIn: parent + width: 22 + height: 22 + sourceSize: Qt.size(width, height) + source: Meui.Theme.darkMode ? additionalSettings.shown ? "qrc:/images/dark/up.svg" : "qrc:/images/dark/down.svg" + : additionalSettings.shown ? "qrc:/images/light/up.svg" : "qrc:/images/light/down.svg" + } + } + } } } - } Item { height: Meui.Units.largeSpacing diff --git a/src/qml/Wallpaper/BackgroundPage.qml b/src/qml/Wallpaper/BackgroundPage.qml index eff0ef9..00fd2c0 100644 --- a/src/qml/Wallpaper/BackgroundPage.qml +++ b/src/qml/Wallpaper/BackgroundPage.qml @@ -113,6 +113,7 @@ ItemPage { mipmap: true cache: true opacity: 1.0 + smooth: false Behavior on opacity { NumberAnimation {