summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2020-09-24 15:18:59 +0200
committerGitHub <noreply@github.com>2020-09-24 15:18:59 +0200
commit915ac7360a70904a4ee4294fd8b53ce2c757ee95 (patch)
treeb57cc019e03c920a2b6ca007f88bc227f748eecb /editor
parent3e4627ab6f450ae08bfa9a3bd792990d548169b1 (diff)
parentfb6eb21afc0a98b2b1439268abb0facd53222a43 (diff)
Merge pull request #42066 from dalexeev/output_copy
Improvement for the Copy button in the Output Log
Diffstat (limited to 'editor')
-rw-r--r--editor/editor_log.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/editor/editor_log.cpp b/editor/editor_log.cpp
index 9595eb8a72..6fbafc7ff3 100644
--- a/editor/editor_log.cpp
+++ b/editor/editor_log.cpp
@@ -79,7 +79,15 @@ void EditorLog::_clear_request() {
}
void EditorLog::_copy_request() {
- log->selection_copy();
+ String text = log->get_selected_text();
+
+ if (text == "") {
+ text = log->get_text();
+ }
+
+ if (text != "") {
+ DisplayServer::get_singleton()->clipboard_set(text);
+ }
}
void EditorLog::clear() {