Skip to content

Commit

Permalink
Further reduces sizes of various visual elements
Browse files Browse the repository at this point in the history
This pushes the changes even further, as with the
current state we still don't quite fit the standard DPI
screen at 1080p (accounted for OS decorations).

I'm not sure how much we can squeeze from this,
but these changes should definitely help. Little by
little.
  • Loading branch information
YuriSizov committed Oct 30, 2024
1 parent 13e96ec commit 1252575
Show file tree
Hide file tree
Showing 14 changed files with 25 additions and 55 deletions.
1 change: 1 addition & 0 deletions gui/components/deck/VoiceDeckHeader.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ anchors_preset = 10
anchor_right = 1.0
offset_bottom = 37.0
grow_horizontal = 2
theme_override_constants/margin_bottom = 8
script = ExtResource("1_x0dr6")

[node name="Layout" type="HBoxContainer" parent="."]
Expand Down
3 changes: 2 additions & 1 deletion gui/components/preview/PianoKey.gdshader
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ void fragment() {
selection_uv.x *= 1.0 + 0.1 * state_pressed;
selection_uv.y += 0.02 * state_pressed;
float selection_mask = length(selection_uv);
selection_mask = 1.0 - smoothstep(selection_size - selection_smoothness, selection_size + selection_smoothness, selection_mask);
float selection_stateful_size = selection_size - 0.005 * state_pressed;
selection_mask = 1.0 - smoothstep(selection_stateful_size - selection_smoothness, selection_stateful_size + selection_smoothness, selection_mask);

output_color = overlay(output_color, selection_color, float(state_selected), selection_mask);

Expand Down
4 changes: 2 additions & 2 deletions gui/components/preview/PianoKey.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ shader_parameter/inset_height = 0.382
shader_parameter/inset_smoothness = 0.024
shader_parameter/inset_shadow_position = 0.019
shader_parameter/inset_shadow_size = 0.022
shader_parameter/selection_x_factor = 2.6
shader_parameter/selection_x_factor = 2.04
shader_parameter/selection_offset = 0.8
shader_parameter/selection_size = 0.066
shader_parameter/selection_size = 0.073
shader_parameter/selection_smoothness = 0.006
shader_parameter/selection_color = Color(0.710837, 0.283876, 0.25255, 1)

Expand Down
13 changes: 4 additions & 9 deletions gui/components/preview/PianoRoll.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -250,22 +250,17 @@ shader_parameter/selection_size = 0.066
shader_parameter/selection_smoothness = 0.006
shader_parameter/selection_color = Color(0.710837, 0.283876, 0.25255, 1)

[sub_resource type="ShaderMaterial" id="ShaderMaterial_i54aq"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_s7d8e"]
resource_local_to_scene = true
shader = ExtResource("6_l44rt")
shader_parameter/direction = Vector2(1, 0)
shader_parameter/intensity = 0.82

[node name="PianoRoll" type="MarginContainer"]
offset_right = 316.0
offset_bottom = 127.0
offset_bottom = 119.0
script = ExtResource("1_nfgs2")

[node name="ColorRect" type="ColorRect" parent="."]
visible = false
layout_mode = 2
color = Color(0.116668, 0.109648, 0.106619, 1)

[node name="Layout" type="VBoxContainer" parent="."]
layout_mode = 2
theme_override_constants/separation = 2
Expand Down Expand Up @@ -317,7 +312,7 @@ theme_override_constants/margin_bottom = 0

[node name="PianoContainer" type="Container" parent="Layout/Widgets/Keys/MarginContainer"]
unique_name_in_owner = true
custom_minimum_size = Vector2(0, 100)
custom_minimum_size = Vector2(0, 92)
layout_mode = 2
mouse_filter = 0
script = ExtResource("2_kmleb")
Expand Down Expand Up @@ -409,7 +404,7 @@ on_color = Color(0.161746, 0.144835, 0.197189, 1)

[node name="OctaveLabel" parent="Layout/Widgets/Octave" instance=ExtResource("7_g2f1f")]
unique_name_in_owner = true
material = SubResource("ShaderMaterial_i54aq")
material = SubResource("ShaderMaterial_s7d8e")
custom_minimum_size = Vector2(44, 28)
layout_mode = 2
text = "01"
Expand Down
2 changes: 1 addition & 1 deletion gui/panels/BrandingPanel.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[sub_resource type="ShaderMaterial" id="ShaderMaterial_t4i82"]
resource_local_to_scene = true
shader = ExtResource("1_xepf3")
shader_parameter/size = Vector2(277, 73)
shader_parameter/size = Vector2(253, 63)
shader_parameter/light_intensity = 0.0
shader_parameter/light_smoothness = 0.003
shader_parameter/light_inverted = 0
Expand Down
9 changes: 5 additions & 4 deletions gui/panels/PreviewPanel.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
[sub_resource type="ShaderMaterial" id="ShaderMaterial_i1p27"]
resource_local_to_scene = true
shader = ExtResource("2_mypj1")
shader_parameter/size = Vector2(800, 222)
shader_parameter/size = Vector2(800, 205)
shader_parameter/light_intensity = 0.0
shader_parameter/light_smoothness = 0.003
shader_parameter/light_inverted = 0
Expand All @@ -34,7 +34,7 @@ shader_parameter/bolt_shine_reduction = 2.5
[node name="PreviewPanel" type="PanelContainer"]
anchors_preset = 10
anchor_right = 1.0
offset_bottom = 222.0
offset_bottom = 205.0
grow_horizontal = 2
theme_type_variation = &"PreviewPanel"
script = ExtResource("1_iu5lk")
Expand All @@ -58,6 +58,7 @@ size_flags_horizontal = 3

[node name="PreviewArea" parent="Content/Layout/PreviewBox" instance=ExtResource("3_80051")]
unique_name_in_owner = true
custom_minimum_size = Vector2(280, 120)
layout_mode = 2
size_flags_vertical = 3

Expand Down Expand Up @@ -109,11 +110,11 @@ right_text = ""
[node name="Controls" type="VBoxContainer" parent="Content/Layout"]
layout_mode = 2
size_flags_vertical = 0
theme_override_constants/separation = 14
theme_override_constants/separation = 12

[node name="PreviewButton" parent="Content/Layout/Controls" instance=ExtResource("4_6wcbg")]
unique_name_in_owner = true
custom_minimum_size = Vector2(0, 54)
custom_minimum_size = Vector2(0, 48)
layout_mode = 2
theme_type_variation = &"BlamButton"
toggle_mode = false
Expand Down
20 changes: 10 additions & 10 deletions gui/theme/project_theme.tres
Original file line number Diff line number Diff line change
Expand Up @@ -354,10 +354,10 @@ content_margin_bottom = 22.0
bg_color = Color(0.0658186, 0.0700564, 0.0586766, 1)

[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_gniu8"]
content_margin_left = 12.0
content_margin_top = 12.0
content_margin_right = 12.0
content_margin_bottom = 12.0
content_margin_left = 8.0
content_margin_top = 8.0
content_margin_right = 8.0
content_margin_bottom = 8.0
bg_color = Color(0.099, 0.099, 0.099, 0.24)
border_width_left = 5
border_width_top = 5
Expand Down Expand Up @@ -394,13 +394,13 @@ AdvancedPanelContainer/styles/panel = SubResource("StyleBoxFlat_wkpyt")
BaseVoiceDeck/base_type = &"PanelContainer"
BaseVoiceDeck/styles/panel = SubResource("StyleBoxEmpty_llkav")
BlamButton/base_type = &"GlowButton"
BlamButton/font_sizes/font_size = 22
BlamButton/font_sizes/font_size = 20
BlamButton/fonts/font = SubResource("FontVariation_po6ik")
BrandingLabel/base_type = &"Label"
BrandingLabel/colors/font_shadow_color = Color(0.150051, 0.176691, 0.194453, 0.781)
BrandingLabel/constants/shadow_offset_x = 2
BrandingLabel/constants/shadow_offset_y = 2
BrandingLabel/font_sizes/font_size = 22
BrandingLabel/font_sizes/font_size = 20
BrandingLabel/fonts/font = SubResource("FontVariation_k7evk")
BrandingLabel/styles/normal = SubResource("StyleBoxEmpty_5m7pm")
BrandingPanel/base_type = &"ContentPanel"
Expand Down Expand Up @@ -431,9 +431,9 @@ GlowButton/styles/focus = SubResource("StyleBoxEmpty_mb7o6")
GlowButton/styles/hover = SubResource("StyleBoxEmpty_xu2n5")
GlowButton/styles/normal = SubResource("StyleBoxEmpty_eplmh")
GlowButton/styles/pressed = SubResource("StyleBoxEmpty_3mafp")
HBoxContainer/constants/separation = 8
HBoxContainer/constants/separation = 6
HLayoutContainer/base_type = &"HBoxContainer"
HLayoutContainer/constants/separation = 20
HLayoutContainer/constants/separation = 18
HSeparator/styles/separator = SubResource("StyleBoxLine_ucorg")
HSlider/icons/grabber = SubResource("Texture2D_dd775")
HSlider/icons/grabber_disabled = SubResource("Texture2D_i7hji")
Expand Down Expand Up @@ -518,9 +518,9 @@ TipContainer/constants/margin_bottom = 12
TipContainer/constants/margin_left = 16
TipContainer/constants/margin_right = 16
TipContainer/constants/margin_top = 12
VBoxContainer/constants/separation = 8
VBoxContainer/constants/separation = 6
VLayoutContainer/base_type = &"VBoxContainer"
VLayoutContainer/constants/separation = 20
VLayoutContainer/constants/separation = 18
VScrollBar/styles/grabber = SubResource("StyleBoxFlat_xfoxt")
VScrollBar/styles/grabber_highlight = SubResource("StyleBoxFlat_sntoc")
VScrollBar/styles/grabber_pressed = SubResource("StyleBoxFlat_y8tbu")
Expand Down
4 changes: 0 additions & 4 deletions gui/voices/EditorOnlyDeck.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,6 @@ unique_name_in_owner = true
layout_mode = 2
voice_name = "EDITOR"

[node name="Spacer" type="Control" parent="Layout"]
custom_minimum_size = Vector2(0, 8)
layout_mode = 2

[node name="GeneralKnobs" type="HBoxContainer" parent="Layout"]
layout_mode = 2

Expand Down
4 changes: 0 additions & 4 deletions gui/voices/MA3VoiceDeck.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ unique_name_in_owner = true
layout_mode = 2
voice_name = "MA-3"

[node name="Spacer" type="Control" parent="Layout"]
custom_minimum_size = Vector2(0, 8)
layout_mode = 2

[node name="GeneralKnobs" type="HBoxContainer" parent="Layout"]
layout_mode = 2

Expand Down
4 changes: 0 additions & 4 deletions gui/voices/OPLVoiceDeck.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ unique_name_in_owner = true
layout_mode = 2
voice_name = "OPL"

[node name="Spacer" type="Control" parent="Layout"]
custom_minimum_size = Vector2(0, 8)
layout_mode = 2

[node name="GeneralKnobs" type="HBoxContainer" parent="Layout"]
layout_mode = 2

Expand Down
4 changes: 0 additions & 4 deletions gui/voices/OPMVoiceDeck.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ unique_name_in_owner = true
layout_mode = 2
voice_name = "OPM"

[node name="Spacer" type="Control" parent="Layout"]
custom_minimum_size = Vector2(0, 8)
layout_mode = 2

[node name="GeneralKnobs" type="HBoxContainer" parent="Layout"]
layout_mode = 2

Expand Down
4 changes: 0 additions & 4 deletions gui/voices/OPNVoiceDeck.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ unique_name_in_owner = true
layout_mode = 2
voice_name = "OPN"

[node name="Spacer" type="Control" parent="Layout"]
custom_minimum_size = Vector2(0, 8)
layout_mode = 2

[node name="GeneralKnobs" type="HBoxContainer" parent="Layout"]
layout_mode = 2

Expand Down
4 changes: 0 additions & 4 deletions gui/voices/OPXVoiceDeck.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ unique_name_in_owner = true
layout_mode = 2
voice_name = "OPX"

[node name="Spacer" type="Control" parent="Layout"]
custom_minimum_size = Vector2(0, 8)
layout_mode = 2

[node name="GeneralKnobs" type="HBoxContainer" parent="Layout"]
layout_mode = 2

Expand Down
4 changes: 0 additions & 4 deletions gui/voices/SiOPMVoiceDeck.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@ unique_name_in_owner = true
layout_mode = 2
voice_name = "SiOPM"

[node name="Spacer" type="Control" parent="Layout"]
custom_minimum_size = Vector2(0, 8)
layout_mode = 2

[node name="GeneralKnobs" type="HBoxContainer" parent="Layout"]
layout_mode = 2

Expand Down

0 comments on commit 1252575

Please sign in to comment.