summary refs log tree commit diff
diff options
context:
space:
mode:
authorDeepBlueV7.X <nicolas.werner@hotmail.de>2021-02-02 03:22:18 +0100
committerGitHub <noreply@github.com>2021-02-02 03:22:18 +0100
commit82e80d464dd98f0a2323de73cf048caccca824fe (patch)
tree5ec415b3d901bf71d447ad31f053b6d2c1402ac3
parentFix emojis with fe0f in the middle (diff)
parentAllow drag/drop of files on whole timeline (diff)
downloadnheko-82e80d464dd98f0a2323de73cf048caccca824fe.tar.xz
Merge pull request #444 from LorenDB/dragDropTimeline
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 {