mirror of
https://github.com/Orama-Interactive/Pixelorama.git
synced 2025-01-19 01:29:49 +00:00
Small UI improvement - The visibility icon will remain in a fixed place no matter how long the layer name is.
This commit is contained in:
parent
3b68698be3
commit
b9b0d3e1b3
|
@ -8,27 +8,32 @@
|
||||||
margin_right = 210.0
|
margin_right = 210.0
|
||||||
margin_bottom = 36.0
|
margin_bottom = 36.0
|
||||||
rect_min_size = Vector2( 212, 36 )
|
rect_min_size = Vector2( 212, 36 )
|
||||||
|
size_flags_horizontal = 0
|
||||||
toggle_mode = true
|
toggle_mode = true
|
||||||
script = ExtResource( 1 )
|
script = ExtResource( 1 )
|
||||||
__meta__ = {
|
__meta__ = {
|
||||||
"_edit_horizontal_guides_": [ ]
|
"_edit_horizontal_guides_": [ ],
|
||||||
|
"_edit_use_anchors_": false
|
||||||
}
|
}
|
||||||
|
|
||||||
[node name="HBoxContainer" type="HBoxContainer" parent="."]
|
[node name="HBoxContainer" type="HBoxContainer" parent="."]
|
||||||
anchor_top = 0.5
|
|
||||||
anchor_right = 1.0
|
anchor_right = 1.0
|
||||||
anchor_bottom = 0.5
|
anchor_bottom = 1.0
|
||||||
margin_top = -16.0
|
size_flags_horizontal = 0
|
||||||
margin_bottom = 16.0
|
__meta__ = {
|
||||||
mouse_default_cursor_shape = 2
|
"_edit_use_anchors_": false
|
||||||
alignment = 1
|
}
|
||||||
|
|
||||||
[node name="VisibilityButton" type="TextureButton" parent="HBoxContainer" groups=[
|
[node name="LayerButtons" type="HBoxContainer" parent="HBoxContainer"]
|
||||||
|
margin_right = 32.0
|
||||||
|
margin_bottom = 36.0
|
||||||
|
|
||||||
|
[node name="VisibilityButton" type="TextureButton" parent="HBoxContainer/LayerButtons" groups=[
|
||||||
"UIButtons",
|
"UIButtons",
|
||||||
]]
|
]]
|
||||||
margin_left = 65.0
|
margin_top = 2.0
|
||||||
margin_right = 97.0
|
margin_right = 32.0
|
||||||
margin_bottom = 32.0
|
margin_bottom = 34.0
|
||||||
hint_tooltip = "LAYERVISIBILITY_HT"
|
hint_tooltip = "LAYERVISIBILITY_HT"
|
||||||
mouse_default_cursor_shape = 2
|
mouse_default_cursor_shape = 2
|
||||||
size_flags_horizontal = 0
|
size_flags_horizontal = 0
|
||||||
|
@ -36,15 +41,28 @@ size_flags_vertical = 4
|
||||||
texture_normal = ExtResource( 2 )
|
texture_normal = ExtResource( 2 )
|
||||||
texture_hover = ExtResource( 3 )
|
texture_hover = ExtResource( 3 )
|
||||||
|
|
||||||
[node name="Label" type="Label" parent="HBoxContainer"]
|
[node name="LayerName" type="HBoxContainer" parent="HBoxContainer"]
|
||||||
margin_left = 101.0
|
margin_left = 36.0
|
||||||
margin_top = 9.0
|
margin_right = 212.0
|
||||||
margin_right = 147.0
|
margin_bottom = 36.0
|
||||||
margin_bottom = 23.0
|
rect_min_size = Vector2( 176, 0 )
|
||||||
|
mouse_default_cursor_shape = 2
|
||||||
|
size_flags_horizontal = 0
|
||||||
|
alignment = 1
|
||||||
|
__meta__ = {
|
||||||
|
"_edit_use_anchors_": false
|
||||||
|
}
|
||||||
|
|
||||||
|
[node name="Label" type="Label" parent="HBoxContainer/LayerName"]
|
||||||
|
margin_top = 11.0
|
||||||
|
margin_right = 176.0
|
||||||
|
margin_bottom = 25.0
|
||||||
|
size_flags_horizontal = 3
|
||||||
text = "Layer 0"
|
text = "Layer 0"
|
||||||
align = 1
|
align = 1
|
||||||
|
clip_text = true
|
||||||
|
|
||||||
[node name="LineEdit" type="LineEdit" parent="HBoxContainer"]
|
[node name="LineEdit" type="LineEdit" parent="HBoxContainer/LayerName"]
|
||||||
visible = false
|
visible = false
|
||||||
margin_left = 86.0
|
margin_left = 86.0
|
||||||
margin_top = 5.0
|
margin_top = 5.0
|
||||||
|
@ -57,4 +75,4 @@ editable = false
|
||||||
caret_blink = true
|
caret_blink = true
|
||||||
caret_blink_speed = 0.5
|
caret_blink_speed = 0.5
|
||||||
[connection signal="pressed" from="." to="." method="_on_LayerContainer_pressed"]
|
[connection signal="pressed" from="." to="." method="_on_LayerContainer_pressed"]
|
||||||
[connection signal="pressed" from="HBoxContainer/VisibilityButton" to="." method="_on_VisibilityButton_pressed"]
|
[connection signal="pressed" from="HBoxContainer/LayerButtons/VisibilityButton" to="." method="_on_VisibilityButton_pressed"]
|
||||||
|
|
|
@ -516,9 +516,9 @@ func layers_changed(value : Array) -> void:
|
||||||
if !layers[i][0]:
|
if !layers[i][0]:
|
||||||
layers[i][0] = tr("Layer") + " %s" % i
|
layers[i][0] = tr("Layer") + " %s" % i
|
||||||
|
|
||||||
layer_container.get_child(0).get_child(1).text = layers[i][0]
|
|
||||||
layer_container.get_child(0).get_child(2).text = layers[i][0]
|
|
||||||
layers_container.add_child(layer_container)
|
layers_container.add_child(layer_container)
|
||||||
|
layer_container.label.text = layers[i][0]
|
||||||
|
layer_container.line_edit.text = layers[i][0]
|
||||||
|
|
||||||
frames_container.add_child(layers[i][2])
|
frames_container.add_child(layers[i][2])
|
||||||
for j in range(canvases.size()):
|
for j in range(canvases.size()):
|
||||||
|
|
|
@ -4,12 +4,15 @@ extends Button
|
||||||
var i := 0
|
var i := 0
|
||||||
# warning-ignore:unused_class_variable
|
# warning-ignore:unused_class_variable
|
||||||
var currently_selected := false
|
var currently_selected := false
|
||||||
|
var visibility_button : BaseButton
|
||||||
onready var visibility_button := $HBoxContainer/VisibilityButton
|
var label : Label
|
||||||
onready var label := $HBoxContainer/Label
|
var line_edit : LineEdit
|
||||||
onready var line_edit := $HBoxContainer/LineEdit
|
|
||||||
|
|
||||||
func _ready() -> void:
|
func _ready() -> void:
|
||||||
|
visibility_button = Global.find_node_by_name(self, "VisibilityButton")
|
||||||
|
label = Global.find_node_by_name(self, "Label")
|
||||||
|
line_edit = Global.find_node_by_name(self, "LineEdit")
|
||||||
|
|
||||||
if Global.layers[i][1]:
|
if Global.layers[i][1]:
|
||||||
visibility_button.texture_normal = load("res://Assets/Graphics/%s Themes/Layers/Layer_Visible.png" % Global.theme_type)
|
visibility_button.texture_normal = load("res://Assets/Graphics/%s Themes/Layers/Layer_Visible.png" % Global.theme_type)
|
||||||
visibility_button.texture_hover = load("res://Assets/Graphics/%s Themes/Layers/Layer_Visible_Hover.png" % Global.theme_type)
|
visibility_button.texture_hover = load("res://Assets/Graphics/%s Themes/Layers/Layer_Visible_Hover.png" % Global.theme_type)
|
||||||
|
|
Loading…
Reference in a new issue