Skip to content

Commit

Permalink
Fixes for macOS build
Browse files Browse the repository at this point in the history
  • Loading branch information
RodZill4 committed Jul 8, 2023
1 parent 63ffc20 commit 064d794
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 12 deletions.
3 changes: 2 additions & 1 deletion material_maker/globals_menu_manager.gd
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,8 @@ class MenuDisplayServer:
menu_name = m

func clear():
pass
while DisplayServer.global_menu_get_item_count(menu_name) > 0:
DisplayServer.global_menu_remove_item(menu_name, 0)

func connect_id_pressed(callable : Callable):
mm_globals.menu_manager.menu_callables[get_instance_id()] = callable
Expand Down
1 change: 1 addition & 0 deletions material_maker/main_window.gd
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ func _enter_tree() -> void:

func _ready() -> void:
get_window().borderless = false
get_window().move_to_foreground()
#get_window().gui_embed_subwindows = false

get_window().close_requested.connect(self.on_close_requested)
Expand Down
12 changes: 1 addition & 11 deletions splash_screen/splash_screen.gd
Original file line number Diff line number Diff line change
Expand Up @@ -82,17 +82,7 @@ func do_start_ui(scene : PackedScene):
add_child(dialog)
await dialog.ask()

self.hide()

var root = get_tree().root
assert(root == get_parent())
# Remove the current scene
root.remove_child(self)
call_deferred("free")
# Add the next scene
var instance = scene.instantiate()
root.add_child(instance)
window.borderless = false
get_tree().change_scene_to_packed(scene)

var wait : float = 0.0
func _process(delta) -> void:
Expand Down

0 comments on commit 064d794

Please sign in to comment.