From 29e21bc7c28feeaf26e12ec296bbfbd5ded6d7ee Mon Sep 17 00:00:00 2001
From: miruka <miruka@disroot.org>
Date: Tue, 16 Jul 2019 11:48:57 -0400
Subject: [PATCH] Fix avatar upload overlay overflow at small size

---
 TODO.md                               |  2 +-
 src/qml/Pages/EditAccount/Profile.qml |  6 ++++--
 src/qml/UI.qml                        | 16 ++++++++--------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/TODO.md b/TODO.md
index c0ef71de..ca32319c 100644
--- a/TODO.md
+++ b/TODO.md
@@ -32,7 +32,7 @@
   - Html links color
   - `pyotherside.atexit()`
   - Way to put sidepane back to auto-sizing (snap)
-  - Better look for arrows when sidepane collapsed
+  - Better look for arrows and option button when sidepane collapsed
   - Don't put own messages to the right past certain width
 
   - Invite to room
diff --git a/src/qml/Pages/EditAccount/Profile.qml b/src/qml/Pages/EditAccount/Profile.qml
index 14124f31..9ee0e2de 100644
--- a/src/qml/Pages/EditAccount/Profile.qml
+++ b/src/qml/Pages/EditAccount/Profile.qml
@@ -64,6 +64,7 @@ HGridLayout {
             HColumnLayout {
                 anchors.centerIn: parent
                 spacing: currentSpacing
+                width: parent.width
 
                 HIcon {
                     svgName: "upload_avatar"
@@ -76,11 +77,12 @@ HGridLayout {
                 HLabel {
                     text: qsTr("Upload profile picture")
                     color: Qt.hsla(0, 0, 0.9, 1)
-                    font.pixelSize: theme.fontSize.big
+                    font.pixelSize: theme.fontSize.big *
+                                    avatar.height / avatarPreferredSize
                     wrapMode: Text.WordWrap
+                    horizontalAlignment: Qt.AlignHCenter
 
                     Layout.fillWidth: true
-                    Layout.alignment: Qt.AlignCenter
                 }
             }
         }
diff --git a/src/qml/UI.qml b/src/qml/UI.qml
index 78acdd5e..e3cca8d6 100644
--- a/src/qml/UI.qml
+++ b/src/qml/UI.qml
@@ -69,17 +69,17 @@ Item {
                 id: initialRoomTimer
                 interval: 5000
                 repeat: false
-                onTriggered: pageStack.showRoom(
-                    "@test_mary:matrix.org",
+                // onTriggered: pageStack.showRoom(
+                    // "@test_mary:matrix.org",
                     // "Rooms",
                     // "!TSXGsbBbdwsdylIOJZ:matrix.org"
-                    "Invites",
-                    "!xjqvLOGhMVutPXpAqi:matrix.org"
-                )
-                // onTriggered: pageStack.showPage(
-                //     "EditAccount/EditAccount",
-                //     {"userId": "@test_mary:matrix.org"}
+                    // "Invites",
+                    // "!xjqvLOGhMVutPXpAqi:matrix.org"
                 // )
+                onTriggered: pageStack.showPage(
+                    "EditAccount/EditAccount",
+                    {"userId": "@test_mary:matrix.org"}
+                )
             }
 
             onCurrentItemChanged: if (currentItem) {