Fix roomlist "jumping around".

Remove custom DPI code from main.cpp. Hide redacted event in roomlist.
2019-05-23 09:57:42 +08:00
parent 77da41c2ec
commit 0f156ea98b
4 changed files with 23 additions and 20 deletions
--- a/imports/Spectral/Panel/RoomListPanel.qml
+++ b/imports/Spectral/Panel/RoomListPanel.qml
@@ -331,12 +331,12 @@ Item {
                            acceptInvitationDialog.createObject(ApplicationWindow.overlay, {"room": currentRoom}).open()
                        } else {
                            if (enteredRoom) {
-                                enteredRoom.displayed = false
                                leaveRoom(enteredRoom)
+                                enteredRoom.displayed = false
                            }
-                            currentRoom.displayed = true
                            enterRoom(currentRoom)
                            enteredRoom = currentRoom
+                            currentRoom.displayed = true
                        }
                    }
                    onSecondaryClicked: roomListContextMenu.createObject(ApplicationWindow.overlay, {"room": currentRoom}).popup()
--- a/imports/Spectral/Panel/RoomPanel.qml
+++ b/imports/Spectral/Panel/RoomPanel.qml
@@ -70,6 +70,7 @@ Item {
                        Layout.alignment: Qt.AlignHCenter

                        text: "Choose local file"
+                        color: MPalette.foreground
                    }
                }