Support single-window mode

Author: williamchange

addons/flexible_layout/flexible_layout.gd

@@ -542,11 +542,14 @@ class FlexWindow:
 	var overlay : Control
 
 	func _init(main_control : Control, first_panel : Control = null):
-		content_scale_factor = main_control.get_window().content_scale_factor
-		if OS.get_name() == "macOS":
-			unfocusable = true
+		if not main_control.get_window().gui_embed_subwindows:
+			content_scale_factor = main_control.get_window().content_scale_factor
+			if OS.get_name() == "macOS":
+				unfocusable = true
 		if first_panel:
-			position = Vector2i(first_panel.get_global_rect().position*content_scale_factor)+first_panel.get_window().position
+			position = Vector2i(first_panel.get_global_rect().position*content_scale_factor)
+			if not main_control.get_window().gui_embed_subwindows:
+				position += first_panel.get_window().position
 			size = first_panel.size*content_scale_factor
 		panel = Control.new()
 		add_child(panel)

addons/material_maker/engine/nodes/gen_sdf.gd

@@ -194,6 +194,4 @@ func edit(node, tab : String = "") -> void:
 		edit_window.set_sdf_scene(scene)
 		edit_window.connect("node_changed", Callable(node, "update_sdf_generator"))
 		edit_window.connect("editor_window_closed", Callable(node, "finalize_generator_update"))
-		edit_window.get_window().content_scale_factor = mm_globals.main_window.get_window().content_scale_factor
-		edit_window.get_window().min_size = Vector2(800, 400) * edit_window.get_window().content_scale_factor
 		edit_window.popup_centered()

addons/material_maker/engine/nodes/gen_shader.gd

@@ -817,7 +817,7 @@ func do_edit(node, edit_window_scene : PackedScene, tab : String = "") -> void:
 		mm_globals.main_window.add_dialog(edit_window)
 		edit_window.set_model_data(get_shader_model_for_edit())
 		edit_window.node_changed.connect(node.update_shader_generator)
-		edit_window.get_window().content_scale_factor = mm_globals.main_window.get_window().content_scale_factor
+		edit_window.get_window().content_scale_factor = mm_globals.ui_scale_factor()
 		edit_window.get_window().min_size = Vector2(950, 450) * edit_window.get_window().content_scale_factor
 		edit_window.hide()
 		edit_window.popup_centered()

addons/material_maker/sdf_builder/sdf_builder.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=80 format=3 uid="uid://bvsuo5y7vh1y2"]
+[gd_scene load_steps=89 format=3 uid="uid://bvsuo5y7vh1y2"]
 
 [ext_resource type="Script" uid="uid://d16yu8rdgx4hx" path="res://addons/material_maker/sdf_builder/sdf2d/shapes/circle.gd" id="1"]
 [ext_resource type="Script" uid="uid://c5mnqww2iagdf" path="res://addons/material_maker/sdf_builder/sdf_builder.gd" id="2"]

material_maker/globals.gd

@@ -58,8 +58,9 @@ const DEFAULT_CONFIG : Dictionary = {
 	ui_use_native_file_dialogs = true,
 	win_tablet_driver = 0,
 	dialog_dim_background = true,
-	node_minimize_button = true,
-	node_close_button = true,
+	node_minimize_button = false,
+	node_close_button = false,
+	ui_single_window_mode = false,
 }
 
 
@@ -180,8 +181,7 @@ func popup_menu(menu : PopupMenu, parent : Control):
 	var zoom_fac = 1.0
 	if parent is GraphNode:
 		zoom_fac *= mm_globals.main_window.get_current_graph_edit().zoom
-	
-	var content_scale_factor = mm_globals.main_window.get_window().content_scale_factor
+	var content_scale_factor : float = mm_globals.ui_scale_factor()
 	menu.popup(Rect2(parent.get_local_mouse_position()*content_scale_factor*zoom_fac + parent.get_screen_position(), Vector2(0, 0)))
 
 func set_tip_text(tip : String, timeout : float = 0.0, priority: int = 0):
@@ -228,3 +228,8 @@ func get_node_title_from_gen(generator : MMGenBase) -> String:
 				var gnode : GraphNode = graph.get_node(node_path)
 				return gnode.title.to_snake_case()
 	return "unnamed"
