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

Merge branch 'master' into 'privacy_screen'

Browse source 
# Conflicts:
#   resources/qml/TimelineView.qml
This commit is contained in:
Nicolas Werner 2021-02-02 13:00:53 -05:00
commit aeec1e12fc
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
resources/qml/MessageInput.qml
View file

@ -273,12 +273,6 @@ Rectangle {
cursorShape: Qt.IBeamCursor cursorShape: Qt.IBeamCursor
onClicked: TimelineManager.timeline.input.paste(true) onClicked: TimelineManager.timeline.input.paste(true)
} }
NhekoDropArea {
anchors.fill: parent
roomid: TimelineManager.timeline ? TimelineManager.timeline.roomId() : ""
}
} }
ScrollBar.vertical: ScrollBar { ScrollBar.vertical: ScrollBar {

4
resources/qml/TimelineView.qml
View file

@ -278,6 +278,10 @@ Page {
MessageInput { MessageInput {
} }
NhekoDropArea {
anchors.fill: parent
roomid: TimelineManager.timeline ? TimelineManager.timeline.roomId() : ""
}
} }
PrivacyScreen { PrivacyScreen {