huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-02-12 08:43:08 +00:00
Code Issues Wiki Activity

Use Vector2s for min and max values in ValueSliderV2

Browse source 
This lets us have different min/max values for x and y.
This commit is contained in:
Emmanouil Papadeas 2023-03-21 01:45:09 +02:00
parent a5496daa5b
commit d4ebf9c585
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Tools/SelectionTools/SelectionTool.tscn
View file

@ -44,7 +44,7 @@ margin_top = 160.0
margin_right = 116.0 margin_right = 116.0
margin_bottom = 212.0 margin_bottom = 212.0
value = Vector2( 1, 1 ) value = Vector2( 1, 1 )
min_value = 1.0 min_value = Vector2( 1, 1 )
allow_greater = true allow_greater = true
show_ratio = true show_ratio = true
prefix_x = "Width:" prefix_x = "Width:"

20
src/UI/Nodes/ValueSliderV2.gd
View file

@ -6,8 +6,8 @@ signal value_changed(value)
export var editable := true setget _set_editable export var editable := true setget _set_editable
export var value := Vector2.ZERO setget _set_value export var value := Vector2.ZERO setget _set_value
export var min_value := 0.0 setget _set_min_value export var min_value := Vector2.ZERO setget _set_min_value
export var max_value := 100.0 setget _set_max_value export var max_value := Vector2(100.0, 100.0) setget _set_max_value
export var step := 1.0 setget _set_step export var step := 1.0 setget _set_step
export var allow_greater := false setget _set_allow_greater export var allow_greater := false setget _set_allow_greater
export var allow_lesser := false setget _set_allow_lesser export var allow_lesser := false setget _set_allow_lesser
@ -43,7 +43,7 @@ func _gcd(a: int, b: int) -> int:
func _on_X_value_changed(val: float) -> void: func _on_X_value_changed(val: float) -> void:
value.x = val value.x = val
if _locked_ratio: if _locked_ratio:
self.value.y = max(min_value, (value.x / ratio.x) * ratio.y) self.value.y = max(min_value.y, (value.x / ratio.x) * ratio.y)
if _can_emit_signal: if _can_emit_signal:
emit_signal("value_changed", value) emit_signal("value_changed", value)
@ -51,7 +51,7 @@ func _on_X_value_changed(val: float) -> void:
func _on_Y_value_changed(val: float) -> void: func _on_Y_value_changed(val: float) -> void:
value.y = val value.y = val
if _locked_ratio: if _locked_ratio:
self.value.x = max(min_value, (value.y / ratio.y) * ratio.x) self.value.x = max(min_value.x, (value.y / ratio.y) * ratio.x)
if _can_emit_signal: if _can_emit_signal:
emit_signal("value_changed", value) emit_signal("value_changed", value)
@ -83,16 +83,16 @@ func _set_value(val: Vector2) -> void:
_can_emit_signal = true _can_emit_signal = true
func _set_min_value(val: float) -> void: func _set_min_value(val: Vector2) -> void:
min_value = val min_value = val
for slider in get_sliders(): $GridContainer/X.min_value = val.x
slider.min_value = val $GridContainer/Y.min_value = val.y
func _set_max_value(val: float) -> void: func _set_max_value(val: Vector2) -> void:
max_value = val max_value = val
for slider in get_sliders(): $GridContainer/X.max_value = val.x
slider.max_value = val $GridContainer/Y.max_value = val.y
func _set_step(val: float) -> void: func _set_step(val: float) -> void: