Fix HPage and EventList flickTarget conflict
This commit is contained in:
parent
f2ab84c754
commit
717b18fede
@ -17,6 +17,8 @@ SwipeView {
|
|||||||
property int currentSpacing:
|
property int currentSpacing:
|
||||||
Math.min(theme.spacing * width / 400, theme.spacing)
|
Math.min(theme.spacing * width / 400, theme.spacing)
|
||||||
|
|
||||||
|
property bool becomeKeyboardFlickableTarget: true
|
||||||
|
|
||||||
id: swipeView
|
id: swipeView
|
||||||
clip: true
|
clip: true
|
||||||
interactive: sidePane.reduce
|
interactive: sidePane.reduce
|
||||||
@ -75,7 +77,8 @@ SwipeView {
|
|||||||
contentWidth: parent.width
|
contentWidth: parent.width
|
||||||
contentHeight: contentColumn.childrenRect.height
|
contentHeight: contentColumn.childrenRect.height
|
||||||
|
|
||||||
Component.onCompleted: shortcuts.flickTarget = this
|
Component.onCompleted:
|
||||||
|
if (becomeKeyboardFlickableTarget) shortcuts.flickTarget = this
|
||||||
|
|
||||||
HColumnLayout {
|
HColumnLayout {
|
||||||
id: contentColumn
|
id: contentColumn
|
||||||
|
@ -5,6 +5,8 @@ import "../utils.js" as Utils
|
|||||||
|
|
||||||
HPage {
|
HPage {
|
||||||
id: chatPage
|
id: chatPage
|
||||||
|
// The target will be our EventList, not the page itself
|
||||||
|
becomeKeyboardFlickableTarget: false
|
||||||
|
|
||||||
property string userId: ""
|
property string userId: ""
|
||||||
property string roomId: ""
|
property string roomId: ""
|
||||||
@ -19,6 +21,7 @@ HPage {
|
|||||||
modelSources[["Room", userId]] || [], "room_id", roomId
|
modelSources[["Room", userId]] || [], "room_id", roomId
|
||||||
) || "waiting"
|
) || "waiting"
|
||||||
|
|
||||||
|
|
||||||
onRoomInfoChanged: {
|
onRoomInfoChanged: {
|
||||||
if (roomInfo.left) {
|
if (roomInfo.left) {
|
||||||
// If left, the room will most likely be gone on client restart.
|
// If left, the room will most likely be gone on client restart.
|
||||||
@ -32,8 +35,10 @@ HPage {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
readonly property bool hasUnknownDevices: false
|
readonly property bool hasUnknownDevices: false
|
||||||
|
|
||||||
|
|
||||||
header: HLoader {
|
header: HLoader {
|
||||||
id: roomHeader
|
id: roomHeader
|
||||||
source: ready ? "RoomHeader.qml" : ""
|
source: ready ? "RoomHeader.qml" : ""
|
||||||
|
Loading…
x
Reference in New Issue
Block a user