added room topic

2 files changed, 34 insertions, 5 deletions

diff --git a/resources/qml/RoomSettings.qml b/resources/qml/RoomSettings.qml

index eabe68f5..2f6f1866 100644
--- a/resources/qml/RoomSettings.qml
+++ b/resources/qml/RoomSettings.qml
@@ -12,8 +12,8 @@ ApplicationWindow {
 
 	x: MainWindow.x + (MainWindow.width / 2) - (width / 2)
     y: MainWindow.y + (MainWindow.height / 2) - (height / 2)
-    minimumWidth: 340
-    minimumHeight: 600
+    minimumWidth: 400
+    minimumHeight: 650
     palette: colors
     color: colors.window
     modality: Qt.WindowModal
@@ -24,9 +24,12 @@ ApplicationWindow {
     }
 
     ColumnLayout {
-        id: contentLayout
+        id: contentLayout1
 
-        anchors.fill: parent
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.top: parent.top
+        anchors.bottom: undefined
         anchors.margins: 10
         spacing: 10
 
@@ -101,6 +104,32 @@ ApplicationWindow {
             visible: roomSettings.canChangeNameAndTopic
             onClicked: roomSettings.openEditModal()
         }
+    }
+
+    ScrollView {
+        id: topicScroll
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.top: contentLayout1.bottom
+        anchors.bottom: undefined
+        anchors.margins: 10
+        height: 100
+
+        TextArea {
+            text: roomSettings.roomTopic
+            background: null
+        }
+    }
+
+    ColumnLayout {
+        id: contentLayout2
+
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.top: topicScroll.bottom
+        anchors.bottom: parent.bottom
+        anchors.margins: 10
+        spacing: 10
 
         MatrixText {
             text: "SETTINGS"
diff --git a/resources/qml/TopBar.qml b/resources/qml/TopBar.qml

index c64eddd4..967aa11e 100644
--- a/resources/qml/TopBar.qml
+++ b/resources/qml/TopBar.qml
@@ -15,7 +15,7 @@ Rectangle {
 
     MouseArea {
         anchors.fill: parent
-        onClicked: TimelineManager.openRoomSettings()
+        onClicked: TimelineManager.timeline.openRoomSettings()
     }
 
     GridLayout {