Skip to content

Commit 2d57faa

Browse files
committed
Add +/- shortcuts(equal/minus key) to zoom 2d preview
1 parent 0fe9935 commit 2d57faa

File tree

2 files changed

+73
-16
lines changed

2 files changed

+73
-16
lines changed

material_maker/panels/preview_2d/preview_2d_panel.gd

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,3 +344,11 @@ func _on_preview_locked_toggled(toggled_on: bool) -> void:
344344
if not prev:
345345
return
346346
current_graph.set_current_preview(preview_mode-1, prev.node, prev.output_index, toggled_on, not toggled_on)
347+
348+
func _on_zoom_in_button_pressed() -> void:
349+
view_scale = max(view_scale*0.9, 0.005)
350+
on_resized()
351+
352+
func _on_zoom_out_button_pressed() -> void:
353+
view_scale = min(view_scale*1.1, 5.0)
354+
on_resized()

material_maker/panels/preview_2d/preview_2d_panel.tscn

Lines changed: 65 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
[gd_scene load_steps=30 format=3 uid="uid://b7x7yqgsurxhv"]
1+
[gd_scene load_steps=34 format=3 uid="uid://b7x7yqgsurxhv"]
22

33
[ext_resource type="Texture2D" uid="uid://c0j4px4n72di5" path="res://material_maker/icons/icons.tres" id="1"]
44
[ext_resource type="PackedScene" uid="uid://est6pi7xbptp" path="res://material_maker/panels/preview_2d/control_point.tscn" id="2"]
55
[ext_resource type="PackedScene" uid="uid://bb6iar0tbj2qt" path="res://material_maker/panels/preview_2d/preview_2d.tscn" id="3"]
6-
[ext_resource type="Script" uid="uid://cjtefdp8oh215" path="res://material_maker/panels/preview_2d/axes.gd" id="3_r76ng"]
6+
[ext_resource type="Script" path="res://material_maker/panels/preview_2d/axes.gd" id="3_r76ng"]
77
[ext_resource type="Script" uid="uid://cj476fi1ociuw" path="res://material_maker/panels/preview_2d/preview_2d_panel.gd" id="4"]
88
[ext_resource type="PackedScene" uid="uid://djura7a50b2aq" path="res://material_maker/widgets/polygon_edit/polygon_editor.tscn" id="4_gd40d"]
99
[ext_resource type="Script" uid="uid://p2topj3y4p63" path="res://material_maker/panels/preview_2d/lines.gd" id="5"]
@@ -75,13 +75,29 @@ code = "shader_type canvas_item;"
7575
resource_local_to_scene = true
7676
shader = SubResource("5")
7777

78-
[sub_resource type="InputEventKey" id="InputEventKey_83edi"]
78+
[sub_resource type="InputEventKey" id="InputEventKey_63a3x"]
79+
device = -1
7980
command_or_control_autoremap = true
80-
pressed = true
8181
keycode = 82
8282

83-
[sub_resource type="Shortcut" id="Shortcut_r76ng"]
84-
events = [SubResource("InputEventKey_83edi")]
83+
[sub_resource type="Shortcut" id="Shortcut_ddtyk"]
84+
events = [SubResource("InputEventKey_63a3x")]
85+
86+
[sub_resource type="InputEventKey" id="InputEventKey_r76ng"]
87+
device = -1
88+
keycode = 45
89+
unicode = 45
90+
91+
[sub_resource type="Shortcut" id="Shortcut_083ld"]
92+
events = [SubResource("InputEventKey_r76ng")]
93+
94+
[sub_resource type="InputEventKey" id="InputEventKey_083ld"]
95+
device = -1
96+
keycode = 61
97+
unicode = 61
98+
99+
[sub_resource type="Shortcut" id="Shortcut_63a3x"]
100+
events = [SubResource("InputEventKey_083ld")]
85101

86102
[sub_resource type="FontVariation" id="FontVariation_wkuuo"]
87103
base_font = ExtResource("18_kn37y")
@@ -405,28 +421,57 @@ vertical_scroll_mode = 0
405421
layout_mode = 2
406422
size_flags_horizontal = 3
407423

