Fix QtQuick.Layout version, MessageContent wrap

2019-04-28 15:45:42 -04:00 · 2019-04-28 15:45:42 -04:00 · 4433e48611
commit 4433e48611
parent 70ca608961
24 changed files with 25 additions and 24 deletions
--- 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?
--- 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: ""
--- 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
--- 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
--- 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 {
--- 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
--- 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
--- 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 {
--- 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

--- 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
            )
        }
    }
--- 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

--- 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 {
--- 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 {
--- 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 {
--- 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

--- 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 {
--- 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 {
--- 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 {
--- 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
--- 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 {
--- 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

--- 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 {
--- 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"

--- 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"