Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SOTO Update] Shifted the burrito button to the right #156

Merged
merged 8 commits into from
Sep 20, 2023
Merged

[SOTO Update] Shifted the burrito button to the right #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
edbffaa
Shifted the burrito button to the right
klingbolt Aug 25, 2023
31ae872
Change so that the button should work
klingbolt Aug 25, 2023
ad4798d
Changed the pass through coordinates
klingbolt Aug 25, 2023
3479b6a
Changed numbers to be the properties the numbers were coming from
klingbolt Aug 25, 2023
2a2ae5a
Changed some numbers
klingbolt Aug 29, 2023
70a7446
Update Spatial.tscn
klingbolt Sep 19, 2023
c6df8e1
Changed margin for editor bar
klingbolt Sep 20, 2023
b716c61
Merge branch 'master' of https://github.com/klingbolt/Burrito
klingbolt Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions Spatial.gd
View file
Open in desktop
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()
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

By changing the values here to the properties the numbers come from, any more changes to the icons will be updated in the passthrough


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
View file
Open in desktop
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
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I found that the margin besides the left margin does not make a difference if the margin is less than the size. Thus, removing the unnecessary ones

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