From 4433e486111090f41e8b8f8d54c3cc8fea5fb1b7 Mon Sep 17 00:00:00 2001
From: miruka <miruka@disroot.org>
Date: Sun, 28 Apr 2019 15:45:42 -0400
Subject: [PATCH] Fix QtQuick.Layout version, MessageContent wrap

---
 TODO.md                                                       | 1 +
 harmonyqml/components/Base/HButton.qml                        | 2 +-
 harmonyqml/components/Base/HColumnLayout.qml                  | 2 +-
 harmonyqml/components/Base/HInterfaceBox.qml                  | 2 +-
 harmonyqml/components/Base/HNoticeLabel.qml                   | 2 +-
 harmonyqml/components/Base/HRowLayout.qml                     | 2 +-
 harmonyqml/components/Base/HSpacer.qml                        | 2 +-
 harmonyqml/components/Chat/Banners/Banner.qml                 | 2 +-
 harmonyqml/components/Chat/RoomEventList/EventContent.qml     | 2 +-
 harmonyqml/components/Chat/RoomEventList/MessageContent.qml   | 4 ++--
 .../components/Chat/RoomEventList/RoomEventDelegate.qml       | 2 +-
 harmonyqml/components/Chat/RoomEventList/RoomEventList.qml    | 2 +-
 harmonyqml/components/Chat/RoomHeader.qml                     | 2 +-
 harmonyqml/components/Chat/SendBox.qml                        | 2 +-
 harmonyqml/components/Chat/TypingUsersBar.qml                 | 2 +-
 harmonyqml/components/Pages/RememberAccount.qml               | 2 +-
 harmonyqml/components/Pages/SignIn.qml                        | 2 +-
 harmonyqml/components/SidePane/AccountDelegate.qml            | 2 +-
 harmonyqml/components/SidePane/AccountList.qml                | 2 +-
 harmonyqml/components/SidePane/PaneToolBar.qml                | 2 +-
 harmonyqml/components/SidePane/RoomDelegate.qml               | 2 +-
 harmonyqml/components/SidePane/RoomList.qml                   | 2 +-
 harmonyqml/components/SidePane/SidePane.qml                   | 2 +-
 harmonyqml/components/UI.qml                                  | 2 +-
 24 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/TODO.md b/TODO.md
index 62d8352a..038add76 100644
--- a/TODO.md
+++ b/TODO.md
@@ -3,6 +3,7 @@
   - Don't bake in size properties for components
 
 - Bug fixes
+  - SidePane indent at min size
   - The damn remember account dialog
   - 100% CPU usage when hitting top edge to trigger messages loading
   - Sending `![A picture](https://picsum.photos/256/256)` → not clickable?