408-
[node name="MainMenu" type="PanelContainer" parent="MenuBar/HBox" index="0"]
424+
[node name="ViewMenu" type="PanelContainer" parent="MenuBar/HBox" index="0"]
409425
layout_mode = 2
410426
size_flags_vertical = 0
411427
theme_type_variation = &"MM_PanelMenuBar"
412428

413-
[node name="HBox" type="HBoxContainer" parent="MenuBar/HBox/MainMenu" index="0"]
429+
[node name="HBox" type="HBoxContainer" parent="MenuBar/HBox/ViewMenu" index="0"]
414430
layout_mode = 2
415431
theme_type_variation = &"MM_PanelMenuBar"
416432

417-
[node name="ResetViewButton" type="Button" parent="MenuBar/HBox/MainMenu/HBox" index="0"]
433+
[node name="ResetViewButton" type="Button" parent="MenuBar/HBox/ViewMenu/HBox" index="0"]
418434
unique_name_in_owner = true
419435
custom_minimum_size = Vector2(25, 25)
420436
layout_mode = 2
421437
tooltip_text = "Center View"
422438
tooltip_auto_translate_mode = 2
423-
shortcut = SubResource("Shortcut_r76ng")
439+
shortcut = SubResource("Shortcut_ddtyk")
424440
shortcut_in_tooltip = false
425441
icon_alignment = 1
426442
script = ExtResource("10_83edi")
427443
icon_name = "reset_view"
428444

429-
[node name="ViewMenu" type="Button" parent="MenuBar/HBox/MainMenu/HBox" index="1" node_paths=PackedStringArray("shortcut_context")]
445+
[node name="ZoomOutButton" type="Button" parent="MenuBar/HBox/ViewMenu/HBox" index="1"]
446+
custom_minimum_size = Vector2(25, 25)
447+
layout_mode = 2
448+
tooltip_text = "Zoom Out"
449+
tooltip_auto_translate_mode = 2
450+
shortcut = SubResource("Shortcut_083ld")
451+
icon_alignment = 1
452+
script = ExtResource("10_83edi")
453+
icon_name = "zoom_out"
454+
455+
[node name="ZoomInButton" type="Button" parent="MenuBar/HBox/ViewMenu/HBox" index="2"]
456+
custom_minimum_size = Vector2(25, 25)
457+
layout_mode = 2
458+
tooltip_text = "Zoom In"
459+
tooltip_auto_translate_mode = 2
460+
shortcut = SubResource("Shortcut_63a3x")
461+
icon_alignment = 1
462+
script = ExtResource("10_83edi")
463+
icon_name = "zoom_in"
464+
465+
[node name="MainMenu" type="PanelContainer" parent="MenuBar/HBox" index="1"]
466+
layout_mode = 2
467+
size_flags_vertical = 0
468+
theme_type_variation = &"MM_PanelMenuBar"
469+
470+
[node name="HBox" type="HBoxContainer" parent="MenuBar/HBox/MainMenu" index="0"]
471+
layout_mode = 2
472+
theme_type_variation = &"MM_PanelMenuBar"
473+
474+
[node name="ViewMenu" type="Button" parent="MenuBar/HBox/MainMenu/HBox" index="0" node_paths=PackedStringArray("shortcut_context")]
430475
custom_minimum_size = Vector2(40, 25)
431476
layout_mode = 2
432477
tooltip_text = "View"
@@ -566,7 +611,7 @@ popup/item_1/id = 1
566611
popup/item_2/text = "Large"
567612
popup/item_2/id = 2
568613

569-
[node name="ExportMenu" type="Button" parent="MenuBar/HBox/MainMenu/HBox" index="2" node_paths=PackedStringArray("shortcut_context")]
614+
[node name="ExportMenu" type="Button" parent="MenuBar/HBox/MainMenu/HBox" index="1" node_paths=PackedStringArray("shortcut_context")]
570615
unique_name_in_owner = true
571616
custom_minimum_size = Vector2(40, 25)
572617
layout_mode = 2
@@ -767,7 +812,7 @@ theme_override_colors/font_color = Color(0.52, 0.52, 0.52, 1)
767812
theme_override_fonts/font = SubResource("FontVariation_wkuuo")
768813
autowrap_mode = 1
769814

