summary refs log tree commit diff
diff options
context:
space:
mode:
authorLoren Burkholder <computersemiexpert@outlook.com>2021-02-01 19:38:52 -0500
committerLoren Burkholder <computersemiexpert@outlook.com>2021-02-01 20:44:47 -0500
commit1c3e113d4e9988243a810262ceeef2ad3a3e0fd3 (patch)
tree2788deb8d6df6ac5d2b1fa96a56d13d17a144a28
parentMerge pull request #431 from Jedi18/avatar_username_feature (diff)
downloadnheko-1c3e113d4e9988243a810262ceeef2ad3a3e0fd3.tar.xz
Allow drag/drop of files on whole timeline
-rw-r--r--resources/qml/MessageInput.qml6
-rw-r--r--resources/qml/TimelineView.qml5
2 files changed, 4 insertions, 7 deletions
diff --git a/resources/qml/MessageInput.qml b/resources/qml/MessageInput.qml

index cb7d383f..4c73f28b 100644 --- a/resources/qml/MessageInput.qml +++ b/resources/qml/MessageInput.qml
@@ -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 { diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml
index a2b56b9a..2c8fb4fa 100644 --- a/resources/qml/TimelineView.qml +++ b/resources/qml/TimelineView.qml
@@ -276,8 +276,11 @@ Page { MessageInput { } + NhekoDropArea { + anchors.fill: parent + roomid: TimelineManager.timeline ? TimelineManager.timeline.roomId() : "" + } } - } systemInactive: SystemPalette {