godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10902 from toger5/rtl_copy_and_selection_color 

fixed copy on osx + help selection color
This commit is contained in:
Rémi Verschelde 2017-09-04 23:11:12 +02:00 committed by GitHub
parent 7f262e484a 07d5911c40
commit c9593a285b
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
editor/editor_help.cpp
View File

@ -1711,6 +1711,11 @@ void EditorHelp::_notification(int p_what) {
_update_doc();
} break;
case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: {
class_desc->add_color_override("selection_color", EDITOR_DEF("text_editor/highlighting/selection_color", Color(0.2, 0.2, 1)));
} break;
default: break;
}
}
@ -1785,6 +1790,7 @@ EditorHelp::EditorHelp() {
class_desc = memnew(RichTextLabel);
background_panel->add_child(class_desc);
class_desc->set_area_as_parent_rect();
class_desc->add_color_override("selection_color", EDITOR_DEF("text_editor/highlighting/selection_color", Color(0.2, 0.2, 1)));
class_desc->connect("meta_clicked", this, "_class_desc_select");
class_desc->connect("gui_input", this, "_class_desc_input");
}
@ -1872,6 +1878,15 @@ void EditorHelpBit::_bind_methods() {
}
void EditorHelpBit::_notification(int p_what) {
switch (p_what) {
case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: {
rich_text->add_color_override("selection_color", EDITOR_DEF("text_editor/highlighting/selection_color", Color(0.2, 0.2, 1)));
} break;
default: break;
}
}
void EditorHelpBit::set_text(const String &p_text) {
@ -1886,5 +1901,6 @@ EditorHelpBit::EditorHelpBit() {
add_child(rich_text);
rich_text->set_area_as_parent_rect();
rich_text->connect("meta_clicked", this, "_meta_clicked");
rich_text->add_color_override("selection_color", EDITOR_DEF("text_editor/highlighting/selection_color", Color(0.2, 0.2, 1)));
set_custom_minimum_size(Size2(0, 70 * EDSCALE));
}

2
scene/gui/rich_text_label.cpp
View File

@ -799,7 +799,7 @@ void RichTextLabel::_gui_input(Ref<InputEvent> p_event) {
Ref<InputEventKey> k = p_event;
if (k.is_valid()) {
if (k->is_pressed() && !k->get_alt() && !k->get_shift() && !k->get_metakey()) {
if (k->is_pressed() && !k->get_alt() && !k->get_shift()) {
bool handled = true;
switch (k->get_scancode()) {
case KEY_PAGEUP: {