rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into 'privacy_screen' 

# Conflicts:
#   resources/qml/TimelineView.qml
This commit is contained in:
Nicolas Werner 2021-02-02 13:00:53 -05:00
parent 935abee62e 82e80d464d
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
onClicked: TimelineManager.timeline.input.paste(true)
}
NhekoDropArea {
anchors.fill: parent
roomid: TimelineManager.timeline ? TimelineManager.timeline.roomId() : ""
}
}
ScrollBar.vertical: ScrollBar {

4
resources/qml/TimelineView.qml
View File

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