huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-01-19 01:29:49 +00:00
Code Issues Wiki Activity

"Brush color from" now invisible when pixel brush is selected

Browse source
This commit is contained in:
OverloadedOrama 2019-12-03 00:25:22 +02:00
parent a2fdf7c4a5
commit 5ffd0ecf6a
3 changed files with 49 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
Main.tscn
View file

@ -81,7 +81,6 @@ __meta__ = {
} }
[node name="MenuAndUI" type="VBoxContainer" parent="."] [node name="MenuAndUI" type="VBoxContainer" parent="."]
editor/display_folded = true
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
custom_constants/separation = 0 custom_constants/separation = 0
@ -152,7 +151,6 @@ text = "[64×64]"
align = 2 align = 2
[node name="UI" type="HBoxContainer" parent="MenuAndUI"] [node name="UI" type="HBoxContainer" parent="MenuAndUI"]
editor/display_folded = true
margin_top = 28.0 margin_top = 28.0
margin_right = 1152.0 margin_right = 1152.0
margin_bottom = 648.0 margin_bottom = 648.0
@ -161,6 +159,7 @@ size_flags_vertical = 3
custom_constants/separation = 0 custom_constants/separation = 0
[node name="ToolPanel" type="Panel" parent="MenuAndUI/UI"] [node name="ToolPanel" type="Panel" parent="MenuAndUI/UI"]
editor/display_folded = true
margin_right = 242.0 margin_right = 242.0
margin_bottom = 620.0 margin_bottom = 620.0
rect_min_size = Vector2( 242, 0 ) rect_min_size = Vector2( 242, 0 )
@ -300,7 +299,6 @@ button_mask = 3
text = "PaintSameColor" text = "PaintSameColor"
[node name="ToolOptions" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools"] [node name="ToolOptions" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools"]
editor/display_folded = true
margin_top = 157.0 margin_top = 157.0
margin_right = 226.0 margin_right = 226.0
margin_bottom = 612.0 margin_bottom = 612.0
@ -371,7 +369,6 @@ margin_right = 226.0
margin_bottom = 36.0 margin_bottom = 36.0
[node name="LeftToolOptions" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions"] [node name="LeftToolOptions" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions"]
editor/display_folded = true
margin_top = 36.0 margin_top = 36.0
margin_right = 226.0 margin_right = 226.0
margin_bottom = 243.0 margin_bottom = 243.0
@ -439,26 +436,32 @@ min_value = 1.0
value = 1.0 value = 1.0
suffix = "px" suffix = "px"
[node name="ColorComesFrom" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions"] [node name="LeftColorInterpolation" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions"]
margin_top = 110.0
margin_right = 226.0
margin_bottom = 124.0
text = "Brush color from"
[node name="InterpolateColor" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions"]
editor/display_folded = true editor/display_folded = true
margin_top = 128.0 visible = false
margin_top = 110.0
margin_right = 226.0 margin_right = 226.0
margin_bottom = 144.0 margin_bottom = 144.0
[node name="BrushColorLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/InterpolateColor"] [node name="ColorComesFrom" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/LeftColorInterpolation"]
margin_right = 226.0
margin_bottom = 14.0
text = "Brush color from"
[node name="InterpolateColor" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/LeftColorInterpolation"]
editor/display_folded = true
margin_top = 18.0
margin_right = 226.0
margin_bottom = 34.0
[node name="BrushColorLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/LeftColorInterpolation/InterpolateColor"]
margin_top = 1.0 margin_top = 1.0
margin_right = 9.0 margin_right = 9.0
margin_bottom = 15.0 margin_bottom = 15.0
rect_pivot_offset = Vector2( -90, -47 ) rect_pivot_offset = Vector2( -90, -47 )
text = "B" text = "B"
[node name="LeftInterpolateFactor" type="HSlider" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/InterpolateColor"] [node name="LeftInterpolateFactor" type="HSlider" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/LeftColorInterpolation/InterpolateColor"]
margin_left = 13.0 margin_left = 13.0
margin_right = 214.0 margin_right = 214.0
margin_bottom = 16.0 margin_bottom = 16.0
@ -469,7 +472,7 @@ step = 0.01
value = 1.0 value = 1.0
ticks_on_borders = true ticks_on_borders = true
[node name="SelectedColorLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/InterpolateColor"] [node name="SelectedColorLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/LeftColorInterpolation/InterpolateColor"]
margin_left = 218.0 margin_left = 218.0
margin_top = 1.0 margin_top = 1.0
margin_right = 226.0 margin_right = 226.0
@ -479,9 +482,9 @@ text = "C"
[node name="Mirroring" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions"] [node name="Mirroring" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions"]
editor/display_folded = true editor/display_folded = true
margin_top = 148.0 margin_top = 110.0
margin_right = 226.0 margin_right = 226.0
margin_bottom = 172.0 margin_bottom = 134.0
[node name="LeftHorizontalMirroring" type="CheckBox" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/Mirroring"] [node name="LeftHorizontalMirroring" type="CheckBox" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/Mirroring"]
margin_right = 109.0 margin_right = 109.0
@ -504,7 +507,6 @@ margin_right = 226.0
margin_bottom = 247.0 margin_bottom = 247.0
[node name="RightToolOptions" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions"] [node name="RightToolOptions" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions"]
editor/display_folded = true
margin_top = 247.0 margin_top = 247.0
margin_right = 226.0 margin_right = 226.0
margin_bottom = 455.0 margin_bottom = 455.0
@ -571,25 +573,31 @@ min_value = 1.0
value = 1.0 value = 1.0
suffix = "px" suffix = "px"
[node name="ColorComesFrom" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions"] [node name="RightColorInterpolation" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions"]
editor/display_folded = true
visible = false
margin_top = 110.0 margin_top = 110.0
margin_right = 226.0 margin_right = 226.0
margin_bottom = 124.0
text = "Brush color from"
[node name="InterpolateColor" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions"]
margin_top = 128.0
margin_right = 226.0
margin_bottom = 144.0 margin_bottom = 144.0
[node name="BrushColorLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions/InterpolateColor"] [node name="ColorComesFrom" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions/RightColorInterpolation"]
margin_right = 226.0
margin_bottom = 14.0
text = "Brush color from"
[node name="InterpolateColor" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions/RightColorInterpolation"]
margin_top = 18.0
margin_right = 226.0
margin_bottom = 34.0
[node name="BrushColorLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions/RightColorInterpolation/InterpolateColor"]
margin_top = 1.0 margin_top = 1.0
margin_right = 9.0 margin_right = 9.0
margin_bottom = 15.0 margin_bottom = 15.0
rect_pivot_offset = Vector2( -90, -47 ) rect_pivot_offset = Vector2( -90, -47 )
text = "B" text = "B"
[node name="RightInterpolateFactor" type="HSlider" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions/InterpolateColor"] [node name="RightInterpolateFactor" type="HSlider" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions/RightColorInterpolation/InterpolateColor"]
margin_left = 13.0 margin_left = 13.0
margin_right = 214.0 margin_right = 214.0
margin_bottom = 16.0 margin_bottom = 16.0
@ -600,7 +608,7 @@ step = 0.01
value = 1.0 value = 1.0
ticks_on_borders = true ticks_on_borders = true
[node name="SelectedColorLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions/InterpolateColor"] [node name="SelectedColorLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions/RightColorInterpolation/InterpolateColor"]
margin_left = 218.0 margin_left = 218.0
margin_top = 1.0 margin_top = 1.0
margin_right = 226.0 margin_right = 226.0
@ -609,9 +617,10 @@ rect_pivot_offset = Vector2( -90, -47 )
text = "C" text = "C"
[node name="Mirroring" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions"] [node name="Mirroring" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions"]
margin_top = 148.0 editor/display_folded = true
margin_top = 110.0
margin_right = 226.0 margin_right = 226.0
margin_bottom = 172.0 margin_bottom = 134.0
[node name="RightHorizontalMirroring" type="CheckBox" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions/Mirroring"] [node name="RightHorizontalMirroring" type="CheckBox" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions/Mirroring"]
margin_right = 109.0 margin_right = 109.0
@ -1392,13 +1401,13 @@ align = 1
[connection signal="toggled" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/LeftIndicatorCheckbox" to="." method="_on_LeftIndicatorCheckbox_toggled"] [connection signal="toggled" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/LeftIndicatorCheckbox" to="." method="_on_LeftIndicatorCheckbox_toggled"]
[connection signal="pressed" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/BrushType/LeftBrushTypeButton" to="." method="_on_LeftBrushTypeButton_pressed"] [connection signal="pressed" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/BrushType/LeftBrushTypeButton" to="." method="_on_LeftBrushTypeButton_pressed"]
[connection signal="value_changed" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/BrushSize/LeftBrushSizeEdit" to="." method="_on_LeftBrushSizeEdit_value_changed"] [connection signal="value_changed" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/BrushSize/LeftBrushSizeEdit" to="." method="_on_LeftBrushSizeEdit_value_changed"]
[connection signal="value_changed" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/InterpolateColor/LeftInterpolateFactor" to="." method="_on_LeftInterpolateFactor_value_changed"] [connection signal="value_changed" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/LeftColorInterpolation/InterpolateColor/LeftInterpolateFactor" to="." method="_on_LeftInterpolateFactor_value_changed"]
[connection signal="toggled" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/Mirroring/LeftHorizontalMirroring" to="." method="_on_LeftHorizontalMirroring_toggled"] [connection signal="toggled" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/Mirroring/LeftHorizontalMirroring" to="." method="_on_LeftHorizontalMirroring_toggled"]
[connection signal="toggled" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/Mirroring/LeftVerticalMirroring" to="." method="_on_LeftVerticalMirroring_toggled"] [connection signal="toggled" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/Mirroring/LeftVerticalMirroring" to="." method="_on_LeftVerticalMirroring_toggled"]
[connection signal="toggled" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions/RightIndicatorCheckbox" to="." method="_on_RightIndicatorCheckbox_toggled"] [connection signal="toggled" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions/RightIndicatorCheckbox" to="." method="_on_RightIndicatorCheckbox_toggled"]
[connection signal="pressed" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions/BrushType/RightBrushTypeButton" to="." method="_on_RightBrushTypeButton_pressed"] [connection signal="pressed" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions/BrushType/RightBrushTypeButton" to="." method="_on_RightBrushTypeButton_pressed"]
[connection signal="value_changed" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions/BrushSize/RightBrushSizeEdit" to="." method="_on_RightBrushSizeEdit_value_changed"] [connection signal="value_changed" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions/BrushSize/RightBrushSizeEdit" to="." method="_on_RightBrushSizeEdit_value_changed"]
[connection signal="value_changed" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions/InterpolateColor/RightInterpolateFactor" to="." method="_on_RightInterpolateFactor_value_changed"] [connection signal="value_changed" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions/RightColorInterpolation/InterpolateColor/RightInterpolateFactor" to="." method="_on_RightInterpolateFactor_value_changed"]
[connection signal="toggled" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions/Mirroring/RightHorizontalMirroring" to="." method="_on_RightHorizontalMirroring_toggled"] [connection signal="toggled" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions/Mirroring/RightHorizontalMirroring" to="." method="_on_RightHorizontalMirroring_toggled"]
[connection signal="toggled" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions/Mirroring/RightVerticalMirroring" to="." method="_on_RightVerticalMirroring_toggled"] [connection signal="toggled" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions/Mirroring/RightVerticalMirroring" to="." method="_on_RightVerticalMirroring_toggled"]
[connection signal="pressed" from="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HorizontalRuler" to="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HorizontalRuler" method="_on_HorizontalRuler_pressed"] [connection signal="pressed" from="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HorizontalRuler" to="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HorizontalRuler" method="_on_HorizontalRuler_pressed"]

4
Scripts/BrushButton.gd
View file

@ -9,11 +9,13 @@ func _on_BrushButton_pressed() -> void:
Global.current_left_brush_type = brush_type Global.current_left_brush_type = brush_type
Global.custom_left_brush_index = custom_brush_index Global.custom_left_brush_index = custom_brush_index
if custom_brush_index > -1: #Custom brush if custom_brush_index > -1: #Custom brush
Global.left_color_interpolation_container.visible = true
if hint_tooltip == "": if hint_tooltip == "":
Global.left_brush_type_label.text = "Custom brush" Global.left_brush_type_label.text = "Custom brush"
else: else:
Global.left_brush_type_label.text = "Brush: %s" % hint_tooltip Global.left_brush_type_label.text = "Brush: %s" % hint_tooltip
else: #Pixel brush else: #Pixel brush
Global.left_color_interpolation_container.visible = false
Global.left_brush_type_label.text = "Brush: Pixel" Global.left_brush_type_label.text = "Brush: Pixel"
Global.update_left_custom_brush() Global.update_left_custom_brush()
@ -22,11 +24,13 @@ func _on_BrushButton_pressed() -> void:
Global.current_right_brush_type = brush_type Global.current_right_brush_type = brush_type
Global.custom_right_brush_index = custom_brush_index Global.custom_right_brush_index = custom_brush_index
if custom_brush_index > -1: if custom_brush_index > -1:
Global.right_color_interpolation_container.visible = true
if hint_tooltip == "": if hint_tooltip == "":
Global.right_brush_type_label.text = "Custom brush" Global.right_brush_type_label.text = "Custom brush"
else: else:
Global.right_brush_type_label.text = "Brush: %s" % hint_tooltip Global.right_brush_type_label.text = "Brush: %s" % hint_tooltip
else: #Pixel brush else: #Pixel brush
Global.right_color_interpolation_container.visible = false
Global.right_brush_type_label.text = "Brush: Pixel" Global.right_brush_type_label.text = "Brush: Pixel"
Global.update_right_custom_brush() Global.update_right_custom_brush()

4
Scripts/Global.gd
View file

@ -51,6 +51,8 @@ var left_brush_type_label : Label
var right_brush_type_label : Label var right_brush_type_label : Label
var left_brush_size_edit : SpinBox var left_brush_size_edit : SpinBox
var right_brush_size_edit : SpinBox var right_brush_size_edit : SpinBox
var left_color_interpolation_container : Container
var right_color_interpolation_container : Container
var left_interpolate_slider : HSlider var left_interpolate_slider : HSlider
var right_interpolate_slider : HSlider var right_interpolate_slider : HSlider
@ -139,6 +141,8 @@ func _ready() -> void:
right_brush_type_label = find_node_by_name(root, "RightBrushTypeLabel") right_brush_type_label = find_node_by_name(root, "RightBrushTypeLabel")
left_brush_size_edit = find_node_by_name(root, "LeftBrushSizeEdit") left_brush_size_edit = find_node_by_name(root, "LeftBrushSizeEdit")
right_brush_size_edit = find_node_by_name(root, "RightBrushSizeEdit") right_brush_size_edit = find_node_by_name(root, "RightBrushSizeEdit")
left_color_interpolation_container = find_node_by_name(root, "LeftColorInterpolation")
right_color_interpolation_container = find_node_by_name(root, "RightColorInterpolation")
left_interpolate_slider = find_node_by_name(root, "LeftInterpolateFactor") left_interpolate_slider = find_node_by_name(root, "LeftInterpolateFactor")
right_interpolate_slider = find_node_by_name(root, "RightInterpolateFactor") right_interpolate_slider = find_node_by_name(root, "RightInterpolateFactor")