From 3098b483017809155a45de873a1ab019d01b1cd6 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 29 Nov 2020 23:15:37 +0100 Subject: [PATCH] Moved the main project tabs to the menubar. --- addons/draw_gd/src/Autoload/DrawGD.gd | 2 +- addons/draw_gd/src/Main.tscn | 5 ++ addons/draw_gd/src/UI/Tabs.tscn | 17 ++++ addons/draw_gd/src/UI/TopMenuContainer.gd | 2 +- addons/draw_gd/src/UI/TopMenuContainer.tscn | 86 ++++++++++++++------- addons/draw_gd/src/UI/UI.tscn | 37 +++------ 6 files changed, 91 insertions(+), 58 deletions(-) create mode 100644 addons/draw_gd/src/UI/Tabs.tscn diff --git a/addons/draw_gd/src/Autoload/DrawGD.gd b/addons/draw_gd/src/Autoload/DrawGD.gd index 0cac5ef..e237e81 100644 --- a/addons/draw_gd/src/Autoload/DrawGD.gd +++ b/addons/draw_gd/src/Autoload/DrawGD.gd @@ -79,7 +79,7 @@ var palettes := {} # Nodes var control : Node -var top_menu_container : Panel +var top_menu_container : Control var canvas : Canvas var tabs : Tabs var main_viewport : ViewportContainer diff --git a/addons/draw_gd/src/Main.tscn b/addons/draw_gd/src/Main.tscn index ff77724..6cad4fa 100644 --- a/addons/draw_gd/src/Main.tscn +++ b/addons/draw_gd/src/Main.tscn @@ -45,8 +45,13 @@ __meta__ = { } [node name="TopMenuContainer" parent="DrawGDControl/MenuAndUI" instance=ExtResource( 11 )] +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 1280.0 +margin_bottom = 42.0 [node name="UI" parent="DrawGDControl/MenuAndUI" instance=ExtResource( 6 )] +margin_top = 42.0 [node name="Dialogs" type="Control" parent="DrawGDControl"] mouse_filter = 2 diff --git a/addons/draw_gd/src/UI/Tabs.tscn b/addons/draw_gd/src/UI/Tabs.tscn new file mode 100644 index 0000000..fcc2d50 --- /dev/null +++ b/addons/draw_gd/src/UI/Tabs.tscn @@ -0,0 +1,17 @@ +[gd_scene load_steps=2 format=2] + +[ext_resource path="res://addons/draw_gd/src/UI/Tabs.gd" type="Script" id=1] + +[node name="Tabs" type="Tabs"] +margin_left = 7.0 +margin_top = 7.0 +margin_right = 895.0 +margin_bottom = 31.0 +tab_align = 0 +tab_close_display_policy = 1 +drag_to_rearrange_enabled = true +script = ExtResource( 1 ) + +[connection signal="reposition_active_tab_request" from="." to="." method="_on_Tabs_reposition_active_tab_request"] +[connection signal="tab_changed" from="." to="." method="_on_Tabs_tab_changed"] +[connection signal="tab_close" from="." to="." method="_on_Tabs_tab_close"] diff --git a/addons/draw_gd/src/UI/TopMenuContainer.gd b/addons/draw_gd/src/UI/TopMenuContainer.gd index b02df96..fb09d0c 100644 --- a/addons/draw_gd/src/UI/TopMenuContainer.gd +++ b/addons/draw_gd/src/UI/TopMenuContainer.gd @@ -1,5 +1,5 @@ tool -extends Panel +extends Control var Export = preload("res://addons/draw_gd/src/Autoload/Export.gd") var DrawingAlgos = preload("res://addons/draw_gd/src/Autoload/DrawingAlgos.gd") diff --git a/addons/draw_gd/src/UI/TopMenuContainer.tscn b/addons/draw_gd/src/UI/TopMenuContainer.tscn index f98582e..73eb3f1 100644 --- a/addons/draw_gd/src/UI/TopMenuContainer.tscn +++ b/addons/draw_gd/src/UI/TopMenuContainer.tscn @@ -1,78 +1,108 @@ -[gd_scene load_steps=2 format=2] +[gd_scene load_steps=3 format=2] +[ext_resource path="res://addons/draw_gd/src/UI/Tabs.tscn" type="PackedScene" id=1] [ext_resource path="res://addons/draw_gd/src/UI/TopMenuContainer.gd" type="Script" id=2] -[node name="TopMenuContainer" type="Panel"] -margin_right = 1280.0 -margin_bottom = 28.0 +[node name="PanelContainer" type="PanelContainer"] +anchor_right = 1.0 +anchor_bottom = 1.0 +size_flags_horizontal = 3 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="TopMenuContainer" type="HBoxContainer" parent="."] +margin_left = 7.0 +margin_top = 7.0 +margin_right = 1273.0 +margin_bottom = 713.0 rect_min_size = Vector2( 0, 28 ) +size_flags_horizontal = 3 +size_flags_vertical = 3 script = ExtResource( 2 ) __meta__ = { "_edit_use_anchors_": false } -[node name="MenuItems" type="HBoxContainer" parent="."] -margin_left = 2.0 -margin_top = 4.0 -margin_right = 1010.0 +[node name="MenuItems" type="HBoxContainer" parent="TopMenuContainer"] +margin_right = 177.0 +margin_bottom = 706.0 __meta__ = { "_edit_use_anchors_": false } -[node name="FileMenu" type="MenuButton" parent="MenuItems"] +[node name="FileMenu" type="MenuButton" parent="TopMenuContainer/MenuItems"] margin_right = 35.0 -margin_bottom = 20.0 +margin_bottom = 706.0 mouse_default_cursor_shape = 2 text = "File" switch_on_hover = true -[node name="EditMenu" type="MenuButton" parent="MenuItems"] +[node name="EditMenu" type="MenuButton" parent="TopMenuContainer/MenuItems"] margin_left = 39.0 margin_right = 75.0 -margin_bottom = 20.0 +margin_bottom = 706.0 mouse_default_cursor_shape = 2 text = "Edit" switch_on_hover = true -[node name="ViewMenu" type="MenuButton" parent="MenuItems"] +[node name="ViewMenu" type="MenuButton" parent="TopMenuContainer/MenuItems"] margin_left = 79.0 margin_right = 121.0 -margin_bottom = 20.0 +margin_bottom = 706.0 mouse_default_cursor_shape = 2 text = "View" switch_on_hover = true -[node name="ImageMenu" type="MenuButton" parent="MenuItems"] +[node name="ImageMenu" type="MenuButton" parent="TopMenuContainer/MenuItems"] margin_left = 125.0 margin_right = 177.0 -margin_bottom = 20.0 +margin_bottom = 706.0 mouse_default_cursor_shape = 2 text = "Image" switch_on_hover = true -[node name="TopLabels" type="HBoxContainer" parent="."] -anchor_left = 0.5 -anchor_right = 0.5 -anchor_bottom = 1.0 -margin_left = -65.5 -margin_right = 65.5 +[node name="Control" type="Control" parent="TopMenuContainer"] +margin_left = 181.0 +margin_right = 184.0 +margin_bottom = 706.0 +rect_min_size = Vector2( 3, 0 ) + +[node name="Tabs" parent="TopMenuContainer" instance=ExtResource( 1 )] +margin_left = 188.0 +margin_top = 0.0 +margin_right = 1127.0 +margin_bottom = 706.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 + +[node name="TopLabels" type="HBoxContainer" parent="TopMenuContainer"] +margin_left = 1131.0 +margin_right = 1259.0 +margin_bottom = 706.0 custom_constants/separation = 20 __meta__ = { "_edit_use_anchors_": false } -[node name="ZoomLevel" type="Label" parent="TopLabels"] -margin_top = 7.0 +[node name="ZoomLevel" type="Label" parent="TopMenuContainer/TopLabels"] +margin_top = 346.0 margin_right = 60.0 -margin_bottom = 21.0 +margin_bottom = 360.0 rect_min_size = Vector2( 60, 0 ) text = "781 %" align = 2 -[node name="CursorPosition" type="Label" parent="TopLabels"] +[node name="CursorPosition" type="Label" parent="TopMenuContainer/TopLabels"] margin_left = 80.0 -margin_top = 7.0 +margin_top = 346.0 margin_right = 128.0 -margin_bottom = 21.0 +margin_bottom = 360.0 text = "[64×64]" align = 2 + +[node name="Control2" type="Control" parent="TopMenuContainer"] +margin_left = 1263.0 +margin_right = 1266.0 +margin_bottom = 706.0 +rect_min_size = Vector2( 3, 0 ) diff --git a/addons/draw_gd/src/UI/UI.tscn b/addons/draw_gd/src/UI/UI.tscn index 321705b..a993ccd 100644 --- a/addons/draw_gd/src/UI/UI.tscn +++ b/addons/draw_gd/src/UI/UI.tscn @@ -1,9 +1,8 @@ -[gd_scene load_steps=23 format=2] +[gd_scene load_steps=22 format=2] [ext_resource path="res://addons/draw_gd/src/UI/TransparentChecker.tscn" type="PackedScene" id=1] [ext_resource path="res://addons/draw_gd/src/UI/ColorAndToolOptions.tscn" type="PackedScene" id=2] [ext_resource path="res://addons/draw_gd/src/UI/Canvas/Rulers/VerticalRuler.gd" type="Script" id=3] -[ext_resource path="res://addons/draw_gd/src/UI/Tabs.gd" type="Script" id=4] [ext_resource path="res://addons/draw_gd/assets/graphics/dark_themes/tools/bucket.png" type="Texture" id=5] [ext_resource path="res://addons/draw_gd/src/UI/Canvas/CanvasPreview.tscn" type="PackedScene" id=6] [ext_resource path="res://addons/draw_gd/src/UI/ToolButtons.gd" type="Script" id=7] @@ -207,24 +206,9 @@ size_flags_horizontal = 3 size_flags_vertical = 3 custom_constants/separation = 0 -[node name="TabsContainer" type="PanelContainer" parent="CanvasAndTimeline/ViewportAndRulers"] -margin_right = 902.0 -margin_bottom = 38.0 - -[node name="Tabs" type="Tabs" parent="CanvasAndTimeline/ViewportAndRulers/TabsContainer"] -margin_left = 7.0 -margin_top = 7.0 -margin_right = 895.0 -margin_bottom = 31.0 -tab_align = 0 -tab_close_display_policy = 1 -drag_to_rearrange_enabled = true -script = ExtResource( 4 ) - [node name="HorizontalRuler" type="Button" parent="CanvasAndTimeline/ViewportAndRulers"] -margin_top = 38.0 margin_right = 902.0 -margin_bottom = 58.0 +margin_bottom = 20.0 rect_min_size = Vector2( 0, 16 ) focus_mode = 0 mouse_default_cursor_shape = 14 @@ -233,7 +217,7 @@ enabled_focus_mode = 0 script = ExtResource( 14 ) [node name="HSplitContainer" type="HSplitContainer" parent="CanvasAndTimeline/ViewportAndRulers"] -margin_top = 58.0 +margin_top = 20.0 margin_right = 902.0 margin_bottom = 692.0 size_flags_vertical = 3 @@ -241,14 +225,14 @@ custom_constants/autohide = 0 [node name="ViewportandVerticalRuler" type="HBoxContainer" parent="CanvasAndTimeline/ViewportAndRulers/HSplitContainer"] margin_right = 890.0 -margin_bottom = 634.0 +margin_bottom = 672.0 size_flags_horizontal = 3 size_flags_vertical = 3 custom_constants/separation = 0 [node name="VerticalRuler" type="Button" parent="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler"] margin_right = 16.0 -margin_bottom = 634.0 +margin_bottom = 672.0 rect_min_size = Vector2( 16, 0 ) focus_mode = 0 mouse_default_cursor_shape = 15 @@ -261,7 +245,7 @@ script = ExtResource( 3 ) [node name="ViewportContainer" type="ViewportContainer" parent="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler"] margin_left = 16.0 margin_right = 890.0 -margin_bottom = 634.0 +margin_bottom = 672.0 focus_mode = 2 mouse_default_cursor_shape = 3 size_flags_horizontal = 3 @@ -270,7 +254,7 @@ stretch = true script = ExtResource( 21 ) [node name="Viewport" type="Viewport" parent="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer"] -size = Vector2( 874, 634 ) +size = Vector2( 874, 672 ) handle_input_locally = false usage = 0 render_target_update_mode = 3 @@ -296,13 +280,13 @@ script = ExtResource( 11 ) [node name="ViewportContainer2" type="ViewportContainer" parent="CanvasAndTimeline/ViewportAndRulers/HSplitContainer"] margin_left = 902.0 margin_right = 902.0 -margin_bottom = 634.0 +margin_bottom = 672.0 size_flags_vertical = 3 stretch = true script = ExtResource( 21 ) [node name="Viewport" type="Viewport" parent="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportContainer2"] -size = Vector2( 0, 634 ) +size = Vector2( 0, 672 ) handle_input_locally = false render_target_update_mode = 3 @@ -355,9 +339,6 @@ margin_right = 330.0 margin_bottom = 676.0 custom_styles/panel = SubResource( 1 ) -[connection signal="reposition_active_tab_request" from="CanvasAndTimeline/ViewportAndRulers/TabsContainer/Tabs" to="CanvasAndTimeline/ViewportAndRulers/TabsContainer/Tabs" method="_on_Tabs_reposition_active_tab_request"] -[connection signal="tab_changed" from="CanvasAndTimeline/ViewportAndRulers/TabsContainer/Tabs" to="CanvasAndTimeline/ViewportAndRulers/TabsContainer/Tabs" method="_on_Tabs_tab_changed"] -[connection signal="tab_close" from="CanvasAndTimeline/ViewportAndRulers/TabsContainer/Tabs" to="CanvasAndTimeline/ViewportAndRulers/TabsContainer/Tabs" method="_on_Tabs_tab_close"] [connection signal="mouse_entered" from="CanvasAndTimeline/ViewportAndRulers/HorizontalRuler" to="CanvasAndTimeline/ViewportAndRulers/HorizontalRuler" method="_on_HorizontalRuler_mouse_entered"] [connection signal="pressed" from="CanvasAndTimeline/ViewportAndRulers/HorizontalRuler" to="CanvasAndTimeline/ViewportAndRulers/HorizontalRuler" method="_on_HorizontalRuler_pressed"] [connection signal="pressed" from="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/VerticalRuler" to="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/VerticalRuler" method="_on_VerticalRuler_pressed"]