770-
[node name="PreviewLocked" type="Button" parent="MenuBar/HBox/MainMenu/HBox" index="3"]
815+
[node name="PreviewLocked" type="Button" parent="MenuBar/HBox/MainMenu/HBox" index="2"]
771816
unique_name_in_owner = true
772817
custom_minimum_size = Vector2(25, 25)
773818
layout_mode = 2
@@ -778,19 +823,23 @@ script = ExtResource("17_07kc5")
778823
icon_normal_name = "lock_unlocked"
779824
icon_pressed_name = "lock_locked"
780825

781-
[node name="ComplexParameters" type="OptionButton" parent="MenuBar/HBox/MainMenu/HBox" index="4"]
826+
[node name="ComplexParameters" type="OptionButton" parent="MenuBar/HBox/MainMenu/HBox" index="3"]
782827
unique_name_in_owner = true
783828
visible = false
784829
layout_mode = 2
785830

786831
[connection signal="gui_input" from="." to="." method="_on_gui_input"]
787832
[connection signal="mouse_entered" from="." to="." method="_on_Preview2D_mouse_entered"]
788833
[connection signal="unhandled_event" from="PolygonEditor" to="." method="_on_gui_input"]
789-
[connection signal="gui_input" from="PolygonEditor/@Control@42512" to="PolygonEditor/@Control@42512" method="_on_ControlPoint_gui_input"]
834+
[connection signal="gui_input" from="PolygonEditor/@Control@27846" to="PolygonEditor/@Control@27846" method="_on_ControlPoint_gui_input"]
835+
[connection signal="mouse_entered" from="PolygonEditor/@Control@27846" to="PolygonEditor/@Control@27846" method="_on_mouse_entered"]
836+
[connection signal="mouse_exited" from="PolygonEditor/@Control@27846" to="PolygonEditor/@Control@27846" method="_on_mouse_exited"]
790837
[connection signal="unhandled_event" from="SplinesEditor" to="." method="_on_gui_input"]
791838
[connection signal="unhandled_event" from="PixelsEditor" to="." method="_on_gui_input"]
792839
[connection signal="unhandled_event" from="LatticeEditor" to="." method="_on_gui_input"]
793-
[connection signal="pressed" from="MenuBar/HBox/MainMenu/HBox/ResetViewButton" to="." method="reset_view"]
840+
[connection signal="pressed" from="MenuBar/HBox/ViewMenu/HBox/ResetViewButton" to="." method="reset_view"]
841+
[connection signal="pressed" from="MenuBar/HBox/ViewMenu/HBox/ZoomOutButton" to="." method="_on_zoom_out_button_pressed"]
842+
[connection signal="pressed" from="MenuBar/HBox/ViewMenu/HBox/ZoomInButton" to="." method="_on_zoom_in_button_pressed"]
794843
[connection signal="item_selected" from="MenuBar/HBox/MainMenu/HBox/ViewMenu/ViewMenuPanel/VBox/ViewMode" to="MenuBar/HBox/MainMenu/HBox/ViewMenu/ViewMenuPanel" method="_on_view_mode_item_selected"]
795844
[connection signal="item_selected" from="MenuBar/HBox/MainMenu/HBox/ViewMenu/ViewMenuPanel/VBox/PostProcessing" to="MenuBar/HBox/MainMenu/HBox/ViewMenu/ViewMenuPanel" method="_on_post_processing_item_selected"]
796845
[connection signal="item_selected" from="MenuBar/HBox/MainMenu/HBox/ViewMenu/ViewMenuPanel/VBox/BoxContainer/Guides" to="MenuBar/HBox/MainMenu/HBox/ViewMenu/ViewMenuPanel" method="_on_guides_item_selected"]

0 commit comments

Comments
 (0)