Merge pull request #86290 from bruvzg/mac_tab_menu

YuriSizov · YuriSizov · commit 1f5d4a62e9e9 · 2023-12-19T13:02:31.000+01:00
[macOS] Fix updating editor tab titles in the dock menu.
diff --git a/editor/gui/editor_scene_tabs.cpp b/editor/gui/editor_scene_tabs.cpp
@@ -191,12 +191,14 @@ void EditorSceneTabs::_disable_menu_option_if(int p_option, bool p_condition) {
 }
 
 void EditorSceneTabs::update_scene_tabs() {
+	static bool menu_initialized = false;
 	tab_preview_panel->hide();
 
-	if (scene_tabs->get_tab_count() == EditorNode::get_editor_data().get_edited_scene_count()) {
+	if (menu_initialized && scene_tabs->get_tab_count() == EditorNode::get_editor_data().get_edited_scene_count()) {
 		_update_tab_titles();
 		return;
 	}
+	menu_initialized = true;
 
 	if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_GLOBAL_MENU)) {
 		DisplayServer::get_singleton()->global_menu_clear("_dock");

Original file line number	Diff line number	Diff line change
`@@ -191,12 +191,14 @@ void EditorSceneTabs::_disable_menu_option_if(int p_option, bool p_condition) {`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`void EditorSceneTabs::update_scene_tabs() {`
	`194`	`+ static bool menu_initialized = false;`
`194`	`195`	`tab_preview_panel->hide();`
`195`	`196`
`196`		`- if (scene_tabs->get_tab_count() == EditorNode::get_editor_data().get_edited_scene_count()) {`
	`197`	`+ if (menu_initialized && scene_tabs->get_tab_count() == EditorNode::get_editor_data().get_edited_scene_count()) {`
`197`	`198`	`_update_tab_titles();`
`198`	`199`	`return;`
`199`	`200`	`}`
	`201`	`+ menu_initialized = true;`
`200`	`202`
`201`	`203`	`if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_GLOBAL_MENU)) {`
`202`	`204`	`DisplayServer::get_singleton()->global_menu_clear("_dock");`