Fix list items being hoverable through between settings and new room buttons

This commit is contained in:
Nicolas Werner 2022-01-30 20:09:58 +01:00
parent 2613275461
commit f76d679ef6
No known key found for this signature in database
GPG Key ID: C8D75E610773F2D9
3 changed files with 235 additions and 229 deletions

View File

@ -97,6 +97,7 @@ Rectangle {
implicitHeight: chatPage.height
collapsed: parent.collapsed
anchors.fill: parent
}
Binding {

View File

@ -385,7 +385,7 @@ Page {
header: ColumnLayout {
spacing: 0
Rectangle {
Pane {
id: userInfoPanel
function openUserProfile() {
@ -396,12 +396,15 @@ Page {
userProfile.show();
}
color: Nheko.colors.window
Layout.fillWidth: true
Layout.alignment: Qt.AlignBottom
Layout.preferredHeight: userInfoGrid.implicitHeight + 2 * Nheko.paddingMedium
//Layout.preferredHeight: userInfoGrid.implicitHeight + 2 * Nheko.paddingMedium
padding: Nheko.paddingMedium
Layout.minimumHeight: 40
background: Rectangle {color: Nheko.colors.window}
InputDialog {
id: statusDialog
@ -442,14 +445,12 @@ Page {
gesturePolicy: TapHandler.ReleaseWithinBounds
}
RowLayout {
contentItem: RowLayout {
id: userInfoGrid
property var profile: Nheko.currentUser
spacing: Nheko.paddingMedium
anchors.fill: parent
anchors.margins: Nheko.paddingMedium
Avatar {
id: avatar
@ -614,19 +615,17 @@ Page {
Layout.fillWidth: true
}
Rectangle {
color: Nheko.colors.window
Pane {
Layout.fillWidth: true
Layout.alignment: Qt.AlignBottom
Layout.preferredHeight: buttonRow.implicitHeight
Layout.minimumHeight: 40
RowLayout {
id: buttonRow
horizontalPadding: Nheko.paddingMedium
verticalPadding: 0
anchors.left: parent.left
anchors.right: parent.right
anchors.margins: Nheko.paddingMedium
background: Rectangle {color: Nheko.colors.window}
contentItem: RowLayout {
id: buttonRow
ImageButton {
Layout.fillWidth: true

View File

@ -12,7 +12,7 @@ import im.nheko 1.0
import "./delegates"
Rectangle {
Pane {
id: topBar
property bool showBackButton: false
@ -28,7 +28,11 @@ Rectangle {
Layout.fillWidth: true
implicitHeight: topLayout.height + Nheko.paddingMedium * 2
z: 3
padding: 0
background: Rectangle {
color: Nheko.colors.window
}
TapHandler {
onSingleTapped: {
@ -65,6 +69,7 @@ Rectangle {
grabPermissions: PointerHandler.TakeOverForbidden | PointerHandler.CanTakeOverFromAnything
}
contentItem: Item {
GridLayout {
id: topLayout
@ -309,4 +314,5 @@ Rectangle {
anchors.bottomMargin: pinnedMessages.visible ? pinnedMessages.height : 0
cursorShape: Qt.PointingHandCursor
}
}
}