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

Gradient presets can now be deleted by right/middle mouse clicking on them in the presets menu

Browse source
This commit is contained in:
Emmanouil Papadeas 2025-01-19 02:23:03 +02:00
parent ddf704c336
commit 0809dc2dcf
2 changed files with 87 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

106
src/UI/Nodes/GradientEdit.gd
View file

@ -21,14 +21,15 @@ var active_cursor: GradientCursor: ## Showing a color picker popup to change a
i.queue_redraw() i.queue_redraw()
var texture := GradientTexture2D.new() var texture := GradientTexture2D.new()
var gradient := Gradient.new() var gradient := Gradient.new()
var presets: Array[Gradient] = [] var presets: Array[Preset] = []
@onready var x_offset: float = size.x - GradientCursor.WIDTH @onready var x_offset: float = size.x - GradientCursor.WIDTH
@onready var offset_value_slider := %OffsetValueSlider as ValueSlider @onready var offset_value_slider := %OffsetValueSlider as ValueSlider
@onready var interpolation_option_button: OptionButton = %InterpolationOptionButton @onready var interpolation_option_button: OptionButton = %InterpolationOptionButton
@onready var color_space_option_button: OptionButton = %ColorSpaceOptionButton @onready var color_space_option_button: OptionButton = %ColorSpaceOptionButton
@onready var tools_menu_button: MenuButton = %ToolsMenuButton @onready var tools_menu_button: MenuButton = %ToolsMenuButton
@onready var presets_menu_button: MenuButton = %PresetsMenuButton @onready var preset_list_button: Button = %PresetListButton
@onready var presets_container: VBoxContainer = %PresetsContainer
@onready var texture_rect := $TextureRect as TextureRect @onready var texture_rect := $TextureRect as TextureRect
@onready var color_picker := $Popup.get_node("ColorPicker") as ColorPicker @onready var color_picker := $Popup.get_node("ColorPicker") as ColorPicker
@onready var divide_dialog := $DivideConfirmationDialog as ConfirmationDialog @onready var divide_dialog := $DivideConfirmationDialog as ConfirmationDialog
@ -136,17 +137,17 @@ class GradientCursor:
set_color(data) set_color(data)
class Preset:
var gradient: Gradient
var file_name := ""
func _init(_gradient: Gradient, _file_name := "") -> void:
gradient = _gradient
file_name = _file_name
func _init() -> void: func _init() -> void:
texture.gradient = gradient texture.gradient = gradient
presets.append(Gradient.new()) # Left to right
presets.append(Gradient.new()) # Left to transparent
presets.append(Gradient.new()) # Black to white
for file_name in DirAccess.get_files_at(GRADIENT_DIR):
var file := FileAccess.open(GRADIENT_DIR.path_join(file_name), FileAccess.READ)
var json := file.get_as_text()
var dict = JSON.parse_string(json)
if typeof(dict) == TYPE_DICTIONARY:
presets.append(deserialize_gradient(dict))
func _ready() -> void: func _ready() -> void:
@ -155,12 +156,6 @@ func _ready() -> void:
interpolation_option_button.select(gradient.interpolation_mode) interpolation_option_button.select(gradient.interpolation_mode)
color_space_option_button.select(gradient.interpolation_color_space) color_space_option_button.select(gradient.interpolation_color_space)
tools_menu_button.get_popup().index_pressed.connect(_on_tools_menu_button_index_pressed) tools_menu_button.get_popup().index_pressed.connect(_on_tools_menu_button_index_pressed)
presets_menu_button.get_popup().index_pressed.connect(_on_presets_menu_button_index_pressed)
for preset in presets:
var grad_texture := GradientTexture2D.new()
grad_texture.height = 32
grad_texture.gradient = preset
presets_menu_button.get_popup().add_icon_item(grad_texture, "")
func _create_cursors() -> void: func _create_cursors() -> void:
@ -301,12 +296,31 @@ func _on_tools_menu_button_index_pressed(index: int) -> void:
divide_dialog.popup_centered() divide_dialog.popup_centered()
func _initialize_presets() -> void:
presets.clear()
for child in presets_container.get_children():
child.queue_free()
presets.append(Preset.new(Gradient.new())) # Left to right
presets.append(Preset.new(Gradient.new())) # Left to transparent
presets.append(Preset.new(Gradient.new())) # Black to white
# Update left to right and left to transparent gradients
presets[0].gradient.set_color(0, Tools.get_assigned_color(MOUSE_BUTTON_LEFT))
presets[0].gradient.set_color(1, Tools.get_assigned_color(MOUSE_BUTTON_RIGHT))
presets[1].gradient.set_color(0, Tools.get_assigned_color(MOUSE_BUTTON_LEFT))
presets[1].gradient.set_color(1, Color(0, 0, 0, 0))
for file_name in DirAccess.get_files_at(GRADIENT_DIR):
var full_file_name := GRADIENT_DIR.path_join(file_name)
var file := FileAccess.open(full_file_name, FileAccess.READ)
var json := file.get_as_text()
var dict = JSON.parse_string(json)
if typeof(dict) == TYPE_DICTIONARY:
var preset_gradient := deserialize_gradient(dict)
presets.append(Preset.new(preset_gradient, full_file_name))
for preset in presets:
_create_preset_button(preset)
func _on_save_to_presets_button_pressed() -> void: func _on_save_to_presets_button_pressed() -> void:
presets.append(gradient)
var grad_texture := GradientTexture2D.new()
grad_texture.height = 32
grad_texture.gradient = gradient
presets_menu_button.get_popup().add_icon_item(grad_texture, "")
if not DirAccess.dir_exists_absolute(GRADIENT_DIR): if not DirAccess.dir_exists_absolute(GRADIENT_DIR):
DirAccess.make_dir_absolute(GRADIENT_DIR) DirAccess.make_dir_absolute(GRADIENT_DIR)
var json := JSON.stringify(serialize_gradient(gradient)) var json := JSON.stringify(serialize_gradient(gradient))
@ -315,20 +329,44 @@ func _on_save_to_presets_button_pressed() -> void:
file.store_string(json) file.store_string(json)
func _on_presets_menu_button_about_to_popup() -> void: func _on_preset_list_button_pressed() -> void:
# Update left to right and left to transparent gradients _initialize_presets()
presets[0].set_color(0, Tools.get_assigned_color(MOUSE_BUTTON_LEFT)) var popup_panel := preset_list_button.get_child(0) as PopupPanel
presets[0].set_color(1, Tools.get_assigned_color(MOUSE_BUTTON_RIGHT)) var popup_position := preset_list_button.get_screen_position()
presets[1].set_color(0, Tools.get_assigned_color(MOUSE_BUTTON_LEFT)) popup_position.y += preset_list_button.size.y + 4
presets[1].set_color(1, Color(0, 0, 0, 0)) popup_panel.popup(Rect2i(popup_position, Vector2i.ONE))
func _on_presets_menu_button_index_pressed(index: int) -> void: func _create_preset_button(preset: Preset) -> void:
var item_icon := presets_menu_button.get_popup().get_item_icon(index) as GradientTexture2D var grad_texture := GradientTexture2D.new()
gradient = item_icon.gradient.duplicate() grad_texture.height = 32
texture.gradient = gradient grad_texture.gradient = preset.gradient
_create_cursors() var gradient_button := Button.new()
updated.emit(gradient, continuous_change) gradient_button.icon = grad_texture
gradient_button.gui_input.connect(_on_preset_button_gui_input.bind(preset))
presets_container.add_child(gradient_button)
func _on_preset_button_gui_input(event: InputEvent, preset: Preset) -> void:
if event is not InputEventMouseButton:
return
if event.pressed:
return
if event.button_index == MOUSE_BUTTON_LEFT: # Select preset
gradient = preset.gradient.duplicate()
texture.gradient = gradient
_create_cursors()
updated.emit(gradient, continuous_change)
var popup_panel := preset_list_button.get_child(0) as PopupPanel
popup_panel.hide()
elif event.button_index == MOUSE_BUTTON_RIGHT or event.button_index == MOUSE_BUTTON_MIDDLE:
# Remove preset
if preset.file_name.is_empty():
return
DirAccess.remove_absolute(preset.file_name)
presets.erase(preset)
var button := presets_container.get_child(presets.find(preset)) as Button
button.queue_free()
func _on_DivideConfirmationDialog_confirmed() -> void: func _on_DivideConfirmationDialog_confirmed() -> void:

