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

Merge branch 'master' into refactoring

Browse source
This commit is contained in:
Manolis Papadeas 2020-06-02 19:58:58 +03:00 • committed by GitHub
commit d8136a3e17
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/Autoload/Import.gd
View file

@ -265,6 +265,7 @@ func import_patterns(priority_ordered_search_path: Array) -> void:
func import_gpl(path : String) -> Palette:
# Refer to app/core/gimppalette-load.c of the GIMP for the "living spec"
var result : Palette = null
var file = File.new()
if file.file_exists(path):
@ -280,6 +281,8 @@ func import_gpl(path : String) -> Palette:
break
else:
result = Palette.new()
# Use filename as palette name in case reading old
# palette format (must read more to determine)
var name_start = path.find_last('/') + 1
var name_end = path.find_last('.')
if name_end > name_start:
@ -288,15 +291,27 @@ func import_gpl(path : String) -> Palette:
# Comments
if line.begins_with('#'):
comments += line.trim_prefix('#') + '\n'
# Some programs output palette name in a comment for old format
if line.begins_with("#Palette Name: "):
result.name = line.replace("#Palette Name: ", "")
pass
elif line_number > 0 && line.length() >= 12:
elif line.begins_with("Name: "):
result.name = line.replace("Name: ", "")
pass
elif line.begins_with("Columns: "):
# Number of colors in this palette. Unecessary and often wrong
pass
elif line_number > 0 && line.length() >= 9:
line = line.replace("\t", " ")
var color_data : PoolStringArray = line.split(" ", false, 4)
var red : float = color_data[0].to_float() / 255.0
var green : float = color_data[1].to_float() / 255.0
var blue : float = color_data[2].to_float() / 255.0
var color = Color(red, green, blue)
result.add_color(color, color_data[3])
if color_data.size() >= 4:
result.add_color(color, color_data[3])
else:
result.add_color(color)
line_number += 1
if result:

3
src/Main.gd
View file

@ -68,8 +68,7 @@ func _input(event : InputEvent) -> void:
func setup_application_window_size() -> void:
# Set a minimum window size to prevent UI elements from collapsing on each other.
# This property is only available in 3.2alpha or later, so use `set()` to fail gracefully if it doesn't exist.
OS.set("min_window_size", Vector2(1024, 576))
OS.min_window_size = Vector2(1024, 576)
# Restore the window position/size if values are present in the configuration cache
if Global.config_cache.has_section_key("window", "screen"):