diff --git a/harmonyqml/components/Base/HButton.qml b/harmonyqml/components/Base/HButton.qml
index 49f41c4e..c41ac2f4 100644
--- a/harmonyqml/components/Base/HButton.qml
+++ b/harmonyqml/components/Base/HButton.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.3
 
 Button {
     property string iconName: ""
diff --git a/harmonyqml/components/Base/HColumnLayout.qml b/harmonyqml/components/Base/HColumnLayout.qml
index 6a06e0fc..fefe2d93 100644
--- a/harmonyqml/components/Base/HColumnLayout.qml
+++ b/harmonyqml/components/Base/HColumnLayout.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.3
 
 ColumnLayout {
     id: columnLayout
diff --git a/harmonyqml/components/Base/HInterfaceBox.qml b/harmonyqml/components/Base/HInterfaceBox.qml
index 251d8c2e..b76966f6 100644
--- a/harmonyqml/components/Base/HInterfaceBox.qml
+++ b/harmonyqml/components/Base/HInterfaceBox.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.7
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.3
 
 HScalingBox {
     id: interfaceBox
diff --git a/harmonyqml/components/Base/HNoticeLabel.qml b/harmonyqml/components/Base/HNoticeLabel.qml
index 63647ac0..2ba997ac 100644
--- a/harmonyqml/components/Base/HNoticeLabel.qml
+++ b/harmonyqml/components/Base/HNoticeLabel.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.7
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.3
 import "../Base"
 
 HRowLayout {
diff --git a/harmonyqml/components/Base/HRowLayout.qml b/harmonyqml/components/Base/HRowLayout.qml
index 8267045c..5c5f7301 100644
--- a/harmonyqml/components/Base/HRowLayout.qml
+++ b/harmonyqml/components/Base/HRowLayout.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.7
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.3
 
 RowLayout {
     id: rowLayout
diff --git a/harmonyqml/components/Base/HSpacer.qml b/harmonyqml/components/Base/HSpacer.qml
index f9463e15..b3ab15f2 100644
--- a/harmonyqml/components/Base/HSpacer.qml
+++ b/harmonyqml/components/Base/HSpacer.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.7
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.3
 
 Item {
     Layout.fillWidth: true
diff --git a/harmonyqml/components/Chat/Banners/Banner.qml b/harmonyqml/components/Chat/Banners/Banner.qml
index a59bbfe8..e8e9c3da 100644
--- a/harmonyqml/components/Chat/Banners/Banner.qml
+++ b/harmonyqml/components/Chat/Banners/Banner.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.7
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.3
 import "../../Base"
 
 HGlassRectangle {
diff --git a/harmonyqml/components/Chat/RoomEventList/EventContent.qml b/harmonyqml/components/Chat/RoomEventList/EventContent.qml
index c0832b7e..ec17e0ef 100644
--- a/harmonyqml/components/Chat/RoomEventList/EventContent.qml
+++ b/harmonyqml/components/Chat/RoomEventList/EventContent.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.7
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.3
 import "../../Base"
 import "../utils.js" as ChatJS
 
diff --git a/harmonyqml/components/Chat/RoomEventList/MessageContent.qml b/harmonyqml/components/Chat/RoomEventList/MessageContent.qml
index 06008c6e..748bf6df 100644
--- a/harmonyqml/components/Chat/RoomEventList/MessageContent.qml
+++ b/harmonyqml/components/Chat/RoomEventList/MessageContent.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.7
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.3
 import "../../Base"
 
 Row {
@@ -55,7 +55,7 @@ Row {
 
             Layout.minimumWidth: nameLabel.implicitWidth
             Layout.maximumWidth: Math.min(
-                600, roomEventListView.width - avatar.width - row.totalSpacing
+                600, roomEventListView.width - avatar.width - row.spacing
             )
         }
     }
diff --git a/harmonyqml/components/Chat/RoomEventList/RoomEventDelegate.qml b/harmonyqml/components/Chat/RoomEventList/RoomEventDelegate.qml
index 41244963..7b01ca69 100644
--- a/harmonyqml/components/Chat/RoomEventList/RoomEventDelegate.qml
+++ b/harmonyqml/components/Chat/RoomEventList/RoomEventDelegate.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.7
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.3
 import "../../Base"
 import "../utils.js" as ChatJS
 
diff --git a/harmonyqml/components/Chat/RoomEventList/RoomEventList.qml b/harmonyqml/components/Chat/RoomEventList/RoomEventList.qml
index 70659b89..469d9c43 100644
--- a/harmonyqml/components/Chat/RoomEventList/RoomEventList.qml
+++ b/harmonyqml/components/Chat/RoomEventList/RoomEventList.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.7
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.3
 import "../../Base"
 
 HGlassRectangle {
diff --git a/harmonyqml/components/Chat/RoomHeader.qml b/harmonyqml/components/Chat/RoomHeader.qml
index b606bb87..98f04c3b 100644
--- a/harmonyqml/components/Chat/RoomHeader.qml
+++ b/harmonyqml/components/Chat/RoomHeader.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.7
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.3
 import "../Base"
 
 HGlassRectangle {
diff --git a/harmonyqml/components/Chat/SendBox.qml b/harmonyqml/components/Chat/SendBox.qml
index 968fad7a..414b5350 100644
--- a/harmonyqml/components/Chat/SendBox.qml
+++ b/harmonyqml/components/Chat/SendBox.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.7
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.3
 import "../Base"
 
 HGlassRectangle {
diff --git a/harmonyqml/components/Chat/TypingUsersBar.qml b/harmonyqml/components/Chat/TypingUsersBar.qml
index 58797956..5f639bee 100644
--- a/harmonyqml/components/Chat/TypingUsersBar.qml
+++ b/harmonyqml/components/Chat/TypingUsersBar.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.7
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.3
 import "../Base"
 import "utils.js" as ChatJS
 
diff --git a/harmonyqml/components/Pages/RememberAccount.qml b/harmonyqml/components/Pages/RememberAccount.qml
index d062fa31..e1c19031 100644
--- a/harmonyqml/components/Pages/RememberAccount.qml
+++ b/harmonyqml/components/Pages/RememberAccount.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.7
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.3
 import "../Base"
 
 Item {
diff --git a/harmonyqml/components/Pages/SignIn.qml b/harmonyqml/components/Pages/SignIn.qml
index 21961469..61e7d439 100644
--- a/harmonyqml/components/Pages/SignIn.qml
+++ b/harmonyqml/components/Pages/SignIn.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.7
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.3
 import "../Base"
 
 Item {
diff --git a/harmonyqml/components/SidePane/AccountDelegate.qml b/harmonyqml/components/SidePane/AccountDelegate.qml
index 4dec96d9..4e7cbcac 100644
--- a/harmonyqml/components/SidePane/AccountDelegate.qml
+++ b/harmonyqml/components/SidePane/AccountDelegate.qml
@@ -1,4 +1,4 @@
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.3
 import "../Base"
 
 HColumnLayout {
diff --git a/harmonyqml/components/SidePane/AccountList.qml b/harmonyqml/components/SidePane/AccountList.qml
index 8f609a7b..5b9b2755 100644
--- a/harmonyqml/components/SidePane/AccountList.qml
+++ b/harmonyqml/components/SidePane/AccountList.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.7
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.3
 
 ListView {
     id: accountList
diff --git a/harmonyqml/components/SidePane/PaneToolBar.qml b/harmonyqml/components/SidePane/PaneToolBar.qml
index 66440bb7..27fb3627 100644
--- a/harmonyqml/components/SidePane/PaneToolBar.qml
+++ b/harmonyqml/components/SidePane/PaneToolBar.qml
@@ -1,4 +1,4 @@
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.3
 import "../Base"
 
 HRowLayout {
diff --git a/harmonyqml/components/SidePane/RoomDelegate.qml b/harmonyqml/components/SidePane/RoomDelegate.qml
index d1065535..99a215aa 100644
--- a/harmonyqml/components/SidePane/RoomDelegate.qml
+++ b/harmonyqml/components/SidePane/RoomDelegate.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.7
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.3
 import "../Base"
 import "utils.js" as SidePaneJS
 
diff --git a/harmonyqml/components/SidePane/RoomList.qml b/harmonyqml/components/SidePane/RoomList.qml
index eae047cc..839c8fb5 100644
--- a/harmonyqml/components/SidePane/RoomList.qml
+++ b/harmonyqml/components/SidePane/RoomList.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.7
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.3
 import "../Base"
 
 ListView {
diff --git a/harmonyqml/components/SidePane/SidePane.qml b/harmonyqml/components/SidePane/SidePane.qml
index 971961b4..ff3d0e7f 100644
--- a/harmonyqml/components/SidePane/SidePane.qml
+++ b/harmonyqml/components/SidePane/SidePane.qml
@@ -1,4 +1,4 @@
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.3
 import QtGraphicalEffects 1.0
 import "../Base"
 
diff --git a/harmonyqml/components/UI.qml b/harmonyqml/components/UI.qml
index fd1fe7b4..06245f2d 100644
--- a/harmonyqml/components/UI.qml
+++ b/harmonyqml/components/UI.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.3
 import "Base"
 import "SidePane"