18
src/UI/Nodes/GradientEdit.tscn
View file

@ -84,13 +84,25 @@ tooltip_text = "Save to presets"
mouse_default_cursor_shape = 2 mouse_default_cursor_shape = 2
icon = ExtResource("4_b5s6b") icon = ExtResource("4_b5s6b")
[node name="PresetsMenuButton" type="MenuButton" parent="InterpolationContainer"] [node name="PresetListButton" type="Button" parent="InterpolationContainer"]
unique_name_in_owner = true unique_name_in_owner = true
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
mouse_default_cursor_shape = 2 mouse_default_cursor_shape = 2
text = "Presets" text = "Presets"
flat = false
[node name="PopupPanel" type="PopupPanel" parent="InterpolationContainer/PresetListButton"]
[node name="ScrollContainer" type="ScrollContainer" parent="InterpolationContainer/PresetListButton/PopupPanel"]
custom_minimum_size = Vector2(100, 150)
offset_left = 4.0
offset_top = 4.0
offset_right = 104.0
offset_bottom = 154.0
[node name="PresetsContainer" type="VBoxContainer" parent="InterpolationContainer/PresetListButton/PopupPanel/ScrollContainer"]
unique_name_in_owner = true
layout_mode = 2
[node name="TextureRect" type="TextureRect" parent="."] [node name="TextureRect" type="TextureRect" parent="."]
custom_minimum_size = Vector2(0, 30) custom_minimum_size = Vector2(0, 30)
@ -148,6 +160,6 @@ text = "Add point at the end"
[connection signal="item_selected" from="InterpolationContainer/InterpolationOptionButton" to="." method="_on_InterpolationOptionButton_item_selected"] [connection signal="item_selected" from="InterpolationContainer/InterpolationOptionButton" to="." method="_on_InterpolationOptionButton_item_selected"]
[connection signal="item_selected" from="InterpolationContainer/ColorSpaceOptionButton" to="." method="_on_color_space_option_button_item_selected"] [connection signal="item_selected" from="InterpolationContainer/ColorSpaceOptionButton" to="." method="_on_color_space_option_button_item_selected"]
[connection signal="pressed" from="InterpolationContainer/SaveToPresetsButton" to="." method="_on_save_to_presets_button_pressed"] [connection signal="pressed" from="InterpolationContainer/SaveToPresetsButton" to="." method="_on_save_to_presets_button_pressed"]
[connection signal="about_to_popup" from="InterpolationContainer/PresetsMenuButton" to="." method="_on_presets_menu_button_about_to_popup"] [connection signal="pressed" from="InterpolationContainer/PresetListButton" to="." method="_on_preset_list_button_pressed"]
[connection signal="color_changed" from="Popup/ColorPicker" to="." method="_on_ColorPicker_color_changed"] [connection signal="color_changed" from="Popup/ColorPicker" to="." method="_on_ColorPicker_color_changed"]
[connection signal="confirmed" from="DivideConfirmationDialog" to="." method="_on_DivideConfirmationDialog_confirmed"] [connection signal="confirmed" from="DivideConfirmationDialog" to="." method="_on_DivideConfirmationDialog_confirmed"]