summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2021-05-04 16:51:09 +0200
committerGitHub <noreply@github.com>2021-05-04 16:51:09 +0200
commit4472eb3e4f4c68c3f36382ed199a2d7b5f76ab9e (patch)
tree1e2e53c82da79109b90c9f1238f90e80a9f10819 /editor
parentc26cff7885b24218b987ed49932688c8c086b57c (diff)
parent87ffb213c8cc8dfce28dca1a3887b63a7c67d6ed (diff)
Merge pull request #48451 from EricEzaM/output-log-fixes
Fixed issues with Editor Log after recent changes
Diffstat (limited to 'editor')
-rw-r--r--editor/editor_log.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/editor/editor_log.cpp b/editor/editor_log.cpp
index 3957f981be..9f188b53c4 100644
--- a/editor/editor_log.cpp
+++ b/editor/editor_log.cpp
@@ -224,7 +224,7 @@ void EditorLog::_add_log_line(LogMessage &p_message, bool p_replace_previous) {
log->add_text(p_message.text);
// Need to use pop() to exit out of the RichTextLabels current "push" stack.
- // We only "push" in the above swicth when message type != STD, so only pop when that is the case.
+ // We only "push" in the above switch when message type != STD, so only pop when that is the case.
if (p_message.type != MSG_TYPE_STD) {
log->pop();
}
@@ -298,6 +298,7 @@ EditorLog::EditorLog() {
clear_button->set_flat(true);
clear_button->set_focus_mode(FOCUS_NONE);
clear_button->set_shortcut(ED_SHORTCUT("editor/clear_output", TTR("Clear Output"), KEY_MASK_CMD | KEY_MASK_SHIFT | KEY_K));
+ clear_button->set_shortcut_context(this);
clear_button->connect("pressed", callable_mp(this, &EditorLog::_clear_request));
hb_tools->add_child(clear_button);
@@ -306,6 +307,7 @@ EditorLog::EditorLog() {
copy_button->set_flat(true);
copy_button->set_focus_mode(FOCUS_NONE);
copy_button->set_shortcut(ED_SHORTCUT("editor/copy_output", TTR("Copy Selection"), KEY_MASK_CMD | KEY_C));
+ copy_button->set_shortcut_context(this);
copy_button->connect("pressed", callable_mp(this, &EditorLog::_copy_request));
hb_tools->add_child(copy_button);
@@ -331,6 +333,7 @@ EditorLog::EditorLog() {
show_search_button->set_toggle_mode(true);
show_search_button->set_pressed(true);
show_search_button->set_shortcut(ED_SHORTCUT("editor/open_search", TTR("Open the search box."), KEY_MASK_CMD | KEY_F));
+ show_search_button->set_shortcut_context(this);
show_search_button->connect("toggled", callable_mp(this, &EditorLog::_set_search_visible));
hb_tools2->add_child(show_search_button);