tonytins/CozyPixelStudio
1
0
Fork 0
mirror of https://github.com/tonytins/CozyPixelStudio.git synced 2025-06-25 15:54:44 -04:00
Code Issues Projects Releases Wiki Activity

Changes to the tool options UI

Browse source 
New option for the color picker tool (closes #115 - also includes new translatable strings), VSplitContainer for the tools and their options and a ScrollContainer for the tool options.
This commit is contained in:
OverloadedOrama 2020-01-10 22:44:29 +02:00
parent 60422c0133
commit 5cce9d3180
15 changed files with 514 additions and 311 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Scripts/Canvas.gd
View file

@ -107,6 +107,7 @@ func _input(event : InputEvent) -> void:
# For the LightenDarken tool
var ld := 0
var ld_amount := 0.1
var color_picker_for := 0
west_limit = location.x
east_limit = location.x + size.x
@ -125,6 +126,7 @@ func _input(event : InputEvent) -> void:
fill_area = Global.left_fill_area
ld = Global.left_ld
ld_amount = Global.left_ld_amount
color_picker_for = Global.left_color_picker_for
elif Input.is_mouse_button_pressed(BUTTON_RIGHT):
current_mouse_button = "right_mouse"
current_action = Global.current_right_tool
@ -132,6 +134,7 @@ func _input(event : InputEvent) -> void:
fill_area = Global.right_fill_area
ld = Global.right_ld
ld_amount = Global.right_ld_amount
color_picker_for = Global.right_color_picker_for
if Global.current_frame == frame:
if mouse_in_canvas && Global.has_focus:
@ -251,10 +254,10 @@ func _input(event : InputEvent) -> void:
"ColorPicker":
if can_handle && Global.current_frame == frame:
var pixel_color : Color = layers[current_layer_index][0].get_pixelv(mouse_pos)
if current_mouse_button == "left_mouse":
if color_picker_for == 0: # Pick for the left color
Global.left_color_picker.color = pixel_color
Global.update_left_custom_brush()
elif current_mouse_button == "right_mouse":
elif color_picker_for == 1: # Pick for the left color
Global.right_color_picker.color = pixel_color
Global.update_right_custom_brush()