From bc4ba6cb78b3815dbc61f220c406974c1c518dc5 Mon Sep 17 00:00:00 2001
From: bruvzg <7645683+bruvzg@users.noreply.github.com>
Date: Tue, 23 Aug 2022 13:40:48 +0300
Subject: [macOS] Extend editor contents to the window titlebar for better
 space usage.

---
 scene/gui/menu_bar.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'scene/gui')

diff --git a/scene/gui/menu_bar.cpp b/scene/gui/menu_bar.cpp
index f450222130..9eba2feaf7 100644
--- a/scene/gui/menu_bar.cpp
+++ b/scene/gui/menu_bar.cpp
@@ -276,10 +276,7 @@ void MenuBar::_update_submenu(const String &p_menu_name, PopupMenu *p_child) {
 }
 
 bool MenuBar::is_native_menu() const {
-	if (!is_visible_in_tree()) {
-		return false;
-	}
-	if (Engine::get_singleton()->is_editor_hint() && get_tree()->get_edited_scene_root() && (get_tree()->get_edited_scene_root()->is_ancestor_of(this) || get_tree()->get_edited_scene_root() == this)) {
+	if (Engine::get_singleton()->is_editor_hint() && is_inside_tree() && get_tree()->get_edited_scene_root() && (get_tree()->get_edited_scene_root()->is_ancestor_of(this) || get_tree()->get_edited_scene_root() == this)) {
 		return false;
 	}
 
@@ -308,7 +305,7 @@ void MenuBar::_clear_menu() {
 void MenuBar::_update_menu() {
 	_clear_menu();
 
-	if (!is_inside_tree()) {
+	if (!is_visible_in_tree()) {
 		return;
 	}
 
-- 
cgit v1.2.3