mirrors/Pixel-Composer
1
0
Fork 0
mirror of https://github.com/Ttanasart-pt/Pixel-Composer.git synced 2024-12-24 14:06:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Gradient, Palette save/load bug

Browse source
This commit is contained in:
Tanasart 2023-05-30 11:09:15 +02:00
parent 2e9534c2b0
commit 9098674d00
6 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
objects/o_dialog_gradient/Draw_64.gml
View file

@ -73,9 +73,8 @@ if !ready exit;
bx -= ui(32); bx -= ui(32);
if(buttonInstant(THEME.button_hide, bx, by, ui(28), ui(28), mouse_ui, sFOCUS, sHOVER, "Open gradient folder", THEME.folder) == 2) { if(buttonInstant(THEME.button_hide, bx, by, ui(28), ui(28), mouse_ui, sFOCUS, sHOVER, "Open gradient folder", THEME.folder) == 2) {
var _realpath = environment_get_variable("LOCALAPPDATA") + "/Pixels_Composer/Gradients"; var _realpath = DIRECTORY + "Gradients";
var _windir = environment_get_variable("WINDIR") + "/explorer.exe"; shellOpenExplorer(_realpath)
execute_shell(_windir, _realpath);
} }
bx -= ui(32); bx -= ui(32);
#endregion #endregion

5
objects/o_dialog_palette/Draw_64.gml
View file

@ -66,9 +66,8 @@ if palette == 0 exit;
bx -= ui(32); bx -= ui(32);
if(buttonInstant(THEME.button_hide, bx, by, ui(28), ui(28), mouse_ui, sFOCUS, sHOVER, get_text("color_selector_open_palette", "Open palette folder"), THEME.folder) == 2) { if(buttonInstant(THEME.button_hide, bx, by, ui(28), ui(28), mouse_ui, sFOCUS, sHOVER, get_text("color_selector_open_palette", "Open palette folder"), THEME.folder) == 2) {
var _realpath = environment_get_variable("LOCALAPPDATA") + "/Pixels_Composer/Palettes"; var _realpath = DIRECTORY + "Palettes";
var _windir = environment_get_variable("WINDIR") + "/explorer.exe"; shellOpenExplorer(_realpath)
execute_shell(_windir, _realpath);
} }
draw_sprite_ui_uniform(THEME.folder, 0, bx + ui(14), by + ui(14), 1, COLORS._main_icon); draw_sprite_ui_uniform(THEME.folder, 0, bx + ui(14), by + ui(14), 1, COLORS._main_icon);
bx -= ui(32); bx -= ui(32);

5
scripts/array_functions/array_functions.gml
View file

@ -37,6 +37,11 @@ function array_safe_get(arr, index, def = 0, overflow = ARRAY_OVERFLOW._default)
return arr[index]; return arr[index];
} }
function array_push_create(arr, val) {
if(!is_array(arr)) return [ val ];
array_push(arr, val);
return arr;
}
function array_exists(arr, val) { function array_exists(arr, val) {
for( var i = 0; i < array_length(arr); i++ ) { for( var i = 0; i < array_length(arr); i++ ) {

5
scripts/gradients_function/gradients_function.gml
View file

@ -172,12 +172,12 @@ function loadGradient(path) {
var _t = file_text_open_read(path); var _t = file_text_open_read(path);
while(!file_text_eof(_t)) { while(!file_text_eof(_t)) {
var key = file_text_readln(_t); var key = string_trim(file_text_readln(_t));
var _col = 0, _pos = 0; var _col = 0, _pos = 0;
if(string_pos(",", key)) { if(string_pos(",", key)) {
var keys = string_splice(key, ","); var keys = string_splice(key, ",");
if(array_length(keys) != 2) continue; if(array_length(keys) < 2) continue;
_col = toNumber(keys[0]); _col = toNumber(keys[0]);
_pos = toNumber(keys[1]); _pos = toNumber(keys[1]);
@ -190,5 +190,6 @@ function loadGradient(path) {
array_push(grad.keys, new gradientKey(_pos, _col)); array_push(grad.keys, new gradientKey(_pos, _col));
} }
file_text_close(_t); file_text_close(_t);
return grad; return grad;
} }

2
scripts/load_palette/load_palette.gml
View file

@ -21,7 +21,7 @@ function loadPalette(path) {
if(string_char_at(_w, 1) == "#") break; if(string_char_at(_w, 1) == "#") break;
var _c = string_splice(_w, " "); var _c = string_splice(_w, " ");
if(array_length(_c) >= 3) if(array_length(_c) >= 3)
pal[_index++] = make_color_rgb(toString(_c[0]), toString(_c[1]), toString(_c[2])); pal[_index++] = make_color_rgb(toNumber(_c[0]), toNumber(_c[1]), toNumber(_c[2]));
break; break;
} }
} }

2
scripts/panel_collection/panel_collection.gml
View file

@ -330,7 +330,7 @@ function Panel_Collection() : PanelContent() constructor {
} }
function refreshContext() { function refreshContext() {
context.scan([".json", ".pxcc"]); context.scan([ ".json", ".pxcc", ".png", ".jpg", ".gif" ]);
if(STEAM_ENABLED) if(STEAM_ENABLED)
steamUCGload(); steamUCGload();