Skip to content

Commit

Permalink
Merge pull request #156 from klingbolt/master
Browse files Browse the repository at this point in the history
[SOTO Update] Shifted the burrito button to the right
  • Loading branch information
AsherGlick authored Sep 20, 2023
2 parents b084d24 + b716c61 commit 9f6ae70
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 13 deletions.
9 changes: 5 additions & 4 deletions Spatial.gd
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,13 @@ func exit_burrito():


func set_minimal_mouse_block():
var top_corner := Vector2(287, 0)
var bottom_corner := Vector2(314, 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),
Expand Down
18 changes: 9 additions & 9 deletions Spatial.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -71,26 +71,26 @@ 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_left = 323.0
margin_right = 349.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_left = 1.591
margin_top = 3.18198
margin_right = 26.591
margin_bottom = 28.182
margin_top = 4.0
margin_right = 25.0
margin_bottom = 29.0
texture = ExtResource( 3 )
__meta__ = {
"_edit_use_anchors_": false
}

[node name="main_menu_toggle" type="Button" parent="Control/GlobalMenuButton"]
modulate = Color( 1, 1, 1, 0 )
margin_left = -2.0
margin_right = 27.0
margin_bottom = 32.0
__meta__ = {
Expand All @@ -101,7 +101,7 @@ __meta__ = {
visible = false
margin_left = 32.0
margin_top = -2.0
margin_right = 306.0
margin_right = 342.0
margin_bottom = 52.0
__meta__ = {
"_edit_use_anchors_": false
Expand Down Expand Up @@ -628,8 +628,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
Expand Down

0 comments on commit 9f6ae70

Please sign in to comment.