asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #42066 from dalexeev/output_copy

Browse source 
Improvement for the Copy button in the Output Log
This commit is contained in:
Rémi Verschelde 2020-09-24 15:18:59 +02:00 committed by GitHub
commit 915ac7360a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
editor/editor_log.cpp
View file

@ -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() {

10
scene/gui/rich_text_label.cpp
View file

@ -2529,9 +2529,9 @@ bool RichTextLabel::search(const String &p_string, bool p_from_selection, bool p
return false;
}
void RichTextLabel::selection_copy() {
String RichTextLabel::get_selected_text() {
if (!selection.active || !selection.enabled) {
return;
return "";
}
String text;
@ -2561,6 +2561,12 @@ void RichTextLabel::selection_copy() {
item = _get_next_item(item, true);
}
return text;
}
void RichTextLabel::selection_copy() {
String text = get_selected_text();
if (text != "") {
DisplayServer::get_singleton()->clipboard_set(text);
}

1
scene/gui/rich_text_label.h
View file

@ -475,6 +475,7 @@ public:
void set_selection_enabled(bool p_enabled);
bool is_selection_enabled() const;
String get_selected_text();
void selection_copy();
Error parse_bbcode(const String &p_bbcode);