Pārlūkot izejas kodu

Merge pull request #10902 from toger5/rtl_copy_and_selection_color

fixed copy on osx + help selection color
Rémi Verschelde 8 gadi atpakaļ
vecāks
revīzija
c9593a285b
2 mainītis faili ar 17 papildinājumiem un 1 dzēšanām
  1. 16 0
      editor/editor_help.cpp
  2. 1 1
      scene/gui/rich_text_label.cpp

+ 16 - 0
editor/editor_help.cpp

@@ -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));
 }

+ 1 - 1
scene/gui/rich_text_label.cpp

@@ -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: {