From ec5355d86e7d0b0e24c889e5146809b293d24d12 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Wed, 8 Oct 2025 17:44:46 +0200 Subject: [PATCH] Push to PageRow on mobile too This fixes some glitches during animation, which had the background disappearing when the pop animation was running, and now uses always the pagerow for viewing the room. This depends from the new PageRow animation on mobile, https://invent.kde.org/frameworks/kirigami/-/merge_requests/1925 which makes all applications coherent with an application which looks a bit more like the one on most android apps. Also, the swipe back gesture now will work there too --- src/app/qml/Main.qml | 3 ++- src/app/qml/RoomPage.qml | 6 ------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/app/qml/Main.qml b/src/app/qml/Main.qml index c2cd7b98b..1f286070c 100644 --- a/src/app/qml/Main.qml +++ b/src/app/qml/Main.qml @@ -100,7 +100,8 @@ Kirigami.ApplicationWindow { function onCurrentRoomChanged() { if (RoomManager.currentRoom && root.pageStack.depth <= 1 && root.initialized && Kirigami.Settings.isMobile) { - let roomPage = root.pageStack.layers.push(Qt.createComponent('org.kde.neochat', 'RoomPage')); + let roomPage = pageStack.push(Qt.createComponent('org.kde.neochat', 'RoomPage')); + roomPage.forceActiveFocus(); roomPage.backRequested.connect(event => { RoomManager.clearCurrentRoom(); }); diff --git a/src/app/qml/RoomPage.qml b/src/app/qml/RoomPage.qml index 22eda1d4b..2a00559ee 100644 --- a/src/app/qml/RoomPage.qml +++ b/src/app/qml/RoomPage.qml @@ -252,12 +252,6 @@ Kirigami.Page { } } - background: Rectangle { - Kirigami.Theme.colorSet: Kirigami.Theme.View - Kirigami.Theme.inherit: false - color: NeoChatConfig.compactLayout ? Kirigami.Theme.backgroundColor : "transparent" - } - footer: Loader { id: chatBarLoader height: active ? (item as ChatBar).implicitHeight : 0