From aafe42c4ccb7dec77540178de6141f4ccd65fa2d Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Sun, 22 Sep 2024 13:18:36 +0000 Subject: [PATCH] Ensure floating buttons have correct size on mobile (cherry picked from commit 42dd2e54139114fd35c5cb0420ae5d23d66a71e0) Co-authored-by: Carl Schwan --- src/qml/TimelineView.qml | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/src/qml/TimelineView.qml b/src/qml/TimelineView.qml index 04b0657e8..6846a1dc1 100644 --- a/src/qml/TimelineView.qml +++ b/src/qml/TimelineView.qml @@ -183,12 +183,17 @@ QQC2.ScrollView { KirigamiComponents.FloatingButton { id: goReadMarkerFab - anchors.right: parent.right - anchors.top: parent.top - anchors.topMargin: Kirigami.Units.largeSpacing - anchors.rightMargin: Kirigami.Units.largeSpacing - implicitWidth: Kirigami.Units.gridUnit * 2 - implicitHeight: Kirigami.Units.gridUnit * 2 + anchors { + right: parent.right + top: parent.top + topMargin: Kirigami.Units.largeSpacing + rightMargin: Kirigami.Units.largeSpacing + } + + implicitWidth: Kirigami.Settings.hasTransientTouchInput ? Kirigami.Units.gridUnit * 3 : Kirigami.Units.gridUnit * 2 + implicitHeight: Kirigami.Settings.hasTransientTouchInput ? Kirigami.Units.gridUnit * 3 : Kirigami.Units.gridUnit * 2 + + padding: Kirigami.Units.largeSpacing z: 2 visible: (root.currentRoom?.hasUnreadMessages ?? false) @@ -215,12 +220,16 @@ QQC2.ScrollView { } KirigamiComponents.FloatingButton { id: goMarkAsReadFab - anchors.right: parent.right - anchors.bottom: parent.bottom - anchors.bottomMargin: Kirigami.Units.largeSpacing - anchors.rightMargin: Kirigami.Units.largeSpacing - implicitWidth: Kirigami.Units.gridUnit * 2 - implicitHeight: Kirigami.Units.gridUnit * 2 + anchors { + right: parent.right + bottom: parent.bottom + bottomMargin: Kirigami.Units.largeSpacing + rightMargin: Kirigami.Units.largeSpacing + } + implicitWidth: Kirigami.Settings.hasTransientTouchInput ? Kirigami.Units.gridUnit * 3 : Kirigami.Units.gridUnit * 2 + implicitHeight: Kirigami.Settings.hasTransientTouchInput ? Kirigami.Units.gridUnit * 3 : Kirigami.Units.gridUnit * 2 + + padding: Kirigami.Units.largeSpacing z: 2 visible: !messageListView.atYEnd