Fix nits from code review
3 files changed, 3 insertions, 11 deletions
diff --git a/resources/qml/RoomDirectory.qml b/resources/qml/RoomDirectory.qml
index f31df64d..b01c1e00 100644
--- a/resources/qml/RoomDirectory.qml
+++ b/resources/qml/RoomDirectory.qml
@@ -6,7 +6,6 @@ import QtQuick 2.9
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import im.nheko 1.0
-import im.nheko.RoomDirectoryModel 1.0
ApplicationWindow {
id: roomDirectoryWindow
@@ -40,7 +39,7 @@ ApplicationWindow {
Layout.fillWidth: true
font.pixelSize: fontMetrics.font.pixelSize
- padding: Math.ceil(1.5 * Nheko.paddingSmall)
+ padding: Nheko.paddingMedium
color: Nheko.colors.text
placeholderText: qsTr("Search for public rooms")
onTextChanged: searchTimer.restart()
@@ -57,7 +56,6 @@ ApplicationWindow {
ListView {
id: roomDirView
anchors.fill: parent
- height: parent.height - searchBarLayout.height
model: RoomDirectoryModel {
id: roomDir
}
@@ -67,7 +65,7 @@ ApplicationWindow {
property color background: Nheko.colors.window
property color importantText: Nheko.colors.text
property color unimportantText: Nheko.colors.buttonText
- property int avatarSize: Math.ceil(fontMetrics.lineSpacing * 4)
+ property int avatarSize: fontMetrics.lineSpacing * 4
color: background
@@ -121,7 +119,7 @@ ApplicationWindow {
Layout.preferredWidth: parent.width
spacing: Nheko.paddingSmall
Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
- Layout.preferredHeight: Math.ceil(fontMetrics.lineSpacing * 4)
+ Layout.preferredHeight: fontMetrics.lineSpacing * 4
Label {
id: roomTopic
diff --git a/resources/qml/RoomList.qml b/resources/qml/RoomList.qml
index e8aacf75..6074f063 100644
--- a/resources/qml/RoomList.qml
+++ b/resources/qml/RoomList.qml
@@ -565,7 +565,6 @@ Component {
ToolTip.text: qsTr("Room directory")
Layout.margins: Nheko.paddingMedium
onClicked: {
- console.debug("Roomdir clicked");
var win = roomDirectoryComponent.createObject(timelineRoot);
win.show();
}
diff --git a/resources/res.qrc b/resources/res.qrc
index 3e417d4c..b46b726c 100644
--- a/resources/res.qrc
+++ b/resources/res.qrc
@@ -143,11 +143,6 @@
<file>qml/emoji/StickerPicker.qml</file>
<file>qml/UserProfile.qml</file>
<file>qml/RoomDirectory.qml</file>
- <file>qml/delegates/MessageDelegate.qml</file>
- <file>qml/delegates/TextMessage.qml</file>
- <file>qml/delegates/NoticeMessage.qml</file>
- <file>qml/delegates/ImageMessage.qml</file>
- <file>qml/delegates/PlayableMediaMessage.qml</file>
<file>qml/delegates/MessageDelegate.qml</file>
<file>qml/delegates/Encrypted.qml</file>
<file>qml/delegates/FileMessage.qml</file>
|
