Brush Selection Fix

This commit is contained in:
luiq54 2020-04-17 22:33:52 +05:30
parent a552cbe8ee
commit 73891af597
4 changed files with 9 additions and 0 deletions

View file

@ -4,6 +4,7 @@ export var brush_type = 0 # Global.Brush_Types.PIXEL
export var custom_brush_index := -3
# warning-ignore:unused_class_variable
var random_brushes := []
signal brush_selected
func _on_BrushButton_pressed() -> void:
# Delete the brush on middle mouse press
@ -33,6 +34,7 @@ func _on_BrushButton_pressed() -> void:
# Global.left_brush_type_label.text = tr("Brush: Filled Circle")
Global.update_left_custom_brush()
emit_signal("brush_selected")
else: # Change right brush
Global.current_right_brush_type = brush_type
@ -55,6 +57,7 @@ func _on_BrushButton_pressed() -> void:
# Global.right_brush_type_label.text = tr("Brush: Filled Circle")
Global.update_right_custom_brush()
emit_signal("brush_selected")
func _on_DeleteButton_pressed() -> void:
if brush_type == Global.Brush_Types.CUSTOM:

View file

@ -785,6 +785,7 @@ func create_brush_button(brush_img : Image, brush_type := Brush_Types.CUSTOM, hi
brush_tex.create_from_image(brush_img, 0)
brush_button.get_child(0).texture = brush_tex
brush_button.hint_tooltip = hint_tooltip
brush_button.connect("brush_selected",control,"_on_Brush_Selected")
if brush_type == Brush_Types.RANDOM_FILE:
brush_button.random_brushes.append(brush_img)
brush_container.add_child(brush_button)

View file

@ -560,6 +560,8 @@ func _on_RightBrushSizeEdit_value_changed(value) -> void:
Global.right_brush_size = new_size
update_right_custom_brush()
func _on_Brush_Selected() -> void:
$BrushesPopup.hide()
func _on_ColorSwitch_pressed() -> void:
var temp: Color = Global.left_color_picker.color