1 files changed, 19 insertions, 4 deletions
diff --git a/resources/qml/Root.qml b/resources/qml/Root.qml
index e4b164e4..004169e1 100644
--- a/resources/qml/Root.qml
+++ b/resources/qml/Root.qml
@@ -17,10 +17,12 @@ import QtQuick.Window 2.15
 import im.nheko 1.0
 import im.nheko.EmojiModel 1.0
 
-Page {
+Pane {
     id: timelineRoot
 
     palette: Nheko.colors
+    background: null
+    padding: 0
 
     FontMetrics {
         id: fontMetrics
@@ -157,7 +159,6 @@ Page {
         sequence: "Ctrl+K"
         onActivated: {
             var quickSwitch = quickSwitcherComponent.createObject(timelineRoot);
-            TimelineManager.focusTimeline();
             quickSwitch.open();
         }
     }
@@ -165,7 +166,6 @@ Page {
     Shortcut {
         // Add alternative shortcut, because sometimes Alt+A is stolen by the TextEdit
         sequences: ["Alt+A", "Ctrl+Shift+A"]
-        context: Qt.ApplicationShortcut
         onActivated: Rooms.nextRoomWithActivity()
     }
 
@@ -366,9 +366,24 @@ Page {
         id: mainWindow
 
         anchors.fill: parent
-        initialItem: ChatPage {
+        initialItem: WelcomePage {
             //anchors.fill: parent
         }
     }
 
+    Component {
+        id: chatPage
+
+        ChatPage {
+        }
+    }
+
+    Connections {
+        function onSwitchToChatPage() {
+            console.log("AAAA");
+            mainWindow.replace(chatPage);
+        }
+        target: MainWindow
+    }
+
 }