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

Updated remove button to be disabled for default palettes

Browse source
This commit is contained in:
CheetoHead 2019-12-16 10:48:23 -05:00
parent 5ba89fddbd
commit 388352467b
3 changed files with 32 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
Main.tscn
View file

File diff suppressed because one or more lines are too long

26
Scripts/PaletteContainer.gd
View file

@ -21,15 +21,22 @@ func on_palette_select(palette_name : String) -> void:
_clear_swatches()
if Global.palettes.has(palette_name): #Palette exists in memory
current_palette = palette_name
_display_palette(Global.palettes[palette_name])
var palette : Dictionary = Global.palettes[palette_name]
Global.remove_palette_button.disabled = true # Cannot remove by default
if(palette.has("editable")):
if(palette.editable):
Global.remove_palette_button.disabled = false # Can remove if custom palette
_display_palette(palette)
else: #Use default on fail
current_palette = "Default"
_display_palette(Global.palettes["Default"])
func _display_palette(palette : Array) -> void:
func _display_palette(palette : Dictionary) -> void:
var index := 0
for color_data in palette:
for color_data in palette.colors:
var color = Color(color_data.data)
var new_button = palette_button.instance()
@ -41,7 +48,7 @@ func _display_palette(palette : Array) -> void:
index += 1
func on_color_select(index : int) -> void:
var color = Color(Global.palettes[current_palette][index].data)
var color = Color(Global.palettes[current_palette].colors[index].data)
if Input.is_action_just_released("left_mouse"):
Global.left_color_picker.color = color
@ -104,22 +111,17 @@ func load_palette(path : String) -> String:
var data = result_json.result
if data.has("name"): #If data is 'valid' palette file
palette_name = data.name
Global.palettes[data.name] = data.colors
Global.palettes[data.name] = data
file.close()
return palette_name
func _save_palette(palette : Array, name : String, path : String) -> void:
func _save_palette(palette : Dictionary, name : String, path : String) -> void:
# Open file for writing
var file := File.new()
file.open(path, File.WRITE)
# Create palette data
var data := {}
data.name = name
data.colors = palette
# Write palette data to file
file.store_string(JSON.print(data))
file.store_string(JSON.print(palette))
file.close()

3
project.godot
View file

@ -33,7 +33,6 @@ _global_script_class_icons={
[application]
config/name="Pixelorama"
config/description="A free & open-source 2D sprite editor"
run/main_scene="res://Main.tscn"
boot_splash/image="res://splash.png"
boot_splash/bg_color=Color( 0.145098, 0.145098, 0.164706, 1 )
@ -188,7 +187,7 @@ shift={
[locale]
translations=PoolStringArray( "res://Translations/#Translations.en.translation", "res://Translations/#Translations.el.translation", "res://Translations/#Translations.fr.translation", "res://Translations/#Translations.de.translation", "res://Translations/#Translations.pl.translation" )
translations=PoolStringArray( "res://Translations/#Translations.en.translation", "res://Translations/#Translations.el.translation", "res://Translations/#Translations.fr.translation", "res://Translations/#Translations.de.translation" )
locale_filter=[ 0, [ ] ]
[rendering]