diff options
| -rw-r--r-- | main/SCsub | 4 | ||||
| -rw-r--r-- | scene/gui/rich_text_label.cpp | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/main/SCsub b/main/SCsub index 73cec1d250..e1efc7e6ed 100644 --- a/main/SCsub +++ b/main/SCsub @@ -9,8 +9,8 @@ env.main_sources = [] env.add_source_files(env.main_sources, "*.cpp") -# order matters here. higher index controller database files write on top of lower index database files -controller_databases = ["#main/gamecontrollerdb.txt", "#main/gamecontrollerdb_205.txt", "#main/gamecontrollerdb_204.txt", "#main/godotcontrollerdb.txt"] +# Order matters here. Higher index controller database files write on top of lower index database files. +controller_databases = ["#main/gamecontrollerdb_204.txt", "#main/gamecontrollerdb_205.txt", "#main/gamecontrollerdb.txt", "#main/godotcontrollerdb.txt"] env.Depends("#main/default_controller_mappings.gen.cpp", controller_databases) env.CommandNoCache("#main/default_controller_mappings.gen.cpp", controller_databases, run_in_subprocess(main_builders.make_default_controller_mappings)) diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp index 100c06955a..6c2928c65c 100644 --- a/scene/gui/rich_text_label.cpp +++ b/scene/gui/rich_text_label.cpp @@ -935,6 +935,14 @@ void RichTextLabel::_notification(int p_what) { switch (p_what) { + case NOTIFICATION_MOUSE_EXIT: { + if (meta_hovering) { + meta_hovering = NULL; + emit_signal("meta_hover_ended", current_meta); + current_meta = false; + update(); + } + } break; case NOTIFICATION_RESIZED: { main->first_invalid_line = 0; //invalidate ALL |