d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 19:08:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
resources/qml/ChatPage.qml
View file

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

27
resources/qml/RoomList.qml
View file

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

8
resources/qml/TopBar.qml
View file

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