next commit

1 files changed, 36 insertions, 8 deletions

diff --git a/ui/window.tscn b/ui/window.tscn
index 5a0ecc9..c049477 100644
--- a/ui/window.tscn
+++ b/ui/window.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=11 format=3 uid="uid://swtqlba1wi3o"]
+[gd_scene load_steps=15 format=3 uid="uid://swtqlba1wi3o"]
 
 [ext_resource type="PackedScene" uid="uid://knmmuhon34rh" path="res://ui/bmp_texture_rect.tscn" id="1_4qpm3"]
 [ext_resource type="Script" uid="uid://qdg2tjk8xmjt" path="res://ui/window.gd" id="1_hfgic"]
@@ -9,6 +9,10 @@
 [ext_resource type="Texture2D" uid="uid://dqq3mtjcrwqnp" path="res://client_data/data/texture/À¯ÀúÀÎÅÍÆäÀ̽º/basic_interface/sys_base_off.bmp" id="5_mnaxm"]
 [ext_resource type="Texture2D" uid="uid://clqwl83uoxeue" path="res://client_data/data/texture/À¯ÀúÀÎÅÍÆäÀ̽º/basic_interface/btnbar_mid1.bmp" id="6_mnaxm"]
 [ext_resource type="Texture2D" uid="uid://biapuuwa0wbea" path="res://client_data/data/texture/À¯ÀúÀÎÅÍÆäÀ̽º/basic_interface/btnbar_right1.bmp" id="7_hfgic"]
+[ext_resource type="PackedScene" uid="uid://cjcm2mai50thr" path="res://ui/bmp_texture_button.tscn" id="7_m42e5"]
+[ext_resource type="Texture2D" uid="uid://jwnjlxw3yx4c" path="res://client_data/data/texture/À¯ÀúÀÎÅÍÆäÀ̽º/basic_interface/sys_close_off.bmp" id="8_74c65"]
+[ext_resource type="Texture2D" uid="uid://bedetsimppv5a" path="res://client_data/data/texture/À¯ÀúÀÎÅÍÆäÀ̽º/basic_interface/sys_close_on.bmp" id="9_qkejn"]
+[ext_resource type="Texture2D" uid="uid://drtdusewjtkgv" path="res://client_data/data/texture/À¯ÀúÀÎÅÍÆäÀ̽º/basic_interface/btn_comparison_resize.bmp" id="13_74c65"]
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_fufdc"]
 bg_color = Color(1, 1, 1, 1)
@@ -47,24 +51,35 @@ texture = ExtResource("3_mngfx")
 layout_mode = 2
 texture = ExtResource("4_fufdc")
 
-[node name="TitleBarBackground2" type="MarginContainer" parent="VBoxContainer/TitleBar"]
+[node name="TitleBarElements" type="MarginContainer" parent="VBoxContainer/TitleBar"]
+unique_name_in_owner = true
+layout_mode = 2
+theme_override_constants/margin_left = 15
+theme_override_constants/margin_top = 2
+theme_override_constants/margin_right = 4
+theme_override_constants/margin_bottom = 1
+
+[node name="TitleBarButtons" type="MarginContainer" parent="VBoxContainer/TitleBar"]
 layout_mode = 2
 theme_override_constants/margin_left = 2
+theme_override_constants/margin_right = 2
 
-[node name="BMPTextureRect" parent="VBoxContainer/TitleBar/TitleBarBackground2" instance=ExtResource("1_4qpm3")]
+[node name="BMPTextureRect" parent="VBoxContainer/TitleBar/TitleBarButtons" instance=ExtResource("1_4qpm3")]
 layout_mode = 2
 size_flags_horizontal = 0
 texture = ExtResource("5_mnaxm")
 stretch_mode = 3
 
-[node name="TitleBarElements" type="MarginContainer" parent="VBoxContainer/TitleBar"]
+[node name="CloseButton" parent="VBoxContainer/TitleBar/TitleBarButtons" instance=ExtResource("7_m42e5")]
+unique_name_in_owner = true
 layout_mode = 2
-theme_override_constants/margin_left = 15
-theme_override_constants/margin_top = 2
-theme_override_constants/margin_right = 4
-theme_override_constants/margin_bottom = 1
+size_flags_horizontal = 8
+texture_normal = ExtResource("8_74c65")
+texture_hover = ExtResource("9_qkejn")
+stretch_mode = 5
 
 [node name="Body" type="PanelContainer" parent="VBoxContainer"]
+unique_name_in_owner = true
 custom_minimum_size = Vector2(0, 25)
 layout_mode = 2
 size_flags_vertical = 3
@@ -91,10 +106,23 @@ layout_mode = 2
 texture = ExtResource("7_hfgic")
 
 [node name="ButtonBarElements" type="MarginContainer" parent="VBoxContainer/ButtonBar"]
+unique_name_in_owner = true
 layout_mode = 2
 theme_override_constants/margin_left = 4
 theme_override_constants/margin_top = 4
 theme_override_constants/margin_right = 4
 theme_override_constants/margin_bottom = 4
 
+[node name="ResizeHandle" parent="VBoxContainer/ButtonBar" instance=ExtResource("1_4qpm3")]
+unique_name_in_owner = true
+self_modulate = Color(1, 1, 1, 0.392157)
+layout_mode = 2
+size_flags_horizontal = 8
+size_flags_vertical = 8
+mouse_default_cursor_shape = 2
+texture = ExtResource("13_74c65")
+stretch_mode = 5
+
 [connection signal="gui_input" from="VBoxContainer/TitleBar" to="." method="_on_title_bar_gui_input"]
+[connection signal="pressed" from="VBoxContainer/TitleBar/TitleBarButtons/CloseButton" to="." method="_on_close_button_pressed"]
+[connection signal="gui_input" from="VBoxContainer/ButtonBar/ResizeHandle" to="." method="_on_resize_handle_gui_input"]