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

Merge pull request #1095 from syldrathecat/subtle-paste-fixes

Browse source 
Subtle corrections to paste behaviors
This commit is contained in:
DeepBlueV7.X 2022-06-15 14:31:46 +00:00 committed by GitHub
commit 835fcf6325
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
resources/qml/MessageInput.qml
View file

@ -188,8 +188,7 @@ Rectangle {
Keys.onShortcutOverride: event.accepted = (popup.opened && (event.key === Qt.Key_Escape || event.key === Qt.Key_Tab || event.key === Qt.Key_Enter || event.key === Qt.Key_Space))
Keys.onPressed: {
if (event.matches(StandardKey.Paste)) {
room.input.paste(false);
event.accepted = true;
event.accepted = room.input.tryPasteAttachment(false);
} else if (event.key == Qt.Key_Space) {
// close popup if user enters space after colon
if (cursorPosition == completerTriggeredAt + 1)
@ -361,11 +360,6 @@ Rectangle {
}
Connections {
function onInsertText(text) {
messageInput.remove(messageInput.selectionStart, messageInput.selectionEnd);
messageInput.insert(messageInput.cursorPosition, text);
}
function onTextChanged(newText) {
messageInput.text = newText;
messageInput.cursorPosition = newText.length;
@ -401,7 +395,7 @@ Rectangle {
anchors.fill: parent
acceptedButtons: Qt.MiddleButton
cursorShape: Qt.IBeamCursor
onClicked: room.input.paste(true)
onPressed: (mouse) => mouse.accepted = room.input.tryPasteAttachment(true)
}
}

19
src/timeline/InputBar.cpp
View file

@ -101,8 +101,8 @@ InputVideoSurface::supportedPixelFormats(QAbstractVideoBuffer::HandleType type)
}
}
void
InputBar::paste(bool fromMouse)
bool
InputBar::tryPasteAttachment(bool fromMouse)
{
const QMimeData *md = nullptr;
@ -113,14 +113,16 @@ InputBar::paste(bool fromMouse)
}
if (md)
insertMimeData(md);
return insertMimeData(md);
return false;
}
void
bool
InputBar::insertMimeData(const QMimeData *md)
{
if (!md)
return;
return false;
nhlog::ui()->debug("Got mime formats: {}",
md->formats().join(QStringLiteral(", ")).toStdString());
@ -171,7 +173,7 @@ InputBar::insertMimeData(const QMimeData *md)
auto data = md->data(QStringLiteral("x-special/gnome-copied-files")).split('\n');
if (data.size() < 2) {
nhlog::ui()->warn("MIME format is malformed, cannot perform paste.");
return;
return false;
}
for (int i = 1; i < data.size(); ++i) {
@ -181,10 +183,13 @@ InputBar::insertMimeData(const QMimeData *md)
}
}
} else if (md->hasText()) {
emit insertText(md->text());
return false;
} else {
nhlog::ui()->debug("formats: {}", md->formats().join(QStringLiteral(", ")).toStdString());
return false;
}
return true;
}
void

5
src/timeline/InputBar.h
View file

@ -190,8 +190,8 @@ public slots:
[[nodiscard]] bool containsAtRoom() const { return containsAtRoom_; }
void send();
void paste(bool fromMouse);
void insertMimeData(const QMimeData *data);
bool tryPasteAttachment(bool fromMouse);
bool insertMimeData(const QMimeData *data);
void updateState(int selectionStart, int selectionEnd, int cursorPosition, const QString &text);
void openFileSelection();
[[nodiscard]] bool uploading() const { return uploading_; }
@ -212,7 +212,6 @@ private slots:
void removeRunUpload(MediaUpload *upload);
signals:
void insertText(QString text);
void textChanged(QString newText);
void uploadingChanged(bool value);
void containsAtRoomChanged();