+
+func ui_scale_factor() -> float:
+	if get_tree().root.gui_embed_subwindows:
+		return 1.0
+	return get_tree().root.content_scale_factor

material_maker/main_window.gd

@@ -136,7 +136,6 @@ func _ready() -> void:
 	get_window().borderless = false
 	get_window().transparent = false
 	get_window().grab_focus()
-	get_window().gui_embed_subwindows = false
 
 	get_window().close_requested.connect(self.on_close_requested)
 
@@ -342,6 +341,9 @@ func on_config_changed() -> void:
 			if c.has_method("update"):
 				c.update()
 
+	if not get_window().gui_embed_subwindows:
+		get_window().gui_embed_subwindows = mm_globals.get_config("ui_single_window_mode")
+
 func get_panel(panel_name : String) -> Control:
 	return layout.get_panel(panel_name)
 
@@ -1052,7 +1054,7 @@ func edit_save_selection() -> void:
 
 func edit_preferences() -> void:
 	var dialog = load("res://material_maker/windows/preferences/preferences.tscn").instantiate()
-	dialog.content_scale_factor = mm_globals.main_window.get_window().content_scale_factor
+	dialog.content_scale_factor = mm_globals.ui_scale_factor()
 	dialog.edit_preferences(mm_globals.config)
 
 func edit_align_start() -> void:
@@ -1150,7 +1152,7 @@ func add_selection_to_library(index: int, should_ask_item_name: bool = true, upd
 		current_item_name = library.get_selected_item_name()
 	if should_ask_item_name:
 		var dialog = preload("res://material_maker/windows/line_dialog/line_dialog.tscn").instantiate()
-		dialog.content_scale_factor = mm_globals.main_window.get_window().content_scale_factor
+		dialog.content_scale_factor = mm_globals.ui_scale_factor()
 		dialog.min_size = Vector2(250, 90) * dialog.content_scale_factor
 		add_child(dialog)
 		var status = await dialog.enter_text("New library element", "Select a name for the new library element", current_item_name)
@@ -1177,7 +1179,7 @@ func create_menu_add_brush_to_library(menu : MMMenuManager.MenuBase) -> void:
 
 func add_brush_to_library(index) -> void:
 	var dialog = preload("res://material_maker/windows/line_dialog/line_dialog.tscn").instantiate()
-	dialog.content_scale_factor = mm_globals.main_window.get_window().content_scale_factor
+	dialog.content_scale_factor = mm_globals.ui_scale_factor()
 	dialog.min_size = Vector2(250, 90) * dialog.content_scale_factor
 	add_child(dialog)
 	var status = await dialog.enter_text("New library element", "Select a name for the new library element", brushes.get_selected_item_name())
@@ -1389,7 +1391,7 @@ func generate_graph_screenshot():
 	graph_edit.zoom = 1
 	await get_tree().process_frame
 	var graph_edit_rect = graph_edit.get_global_rect()
-	var scale_factor : float = get_window().content_scale_factor
+	var scale_factor : float = mm_globals.ui_scale_factor()
 	graph_edit_rect = Rect2(graph_edit_rect.position+Vector2(15, 80), graph_edit_rect.size-Vector2(25, 90))
 	graph_edit_rect = Rect2(scale_factor*graph_edit_rect.position, scale_factor*graph_edit_rect.size)
 	var graph_rect = null

material_maker/nodes/base.gd

@@ -458,7 +458,7 @@ func _on_menu_id_pressed(id : int) -> void:
 				status.append({ ok=false, message="The following outputs do not have a short and a long description: "+", ".join(bad) })
 			# Show warning dialog
 			var dialog = preload("res://material_maker/tools/share/share_node_dialog.tscn").instantiate()
-			dialog.content_scale_factor = mm_globals.main_window.get_window().content_scale_factor
+			dialog.content_scale_factor = mm_globals.ui_scale_factor()
 			dialog.min_size = Vector2(600, 400) * dialog.content_scale_factor
 			var result = await dialog.ask(status)
 			if result != "ok":

material_maker/nodes/comment/comment.gd

@@ -136,7 +136,7 @@ func _on_text_focus_exited():
 func _on_change_color_pressed():
 	var light_theme = "light" in mm_globals.main_window.theme.resource_path
 	accept_event()
-	var content_scale_factor = mm_globals.main_window.get_window().content_scale_factor
+	var content_scale_factor : float = mm_globals.ui_scale_factor()
 	$Popup.get_window().content_scale_factor = content_scale_factor
 	$Popup.get_window().size = $Popup.get_window().get_contents_minimum_size() * content_scale_factor
 	$Popup.position = get_screen_transform() * get_local_mouse_position()
@@ -181,7 +181,7 @@ func _on_ColorChooser_gui_input(event: InputEvent) -> void:
 	if event is InputEventMouseButton and event.pressed and event.button_index == MOUSE_BUTTON_LEFT:
 		accept_event()
 		$Popup.hide()
-		var content_scale_factor = mm_globals.main_window.get_window().content_scale_factor
+		var content_scale_factor : float = mm_globals.ui_scale_factor()
 		$PopupSelector.get_window().content_scale_factor = content_scale_factor
 		$PopupSelector.get_window().min_size = $PopupSelector.get_window().get_contents_minimum_size() * content_scale_factor
 		$PopupSelector.get_window().position = get_global_mouse_position() * content_scale_factor
@@ -232,16 +232,13 @@ func _on_raise_request():
 			get_parent().move_child(self, i)
 			break
 
-
 func _context_menu_about_to_popup(context_menu : PopupMenu) -> void:
 	context_menu.position = get_screen_transform() * get_local_mouse_position()
 
-
 func _on_title_edit_ready() -> void:
 	%TitleEdit.get_menu().about_to_popup.connect(
 			_context_menu_about_to_popup.bind(%TitleEdit.get_menu()))
 
-
 func _on_text_ready() -> void:
 	%Text.get_menu().about_to_popup.connect(
 			_context_menu_about_to_popup.bind(%Text.get_menu()))

material_maker/nodes/comment/comment.tscn

@@ -140,8 +140,8 @@ texture = ExtResource("3")
 [node name="PanelContainer" type="PanelContainer" parent="PopupSelector"]
 offset_left = 4.0
 offset_top = 4.0
-offset_right = 302.0
-offset_bottom = 545.0
+offset_right = 96.0
+offset_bottom = 96.0
 
 [node name="ColorPicker" type="ColorPicker" parent="PopupSelector/PanelContainer"]
 layout_mode = 2
@@ -157,10 +157,8 @@ edit_alpha = false
 [connection signal="resize_request" from="." to="." method="_on_resize_request"]
 [connection signal="gui_input" from="PanelContainer/MarginContainer/VBox/TitleBar/Title" to="." method="_on_Title_gui_input"]
 [connection signal="focus_exited" from="PanelContainer/MarginContainer/VBox/TitleBar/TitleEdit" to="." method="_on_title_edit_focus_exited"]
-[connection signal="ready" from="PanelContainer/MarginContainer/VBox/TitleBar/TitleEdit" to="." method="_on_title_edit_ready"]
 [connection signal="text_submitted" from="PanelContainer/MarginContainer/VBox/TitleBar/TitleEdit" to="." method="_on_title_edit_text_submitted"]
 [connection signal="pressed" from="PanelContainer/MarginContainer/VBox/TitleBar/ChangeColor" to="." method="_on_change_color_pressed"]
 [connection signal="pressed" from="PanelContainer/MarginContainer/VBox/TitleBar/Close" to="." method="_on_close_pressed"]
 [connection signal="focus_exited" from="PanelContainer/MarginContainer/VBox/Text" to="." method="_on_text_focus_exited"]
-[connection signal="ready" from="PanelContainer/MarginContainer/VBox/Text" to="." method="_on_text_ready"]
 [connection signal="gui_input" from="Popup/GridContainer/ColorChooser" to="." method="_on_ColorChooser_gui_input"]

material_maker/nodes/debug/debug_popup.gd

@@ -5,7 +5,7 @@ var src_code
 const GENFUNCTIONS : Array = [ "generate_shadertoy", "generate_godot_canvasitem", "generate_godot_spatial" ]
 
 func _on_ready() -> void:
-	content_scale_factor = mm_globals.main_window.get_window().content_scale_factor
+	content_scale_factor = mm_globals.ui_scale_factor()
 	min_size = Vector2(500 ,500) * content_scale_factor
 
 func show_code(s) -> void: