feat: add support for multiple os windows

refers to: #23

Signed-off-by: k2kra <[email protected]>

Author: Ark2000

addons/panku_console/components/input_field/input_area.gd

@@ -32,8 +32,8 @@ func _ready():
 	#get focus automatically.
 	visibility_changed.connect(
 		func():
-			if visible:
-				input.grab_focus()
+			if is_visible_in_tree():
+				input.call_deferred("grab_focus")
 	)
 
 	menubtn.mouse_entered.connect(

addons/panku_console/components/lynx_window2/lynx_window_2.gd

@@ -11,7 +11,8 @@ signal window_closed
 @export var _resize_btn:Button
 @export var _shadow_focus:Panel
 @export var _shadow:NinePatchRect
-@export var _content:Panel
+@export var _container:Panel
+@export var _pop_btn:Button
 
 @export var no_resize := false
 @export var no_resize_x := false
@@ -31,22 +32,30 @@ var _drag_start_position:Vector2
 var _drag_start_position_global:Vector2
 var _is_resizing := false
 var _resize_start_position:Vector2
+var _os_window:Window
+var _content:Control
 
 func centered():
 	var window_rect = get_rect()
 	var screen_rect = get_viewport_rect()
 	position = (screen_rect.size - window_rect.size) / 2
 
 func get_content():
-	if _content.get_child_count() > 0:
-		return _content.get_child(0)
-	return null
+	return _content
 
 func set_content(node:Control):
-	assert(_content.get_child_count() == 0)
-	assert(node.get_parent() == null)
-	_content.add_child(node)
-	
+	_content = node
+	if _os_window and _os_window.visible:
+		if _os_window.get_child_count() > 0:
+			push_error("Error: error in set_content")
+			return
+		_os_window.add_child(node)
+		return
+	if _container.get_child_count() > 0:
+		push_error("Error: error in set_content.")
+		return
+	_container.add_child(node)
+
 func highlight(v:bool):
 	_shadow_focus.visible = v
 
@@ -93,9 +102,74 @@ func _ready():
 			if is_visible_in_tree() and flicker:
 				$Border.hey_i_am_here()
 	)
-	
+
 	if flicker:
 		$Border.hey_i_am_here()
+		
+	_pop_btn.pressed.connect(switch_to_os_window)
+	
+	if _container.get_child_count() > 0:
+		_content = _container.get_child(0)
+		
+	if get_parent().has_method("get_enable_os_popup_btns"):
+		_pop_btn.visible = get_parent().get_enable_os_popup_btns()
+
+func init_os_window():
+	_os_window = Window.new()
+	var color_rect = ColorRect.new()
+	color_rect.set_anchors_and_offsets_preset(Control.PRESET_FULL_RECT)
+	_os_window.add_child(color_rect)
+	get_tree().root.add_child(_os_window)
+	#destructor
+	tree_exiting.connect(
+		func():
+			_os_window.queue_free()
+	)
+	#switch back to embed window when os window close requested
+	_os_window.close_requested.connect(
+		func():
+			_os_window.remove_child(_content)
+			_os_window.hide()
+			set_content(_content)
+			show()
+	)
+	if get_parent().has_method("get_os_window_bg_color"):
+		color_rect.color = get_parent().get_os_window_bg_color()
+
+func switch_to_os_window():
+	if _content == null:
+		push_error("Error: No content. ")
+		return
+	if _os_window == null:
+		init_os_window()
+	_container.remove_child(_content)
+	_os_window.add_child(_content)
+	_os_window.size = size
+	_os_window.title = _title_btn.text
+	_os_window.position = Vector2(DisplayServer.window_get_position(0)) + position
+	_content.set_anchors_and_offsets_preset(Control.PRESET_FULL_RECT)
+	_os_window.show()
+	hide()
+
+func show_window():
+	if _os_window and _os_window.visible:
+		return 
+	show()
+
+func hide_window():
+	if _os_window and _os_window.visible:
+		_os_window.close_requested.emit()
+	hide()
+
+func set_window_visibility(b:bool):
+	if b: show_window()
+	else: hide_window()
+
+func set_window_title_text(text:String):
+	if _os_window and _os_window.visible:
+		_os_window.title = text
+	else:
+		_title_btn.text = text
 
 func _input(e):
 	#release focus when you click outside of the window

addons/panku_console/components/lynx_window2/lynx_window_2.tscn

@@ -1,9 +1,10 @@
-[gd_scene load_steps=25 format=3 uid="uid://s88loppa6gja"]
+[gd_scene load_steps=26 format=3 uid="uid://s88loppa6gja"]
 
 [ext_resource type="Material" uid="uid://dyipeqsa8lcpc" path="res://addons/panku_console/components/lynx_window2/lynx_window_shader_material.tres" id="1_tvp6i"]
 [ext_resource type="Script" path="res://addons/panku_console/components/lynx_window2/lynx_window_2.gd" id="2_1ul5o"]
 [ext_resource type="FontVariation" uid="uid://d2b8bo6ytpt2i" path="res://addons/panku_console/res/font/default_bold.tres" id="3_oes5e"]
 [ext_resource type="Texture2D" uid="uid://dosm26riekruh" path="res://addons/panku_console/res/icons2/menu.svg" id="4_4dlyn"]
+[ext_resource type="Texture2D" uid="uid://gav3m4qtvgje" path="res://addons/panku_console/res/icons2/pop-out-svgrepo-com.svg" id="4_im81u"]
 [ext_resource type="Texture2D" uid="uid://8g5afcuanbl6" path="res://addons/panku_console/res/icons2/close.svg" id="5_l4qpm"]
 [ext_resource type="Texture2D" uid="uid://dvr12fl5prm78" path="res://addons/panku_console/res/effect/square_shadow.png" id="6_mfp1h"]
 [ext_resource type="Texture2D" uid="uid://ciu5jiw4xmkq0" path="res://addons/panku_console/res/icons2/resize-svgrepo-com.svg" id="7_duwqn"]
@@ -105,7 +106,7 @@ border_width_right = 4
 border_width_bottom = 4
 border_color = Color(1, 0, 0, 1)
 
-[node name="LynxWindow2" type="ColorRect" node_paths=PackedStringArray("_window_title_container", "_title_btn", "_close_btn", "_options_btn", "_resize_btn", "_shadow_focus", "_shadow", "_content")]
+[node name="LynxWindow2" type="ColorRect" node_paths=PackedStringArray("_window_title_container", "_title_btn", "_close_btn", "_options_btn", "_resize_btn", "_shadow_focus", "_shadow", "_container", "_pop_btn")]
 material = ExtResource("1_tvp6i")
 offset_right = 413.0
 offset_bottom = 305.0
@@ -117,7 +118,8 @@ _options_btn = NodePath("VBoxContainer/Up/Button3")
 _resize_btn = NodePath("Button")
 _shadow_focus = NodePath("Shadow2")
 _shadow = NodePath("Shadow")
-_content = NodePath("VBoxContainer/Down")
+_container = NodePath("VBoxContainer/Down")
+_pop_btn = NodePath("VBoxContainer/Up/Button4")
 
 [node name="VBoxContainer" type="VBoxContainer" parent="."]
 layout_mode = 1
@@ -145,6 +147,16 @@ text = "Window Title"
 alignment = 0
 text_overrun_behavior = 1
 
+[node name="Button4" type="Button" parent="VBoxContainer/Up"]
+layout_mode = 2
+theme_override_styles/normal = SubResource("StyleBoxFlat_l6qrt")
+theme_override_styles/hover = SubResource("StyleBoxFlat_qf6ov")
+theme_override_styles/pressed = SubResource("StyleBoxFlat_8fhjd")
+theme_override_styles/focus = SubResource("StyleBoxEmpty_sskw3")
+icon = ExtResource("4_im81u")
+alignment = 0
+icon_alignment = 1
+
 [node name="Button3" type="Button" parent="VBoxContainer/Up"]
 layout_mode = 2
 theme_override_styles/normal = SubResource("StyleBoxFlat_l6qrt")

addons/panku_console/components/lynx_window2/lynx_windows_manager_2.gd

@@ -1,6 +1,12 @@
 #A simple control node managing its child windows
 extends Control
 
+var os_popup_btn_enabled:bool
+var os_window_bg_color:Color
+
+func _ready():
+	load_data()
+
 func _input(e):
 	if e is InputEventMouseButton and e.pressed:
 		var flag = true
@@ -18,3 +24,44 @@ func _input(e):
 		if flag and get_child_count() > 0:
 			var forefront = get_child(get_child_count() - 1)
 			if forefront.has_method("highlight"): forefront.highlight(false)
+
+func enable_os_popup_btns(b:bool):
+	#note that this may affect your project
+	get_viewport().gui_embed_subwindows = !b
+	os_popup_btn_enabled = b
+	for w in get_children():
+		#maybe there's a better way to get node type
+		if !w.has_method("switch_to_os_window"):
+			continue 
+		w._pop_btn.visible = b
+
+func get_enable_os_popup_btns() -> bool:
+	return os_popup_btn_enabled
+
+func set_os_window_bg_color(c:Color):
+	os_window_bg_color = c
+	for w in get_children():
+		#maybe there's a better way to get node type
+		if !w.has_method("switch_to_os_window"):
+			continue 
+		if w._os_window != null:
+			w._os_window.get_child(0).color = c
+
+func get_os_window_bg_color() -> Color:
+	return os_window_bg_color
+
+func save_data():
+	var cfg = Console.Config.get_config()
+	cfg[Console.Utils.CFG_ENABLE_OS_WINDOW] = os_popup_btn_enabled
+	cfg[Console.Utils.CFG_OS_WINDOW_BGCOLOR] = os_window_bg_color
+	Console.Config.set_config(cfg)
+
+func load_data():
+	var cfg = Console.Config.get_config()
+	enable_os_popup_btns(cfg.get(Console.Utils.CFG_ENABLE_OS_WINDOW, false))
+	set_os_window_bg_color(cfg.get(Console.Utils.CFG_OS_WINDOW_BGCOLOR, Color("#2b2e32")))
+
+func _notification(what):
+	#quit event
+	if what == NOTIFICATION_WM_CLOSE_REQUEST:
+		save_data()

addons/panku_console/components/options.gd

@@ -64,6 +64,18 @@ extends Node
 	get:
 		return Console.output_overlay.get("theme_override_colors/font_shadow_color") != null
 
+@export_group("Experimental")
+@export var enable_os_window := false:
+	set(v):
+		Console.w_manager.enable_os_popup_btns(v)
+	get:
+		return Console.w_manager.os_popup_btn_enabled
+@export var os_window_bg_color:Color:
+	set(v):
+		Console.w_manager.set_os_window_bg_color(v)
+	get:
+		return Console.w_manager.os_window_bg_color
+
 @export_group("About")
 @export var export_button_show_intro := "Show Intro"
 @export var export_button_check_update := "Check Update"

addons/panku_console/components/utils.gd

@@ -57,6 +57,8 @@ const CFG_MONITOR_ARRAY = "monitor_array"
 const CFG_FREPL_POSITION = "frepl_position"
 const CFG_FREPL_SIZE = "frepl_size"
 const CFG_EXP_HISTORY = "exp_history"
+const CFG_ENABLE_OS_WINDOW = "enable_os_window"
+const CFG_OS_WINDOW_BGCOLOR = "os_window_bgcolor"
 
 static func execute_exp(exp_str:String, expression:Expression, base_instance:Object, env:Dictionary):
 	var failed := false

addons/panku_console/console.gd

@@ -45,7 +45,7 @@ var mini_repl_mode = false:
 		mini_repl_mode = v
 		if is_repl_window_opened:
 			_mini_repl.visible = v
-			_full_repl.visible = !v
+			_full_repl.set_window_visibility(!v)
 
 var is_repl_window_opened := false:
 	set(v):
@@ -55,11 +55,11 @@ var is_repl_window_opened := false:
 		if mini_repl_mode:
 			_mini_repl.visible = v
 		else:
-			_full_repl.visible = v
+			_full_repl.set_window_visibility(v)
 		if pause_when_active:
-			_full_repl._title_btn.text = "</> Panku REPL (Paused)"
+			_full_repl.set_window_title_text("</> Panku REPL (Paused)")
 		else:
-			_full_repl._title_btn.text = "</> Panku REPL"
+			_full_repl.set_window_title_text("</> Panku REPL")
 		get_tree().paused = pause_when_active and v
 		repl_visible_changed.emit(v)
 

addons/panku_console/console.tscn

@@ -100,7 +100,7 @@ queue_free_on_close = false
 [node name="Button" parent="LynxWindowsManager2/ExpKeyMapper/VBoxContainer/Up" index="0"]
 text = "Expression Key Mapper"
 
-[node name="Button3" parent="LynxWindowsManager2/ExpKeyMapper/VBoxContainer/Up" index="1"]
+[node name="Button3" parent="LynxWindowsManager2/ExpKeyMapper/VBoxContainer/Up" index="2"]
 visible = false
 
 [node name="ExpKeyMapper" parent="LynxWindowsManager2/ExpKeyMapper/VBoxContainer/Down" index="0" instance=ExtResource("9_ua71q")]
@@ -125,7 +125,7 @@ queue_free_on_close = false
 [node name="Button" parent="LynxWindowsManager2/ExpHistory/VBoxContainer/Up" index="0"]
 text = "Expression History"
 
-[node name="Button3" parent="LynxWindowsManager2/ExpHistory/VBoxContainer/Up" index="1"]
+[node name="Button3" parent="LynxWindowsManager2/ExpHistory/VBoxContainer/Up" index="2"]
 visible = false
 
 [node name="ExpHistory" parent="LynxWindowsManager2/ExpHistory/VBoxContainer/Down" index="0" instance=ExtResource("10_03tvm")]

addons/panku_console/plugin.cfg

@@ -3,5 +3,5 @@
 name="PankuConsole"
 description="All-in-One Godot Engine runtime debugging tool."
 author="Feo (k2kra) Wu"
-version="1.3.73"
+version="1.3.75"
 script="plugin.gd"

addons/panku_console/res/icons2/pop-out-svgrepo-com.svg

@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://gav3m4qtvgje"
+path="res://.godot/imported/pop-out-svgrepo-com.svg-54bb73635d5759933a88bbec8ed6aca8.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://addons/panku_console/res/icons2/pop-out-svgrepo-com.svg"
+dest_files=["res://.godot/imported/pop-out-svgrepo-com.svg-54bb73635d5759933a88bbec8ed6aca8.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
+svg/scale=1.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false