mirror of
https://github.com/Orama-Interactive/Pixelorama.git
synced 2025-01-18 09:09:47 +00:00
Disable ValueSliderV2's ratio button when set to not editable
And use a NinePatchRect for the ratio guides, for proper scaling.
This commit is contained in:
parent
e174f6e942
commit
05fa436b12
Binary file not shown.
Before Width: | Height: | Size: 118 B After Width: | Height: | Size: 121 B |
|
@ -69,6 +69,7 @@ func _set_editable(val: bool) -> void:
|
|||
editable = val
|
||||
for slider in get_sliders():
|
||||
slider.editable = val
|
||||
$Ratio/RatioButton.disabled = not val
|
||||
|
||||
|
||||
func _set_value(val: Vector2) -> void:
|
||||
|
|
|
@ -7,17 +7,17 @@
|
|||
[ext_resource path="res://assets/graphics/misc/lock_aspect.png" type="Texture" id=5]
|
||||
|
||||
[node name="ValueSliderV2" type="HBoxContainer"]
|
||||
margin_right = 40.0
|
||||
margin_bottom = 40.0
|
||||
margin_right = 45.0
|
||||
margin_bottom = 52.0
|
||||
script = ExtResource( 2 )
|
||||
|
||||
[node name="GridContainer" type="GridContainer" parent="."]
|
||||
margin_right = 40.0
|
||||
margin_right = 45.0
|
||||
margin_bottom = 52.0
|
||||
size_flags_horizontal = 3
|
||||
|
||||
[node name="X" type="TextureProgress" parent="GridContainer"]
|
||||
margin_right = 40.0
|
||||
margin_right = 45.0
|
||||
margin_bottom = 24.0
|
||||
rect_min_size = Vector2( 32, 24 )
|
||||
mouse_default_cursor_shape = 2
|
||||
|
@ -33,7 +33,7 @@ prefix = "X:"
|
|||
|
||||
[node name="Y" type="TextureProgress" parent="GridContainer"]
|
||||
margin_top = 28.0
|
||||
margin_right = 40.0
|
||||
margin_right = 45.0
|
||||
margin_bottom = 52.0
|
||||
rect_min_size = Vector2( 32, 24 )
|
||||
mouse_default_cursor_shape = 2
|
||||
|
@ -47,13 +47,21 @@ stretch_margin_bottom = 3
|
|||
script = ExtResource( 1 )
|
||||
prefix = "Y:"
|
||||
|
||||
[node name="Ratio" type="TextureRect" parent="." groups=["UIButtons"]]
|
||||
[node name="Ratio" type="Control" parent="."]
|
||||
visible = false
|
||||
margin_left = 36.0
|
||||
margin_right = 52.0
|
||||
margin_bottom = 52.0
|
||||
rect_min_size = Vector2( 16, 0 )
|
||||
|
||||
[node name="RatioGuides" type="NinePatchRect" parent="Ratio" groups=["UIButtons"]]
|
||||
anchor_bottom = 1.0
|
||||
margin_right = 9.0
|
||||
rect_min_size = Vector2( 9, 0 )
|
||||
texture = ExtResource( 4 )
|
||||
region_rect = Rect2( 0, 0, 9, 44 )
|
||||
patch_margin_top = 15
|
||||
patch_margin_bottom = 13
|
||||
|
||||
[node name="RatioButton" type="TextureButton" parent="Ratio" groups=["UIButtons"]]
|
||||
anchor_left = 0.5
|
||||
|
@ -61,9 +69,9 @@ anchor_top = 0.5
|
|||
anchor_right = 0.5
|
||||
anchor_bottom = 0.5
|
||||
margin_left = -8.0
|
||||
margin_top = -10.0
|
||||
margin_top = -8.0
|
||||
margin_right = 8.0
|
||||
margin_bottom = 6.0
|
||||
margin_bottom = 8.0
|
||||
hint_tooltip = "Lock aspect ratio"
|
||||
mouse_default_cursor_shape = 2
|
||||
toggle_mode = true
|
||||
|
|
Loading…
Reference in a new issue