From edbffaa5792ee8be853e6a55ca6d0b59b570c2cc Mon Sep 17 00:00:00 2001 From: klingbolt Date: Thu, 24 Aug 2023 20:22:47 -0400 Subject: [PATCH 1/7] Shifted the burrito button to the right --- Spatial.tscn | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Spatial.tscn b/Spatial.tscn index 0267bb63..5ee74235 100644 --- a/Spatial.tscn +++ b/Spatial.tscn @@ -80,8 +80,6 @@ __meta__ = { [node name="TextureRect" type="TextureRect" parent="Control/GlobalMenuButton"] modulate = Color( 1, 1, 1, 0.439216 ) -margin_left = 1.591 -margin_top = 3.18198 margin_right = 26.591 margin_bottom = 28.182 texture = ExtResource( 3 ) @@ -91,8 +89,12 @@ __meta__ = { [node name="main_menu_toggle" type="Button" parent="Control/GlobalMenuButton"] modulate = Color( 1, 1, 1, 0 ) -margin_right = 27.0 -margin_bottom = 32.0 +anchor_left = 0.5 +anchor_right = 0.5 +margin_left = 51.152 +margin_top = 8.0 +margin_right = 78.152 +margin_bottom = 40.0 __meta__ = { "_edit_use_anchors_": false } From 31ae8723f3da3eee25dbd705e954b7d6c61f7a4c Mon Sep 17 00:00:00 2001 From: klingbolt Date: Thu, 24 Aug 2023 21:17:00 -0400 Subject: [PATCH 2/7] Change so that the button should work --- Spatial.tscn | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/Spatial.tscn b/Spatial.tscn index 5ee74235..129dcff9 100644 --- a/Spatial.tscn +++ b/Spatial.tscn @@ -71,17 +71,18 @@ scale = Vector2( 2, 2 ) [node name="Line2D" parent="Control/MiniMap" instance=ExtResource( 4 )] [node name="GlobalMenuButton" type="Control" parent="Control"] -margin_left = 287.348 -margin_right = 314.348 -margin_bottom = 32.0 +margin_left = 321.348 +margin_top = 4.0 +margin_right = 348.348 +margin_bottom = 36.0 __meta__ = { "_edit_use_anchors_": false } [node name="TextureRect" type="TextureRect" parent="Control/GlobalMenuButton"] modulate = Color( 1, 1, 1, 0.439216 ) -margin_right = 26.591 -margin_bottom = 28.182 +margin_right = 29.0 +margin_bottom = 30.0 texture = ExtResource( 3 ) __meta__ = { "_edit_use_anchors_": false @@ -89,12 +90,8 @@ __meta__ = { [node name="main_menu_toggle" type="Button" parent="Control/GlobalMenuButton"] modulate = Color( 1, 1, 1, 0 ) -anchor_left = 0.5 -anchor_right = 0.5 -margin_left = 51.152 -margin_top = 8.0 -margin_right = 78.152 -margin_bottom = 40.0 +margin_right = 29.0 +margin_bottom = 30.0 __meta__ = { "_edit_use_anchors_": false } @@ -630,8 +627,8 @@ __meta__ = { } [node name="GridContainer" type="GridContainer" parent="Control/Dialogs/SettingsDialog/ScrollContainer"] -margin_right = 384.002 -margin_bottom = 419.001 +margin_right = 384.0 +margin_bottom = 419.0 size_flags_horizontal = 3 size_flags_vertical = 3 columns = 2 From ad4798db7a6beb3a93771506285db0e713d393db Mon Sep 17 00:00:00 2001 From: klingbolt Date: Thu, 24 Aug 2023 21:32:13 -0400 Subject: [PATCH 3/7] Changed the pass through coordinates --- Spatial.gd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Spatial.gd b/Spatial.gd index fd3702c9..29914896 100644 --- a/Spatial.gd +++ b/Spatial.gd @@ -119,8 +119,8 @@ func exit_burrito(): func set_minimal_mouse_block(): - var top_corner := Vector2(287, 0) - var bottom_corner := Vector2(314, 32) + var top_corner := Vector2(321, 0) + var bottom_corner := Vector2(348, 32) if self.edit_panel_open: bottom_corner.y = 49 From 3479b6ae7cbf2afbd940439b71deb4c60e1b4d6a Mon Sep 17 00:00:00 2001 From: klingbolt Date: Fri, 25 Aug 2023 00:37:07 -0400 Subject: [PATCH 4/7] Changed numbers to be the properties the numbers were coming from --- Spatial.gd | 9 +++++---- Spatial.tscn | 11 ++++------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Spatial.gd b/Spatial.gd index 29914896..0c02c809 100644 --- a/Spatial.gd +++ b/Spatial.gd @@ -119,12 +119,13 @@ func exit_burrito(): func set_minimal_mouse_block(): - var top_corner := Vector2(321, 0) - var bottom_corner := Vector2(348, 32) + var menu_button = $Control/GlobalMenuButton + var top_corner = menu_button.get_position() + var bottom_corner = menu_button.get_position() + menu_button.get_size() if self.edit_panel_open: - bottom_corner.y = 49 - bottom_corner.x = 314+377 + var editor_panel = $Control/GlobalMenuButton/EditorQuckPanel + bottom_corner = menu_button.get_position() + editor_panel.get_position() + editor_panel.get_size() var clickthrough: PoolVector2Array = [ Vector2(top_corner.x ,top_corner.y), diff --git a/Spatial.tscn b/Spatial.tscn index 129dcff9..1af517a5 100644 --- a/Spatial.tscn +++ b/Spatial.tscn @@ -71,16 +71,16 @@ scale = Vector2( 2, 2 ) [node name="Line2D" parent="Control/MiniMap" instance=ExtResource( 4 )] [node name="GlobalMenuButton" type="Control" parent="Control"] -margin_left = 321.348 -margin_top = 4.0 -margin_right = 348.348 -margin_bottom = 36.0 +margin_left = 321.0 +margin_right = 348.0 +margin_bottom = 32.0 __meta__ = { "_edit_use_anchors_": false } [node name="TextureRect" type="TextureRect" parent="Control/GlobalMenuButton"] modulate = Color( 1, 1, 1, 0.439216 ) +margin_top = 4.0 margin_right = 29.0 margin_bottom = 30.0 texture = ExtResource( 3 ) @@ -99,9 +99,6 @@ __meta__ = { [node name="EditorQuckPanel" type="PanelContainer" parent="Control/GlobalMenuButton"] visible = false margin_left = 32.0 -margin_top = -2.0 -margin_right = 306.0 -margin_bottom = 52.0 __meta__ = { "_edit_use_anchors_": false } From 2a2ae5aa1255c903b8dc6e42976642cbcfd4be0a Mon Sep 17 00:00:00 2001 From: klingbolt Date: Mon, 28 Aug 2023 20:50:53 -0400 Subject: [PATCH 5/7] Changed some numbers --- Spatial.tscn | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Spatial.tscn b/Spatial.tscn index 1af517a5..f1391ede 100644 --- a/Spatial.tscn +++ b/Spatial.tscn @@ -71,8 +71,8 @@ scale = Vector2( 2, 2 ) [node name="Line2D" parent="Control/MiniMap" instance=ExtResource( 4 )] [node name="GlobalMenuButton" type="Control" parent="Control"] -margin_left = 321.0 -margin_right = 348.0 +margin_left = 323.0 +margin_right = 349.0 margin_bottom = 32.0 __meta__ = { "_edit_use_anchors_": false @@ -81,8 +81,6 @@ __meta__ = { [node name="TextureRect" type="TextureRect" parent="Control/GlobalMenuButton"] modulate = Color( 1, 1, 1, 0.439216 ) margin_top = 4.0 -margin_right = 29.0 -margin_bottom = 30.0 texture = ExtResource( 3 ) __meta__ = { "_edit_use_anchors_": false @@ -90,15 +88,17 @@ __meta__ = { [node name="main_menu_toggle" type="Button" parent="Control/GlobalMenuButton"] modulate = Color( 1, 1, 1, 0 ) -margin_right = 29.0 -margin_bottom = 30.0 +margin_left = -2.0 +margin_right = 27.0 +margin_bottom = 32.0 __meta__ = { "_edit_use_anchors_": false } [node name="EditorQuckPanel" type="PanelContainer" parent="Control/GlobalMenuButton"] -visible = false margin_left = 32.0 +margin_right = 342.0 +margin_bottom = 54.0 __meta__ = { "_edit_use_anchors_": false } From 70a74464a456b000084e69bcde1e603cae5b006f Mon Sep 17 00:00:00 2001 From: klingbolt <89052698+klingbolt@users.noreply.github.com> Date: Tue, 19 Sep 2023 19:37:08 -0400 Subject: [PATCH 6/7] Update Spatial.tscn --- Spatial.tscn | 1 + 1 file changed, 1 insertion(+) diff --git a/Spatial.tscn b/Spatial.tscn index f1391ede..5d5554cf 100644 --- a/Spatial.tscn +++ b/Spatial.tscn @@ -96,6 +96,7 @@ __meta__ = { } [node name="EditorQuckPanel" type="PanelContainer" parent="Control/GlobalMenuButton"] +visible = false margin_left = 32.0 margin_right = 342.0 margin_bottom = 54.0 From c6df8e1a74f14f5ffa9be55222c02b808c0eb5a5 Mon Sep 17 00:00:00 2001 From: klingbolt Date: Tue, 19 Sep 2023 21:12:01 -0400 Subject: [PATCH 7/7] Changed margin for editor bar --- Spatial.tscn | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Spatial.tscn b/Spatial.tscn index f1391ede..48bb5307 100644 --- a/Spatial.tscn +++ b/Spatial.tscn @@ -81,6 +81,8 @@ __meta__ = { [node name="TextureRect" type="TextureRect" parent="Control/GlobalMenuButton"] modulate = Color( 1, 1, 1, 0.439216 ) margin_top = 4.0 +margin_right = 25.0 +margin_bottom = 29.0 texture = ExtResource( 3 ) __meta__ = { "_edit_use_anchors_": false @@ -97,8 +99,9 @@ __meta__ = { [node name="EditorQuckPanel" type="PanelContainer" parent="Control/GlobalMenuButton"] margin_left = 32.0 +margin_top = -2.0 margin_right = 342.0 -margin_bottom = 54.0 +margin_bottom = 52.0 __meta__ = { "_edit_use_anchors_": false }