From 8a6acd1d868a6c30a2d40f699f0bcb688fed0558 Mon Sep 17 00:00:00 2001 From: SyldraTheCat Date: Mon, 13 Jun 2022 11:16:49 +0000 Subject: Subtle corrections to paste behaviors --- src/timeline/InputBar.cpp | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'src/timeline/InputBar.cpp') diff --git a/src/timeline/InputBar.cpp b/src/timeline/InputBar.cpp index 4a3605bb..0f6472b8 100644 --- a/src/timeline/InputBar.cpp +++ b/src/timeline/InputBar.cpp @@ -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 -- cgit 1.5.1