mirrors/Pixel-Composer
1
0
Fork 0
mirror of https://github.com/Ttanasart-pt/Pixel-Composer.git synced 2025-01-23 03:18:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

- [Theme] Fix crash when loading custom themes.

Browse source
This commit is contained in:
Tanasart 2024-08-06 09:30:00 +07:00
parent 0b99d464ec
commit 5e4c5bff0c
74 changed files with 155 additions and 508 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
PixelComposer.resource_order
View file

@ -2587,11 +2587,10 @@
{"name":"s_trophy","order":202,"path":"sprites/s_trophy/s_trophy.yy",}, {"name":"s_trophy","order":202,"path":"sprites/s_trophy/s_trophy.yy",},
{"name":"s_tunnel","order":203,"path":"sprites/s_tunnel/s_tunnel.yy",}, {"name":"s_tunnel","order":203,"path":"sprites/s_tunnel/s_tunnel.yy",},
{"name":"s_ui_base_white","order":2,"path":"sprites/s_ui_base_white/s_ui_base_white.yy",}, {"name":"s_ui_base_white","order":2,"path":"sprites/s_ui_base_white/s_ui_base_white.yy",},
{"name":"s_ui_panel_active","order":28,"path":"sprites/s_ui_panel_active/s_ui_panel_active.yy",},
{"name":"s_ui_panel_bg","order":29,"path":"sprites/s_ui_panel_bg/s_ui_panel_bg.yy",}, {"name":"s_ui_panel_bg","order":29,"path":"sprites/s_ui_panel_bg/s_ui_panel_bg.yy",},
{"name":"s_ui_panel_fg","order":30,"path":"sprites/s_ui_panel_fg/s_ui_panel_fg.yy",},
{"name":"s_ui_panel_selection","order":32,"path":"sprites/s_ui_panel_selection/s_ui_panel_selection.yy",}, {"name":"s_ui_panel_selection","order":32,"path":"sprites/s_ui_panel_selection/s_ui_panel_selection.yy",},
{"name":"s_ui_panel_tab","order":33,"path":"sprites/s_ui_panel_tab/s_ui_panel_tab.yy",}, {"name":"s_ui_panel_tab","order":33,"path":"sprites/s_ui_panel_tab/s_ui_panel_tab.yy",},
{"name":"s_ui_panel","order":46,"path":"sprites/s_ui_panel/s_ui_panel.yy",},
{"name":"s_ui_scroll_bar","order":34,"path":"sprites/s_ui_scroll_bar/s_ui_scroll_bar.yy",}, {"name":"s_ui_scroll_bar","order":34,"path":"sprites/s_ui_scroll_bar/s_ui_scroll_bar.yy",},
{"name":"s_ui_selection_range_hori","order":36,"path":"sprites/s_ui_selection_range_hori/s_ui_selection_range_hori.yy",}, {"name":"s_ui_selection_range_hori","order":36,"path":"sprites/s_ui_selection_range_hori/s_ui_selection_range_hori.yy",},
{"name":"s_ui_selection_range_sim_hori","order":37,"path":"sprites/s_ui_selection_range_sim_hori/s_ui_selection_range_sim_hori.yy",}, {"name":"s_ui_selection_range_sim_hori","order":37,"path":"sprites/s_ui_selection_range_sim_hori/s_ui_selection_range_sim_hori.yy",},

3
PixelComposer.yyp
View file

@ -3328,11 +3328,10 @@
{"id":{"name":"s_trophy","path":"sprites/s_trophy/s_trophy.yy",},}, {"id":{"name":"s_trophy","path":"sprites/s_trophy/s_trophy.yy",},},
{"id":{"name":"s_tunnel","path":"sprites/s_tunnel/s_tunnel.yy",},}, {"id":{"name":"s_tunnel","path":"sprites/s_tunnel/s_tunnel.yy",},},
{"id":{"name":"s_ui_base_white","path":"sprites/s_ui_base_white/s_ui_base_white.yy",},}, {"id":{"name":"s_ui_base_white","path":"sprites/s_ui_base_white/s_ui_base_white.yy",},},
{"id":{"name":"s_ui_panel_active","path":"sprites/s_ui_panel_active/s_ui_panel_active.yy",},},
{"id":{"name":"s_ui_panel_bg","path":"sprites/s_ui_panel_bg/s_ui_panel_bg.yy",},}, {"id":{"name":"s_ui_panel_bg","path":"sprites/s_ui_panel_bg/s_ui_panel_bg.yy",},},
{"id":{"name":"s_ui_panel_fg","path":"sprites/s_ui_panel_fg/s_ui_panel_fg.yy",},},
{"id":{"name":"s_ui_panel_selection","path":"sprites/s_ui_panel_selection/s_ui_panel_selection.yy",},}, {"id":{"name":"s_ui_panel_selection","path":"sprites/s_ui_panel_selection/s_ui_panel_selection.yy",},},
{"id":{"name":"s_ui_panel_tab","path":"sprites/s_ui_panel_tab/s_ui_panel_tab.yy",},}, {"id":{"name":"s_ui_panel_tab","path":"sprites/s_ui_panel_tab/s_ui_panel_tab.yy",},},
{"id":{"name":"s_ui_panel","path":"sprites/s_ui_panel/s_ui_panel.yy",},},
{"id":{"name":"s_ui_scroll_bar","path":"sprites/s_ui_scroll_bar/s_ui_scroll_bar.yy",},}, {"id":{"name":"s_ui_scroll_bar","path":"sprites/s_ui_scroll_bar/s_ui_scroll_bar.yy",},},
{"id":{"name":"s_ui_selection_range_hori","path":"sprites/s_ui_selection_range_hori/s_ui_selection_range_hori.yy",},}, {"id":{"name":"s_ui_selection_range_hori","path":"sprites/s_ui_selection_range_hori/s_ui_selection_range_hori.yy",},},
{"id":{"name":"s_ui_selection_range_sim_hori","path":"sprites/s_ui_selection_range_sim_hori/s_ui_selection_range_sim_hori.yy",},}, {"id":{"name":"s_ui_selection_range_sim_hori","path":"sprites/s_ui_selection_range_sim_hori/s_ui_selection_range_sim_hori.yy",},},

BIN
datafiles/data/Theme.zip
View file

Binary file not shown.

2
objects/o_dialog_assetbox/Create_0.gml
View file

@ -124,7 +124,7 @@ event_inherited();
var _nx = xx + grid_size - 1 - _tw; var _nx = xx + grid_size - 1 - _tw;
var _ny = yy + grid_size - _th; var _ny = yy + grid_size - _th;
draw_sprite_stretched_ext(THEME.timeline_node, 0, _nx, _ny, _tw, _th - 1, COLORS.panel_bg_clear_inner, 0.85); draw_sprite_stretched_ext(THEME.ui_panel, 0, _nx, _ny, _tw, _th - 1, COLORS.panel_bg_clear_inner, 0.85);
draw_text_add(xx + grid_size - ui(3), yy + grid_size + ui(1), _txt); draw_text_add(xx + grid_size - ui(3), yy + grid_size + ui(1), _txt);
} }

2
objects/o_dialog_assetbox/o_dialog_assetbox.yy
View file

@ -3,8 +3,8 @@
"%Name":"o_dialog_assetbox", "%Name":"o_dialog_assetbox",
"eventList":[ "eventList":[
{"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
{"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
{"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":1,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":1,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
{"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
], ],
"managed":true, "managed":true,
"name":"o_dialog_assetbox", "name":"o_dialog_assetbox",

2
objects/o_dialog_color_selector/Create_0.gml
View file

@ -71,7 +71,7 @@ event_inherited();
draw_sprite_stretched(THEME.ui_panel_bg, 3, 0, yy, ww, _height); draw_sprite_stretched(THEME.ui_panel_bg, 3, 0, yy, ww, _height);
if(isHover) { if(isHover) {
draw_sprite_stretched_ext(THEME.ui_panel_fg, 1, 0, yy, ww, _height, COLORS._main_accent, 1); draw_sprite_stretched_ext(THEME.ui_panel, 1, 0, yy, ww, _height, COLORS._main_accent, 1);
sp_presets.hover_content = true; sp_presets.hover_content = true;
} }

2
objects/o_dialog_color_selector/o_dialog_color_selector.yy
View file

@ -3,8 +3,8 @@
"%Name":"o_dialog_color_selector", "%Name":"o_dialog_color_selector",
"eventList":[ "eventList":[
{"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
{"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
{"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":1,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":1,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
{"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
{"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":75,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":75,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
], ],
"managed":true, "managed":true,

2
objects/o_dialog_gradient/Draw_64.gml
View file

@ -125,7 +125,7 @@ if !ready exit;
draw_sprite_stretched(THEME.textbox, 3, gr_x - ui(6), gr_y - ui(6), gr_w + ui(12), gr_h + ui(12)); draw_sprite_stretched(THEME.textbox, 3, gr_x - ui(6), gr_y - ui(6), gr_w + ui(12), gr_h + ui(12));
draw_sprite_stretched(THEME.textbox, 0, gr_x - ui(6), gr_y - ui(6), gr_w + ui(12), gr_h + ui(12)); draw_sprite_stretched(THEME.textbox, 0, gr_x - ui(6), gr_y - ui(6), gr_w + ui(12), gr_h + ui(12));
gradient.draw(gr_x, gr_y, gr_w, gr_h); gradient.draw(gr_x, gr_y, gr_w, gr_h);
draw_sprite_stretched_add(THEME.ui_panel_fg, 1, gr_x, gr_y, gr_w, gr_h, c_white, 0.25); draw_sprite_stretched_add(THEME.ui_panel, 1, gr_x, gr_y, gr_w, gr_h, c_white, 0.25);
var hover = noone; var hover = noone;

2
objects/o_dialog_gradient/o_dialog_gradient.yy
View file

@ -3,8 +3,8 @@
"%Name":"o_dialog_gradient", "%Name":"o_dialog_gradient",
"eventList":[ "eventList":[
{"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
{"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
{"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":1,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":1,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
{"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
{"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":75,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":75,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
], ],
"managed":true, "managed":true,

4
objects/o_dialog_image_array_edit/Create_0.gml
View file

@ -57,13 +57,13 @@ event_inherited();
var xx = pad + (ww + pad) * j; var xx = pad + (ww + pad) * j;
draw_sprite_stretched(THEME.ui_panel_bg, 0, xx, yy, ww, hh); draw_sprite_stretched(THEME.ui_panel_bg, 0, xx, yy, ww, hh);
draw_sprite_stretched_add(THEME.ui_panel_fg, 0, xx, yy, ww, hh, c_white, 0.3); draw_sprite_stretched_add(THEME.ui_panel, 1, xx, yy, ww, hh, c_white, 0.3);
if(sHOVER && sp_content.hover && point_in_rectangle(_m[0], _m[1], xx, yy, xx + ww, yy + hh)) { if(sHOVER && sp_content.hover && point_in_rectangle(_m[0], _m[1], xx, yy, xx + ww, yy + hh)) {
sp_content.hover_content = true; sp_content.hover_content = true;
inb_hover = index; inb_hover = index;
if(dragging == -1 || dragging == index) if(dragging == -1 || dragging == index)
draw_sprite_stretched_ext(THEME.ui_panel_active, 0, xx, yy, ww, hh, COLORS._main_accent, 1); draw_sprite_stretched_ext(THEME.ui_panel, 1, xx, yy, ww, hh, COLORS._main_accent, 1);
if(mouse_press(mb_left, sFOCUS)) if(mouse_press(mb_left, sFOCUS))
dragging = index; dragging = index;

3
objects/o_dialog_menubox/Draw_64.gml
View file

@ -15,7 +15,8 @@ if(!ready) exit;
if(_menuItem == -1) { #region if(_menuItem == -1) { #region
var bx = dialog_x + ui(8); var bx = dialog_x + ui(8);
var bw = dialog_w - ui(16); var bw = dialog_w - ui(16);
draw_sprite_stretched(THEME.menu_separator, 0, bx, yy, bw, ui(6)); draw_set_color(CDEF.main_mdblack);
draw_line_width(bx, yy + ui(3), bx + bw, yy + ui(3), 2);
yy += ui(8); yy += ui(8);
continue; continue;

6
objects/o_dialog_menubox/o_dialog_menubox.yy
View file

@ -2,9 +2,9 @@
"$GMObject":"", "$GMObject":"",
"%Name":"o_dialog_menubox", "%Name":"o_dialog_menubox",
"eventList":[ "eventList":[
{"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
{"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
{"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":1,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":1,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
], ],
"managed":true, "managed":true,
"name":"o_dialog_menubox", "name":"o_dialog_menubox",

8
objects/o_dialog_release_note/Create_0.gml
View file

@ -135,7 +135,7 @@ event_inherited();
draw_sprite_stretched(THEME.ui_panel_bg, 0, xx, yy, ww, hh); draw_sprite_stretched(THEME.ui_panel_bg, 0, xx, yy, ww, hh);
if(dl.status == 0 && hov) { if(dl.status == 0 && hov) {
draw_sprite_stretched_ext(THEME.ui_panel_fg, 1, xx, yy, ww, hh, COLORS._main_accent, 1); draw_sprite_stretched_ext(THEME.ui_panel, 1, xx, yy, ww, hh, COLORS._main_accent, 1);
if(mouse_press(mb_left, sFOCUS)) { if(mouse_press(mb_left, sFOCUS)) {
var path = get_save_filename_ext("Compressed zip (.zip)| *.zip", $"PixelComposer {vr}.zip", "", "Download location"); var path = get_save_filename_ext("Compressed zip (.zip)| *.zip", $"PixelComposer {vr}.zip", "", "Download location");
if(path != "") { if(path != "") {
@ -148,17 +148,17 @@ event_inherited();
} }
} else if(dl.status == 2 && hov) { } else if(dl.status == 2 && hov) {
draw_sprite_stretched_ext(THEME.ui_panel_fg, 1, xx, yy, ww, hh, COLORS._main_accent, 1); draw_sprite_stretched_ext(THEME.ui_panel, 1, xx, yy, ww, hh, COLORS._main_accent, 1);
if(mouse_press(mb_left, sFOCUS)) if(mouse_press(mb_left, sFOCUS))
shellOpenExplorer(filename_dir(dl.download_path)); shellOpenExplorer(filename_dir(dl.download_path));
} else if(dl.status == -1 && hov) { } else if(dl.status == -1 && hov) {
draw_sprite_stretched_ext(THEME.ui_panel_fg, 1, xx, yy, ww, hh, COLORS._main_accent, 1); draw_sprite_stretched_ext(THEME.ui_panel, 1, xx, yy, ww, hh, COLORS._main_accent, 1);
if(mouse_press(mb_left, sFOCUS)) if(mouse_press(mb_left, sFOCUS))
url_open(dl.download_path); url_open(dl.download_path);
} else } else
draw_sprite_stretched_ext(THEME.ui_panel_fg, 1, xx, yy, ww, hh, COLORS.node_display_text_frame_outline, 1); draw_sprite_stretched_ext(THEME.ui_panel, 1, xx, yy, ww, hh, COLORS.node_display_text_frame_outline, 1);
draw_set_text(f_p0b, fa_left, fa_top, dl.status == 2? COLORS._main_text : COLORS._main_text_sub); draw_set_text(f_p0b, fa_left, fa_top, dl.status == 2? COLORS._main_text : COLORS._main_text_sub);
draw_text(xx + ui(8), yy + ui(8), vr); draw_text(xx + ui(8), yy + ui(8), vr);

6
objects/o_dialog_release_note/o_dialog_release_note.yy
View file

@ -2,9 +2,9 @@
"$GMObject":"", "$GMObject":"",
"%Name":"o_dialog_release_note", "%Name":"o_dialog_release_note",
"eventList":[ "eventList":[
{"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
{"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":62,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
{"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":62,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
], ],
"managed":true, "managed":true,
"name":"o_dialog_release_note", "name":"o_dialog_release_note",

3
objects/o_dialog_scrollbox/Create_0.gml
View file

@ -90,7 +90,8 @@ event_inherited();
txt = string_delete(txt, 1, 1); txt = string_delete(txt, 1, 1);
if(data[i] == -1) { if(data[i] == -1) {
draw_sprite_stretched(THEME.menu_separator, 0, ui(8), _ly, _dw - ui(16), ui(6)); draw_set_color(CDEF.main_mdblack);
draw_line_width(ui(8), _ly + ui(3), _dw - ui(8), _ly + ui(3), 2);
_ly += ui(8); _ly += ui(8);
_h += ui(8); _h += ui(8);

4
objects/o_dialog_scrollbox_horizontal/Create_0.gml
View file

@ -152,7 +152,9 @@ event_inherited();
if(_dw == 0) continue; if(_dw == 0) continue;
} else if(_val == -1) { } else if(_val == -1) {
draw_sprite_stretched(THEME.menu_separator, 0, ui(8), _ly, _dw - ui(16), ui(6)); draw_set_color(CDEF.main_mdblack);
draw_line_width(ui(8), _ly + ui(3), _dw - ui(8), _ly + ui(3), 2);
_ly += ui(8); _ly += ui(8);
_lh += ui(8); _lh += ui(8);

6
objects/o_dialog_splash/Draw_64.gml
View file

@ -45,7 +45,7 @@ if !ready exit;
sp_recent.setFocusHover(sFOCUS, sHOVER); sp_recent.setFocusHover(sFOCUS, sHOVER);
sp_recent.draw(x0 + ui(6), y0); sp_recent.draw(x0 + ui(6), y0);
draw_sprite_stretched(THEME.ui_panel_fg, 0, x0, y0, x1 - x0, y1 - y0); draw_sprite_stretched_ext(THEME.ui_panel, 1, x0, y0, x1 - x0, y1 - y0, COLORS.panel_frame);
var bx = x1 - ui(28); var bx = x1 - ui(28);
var by = y0 - ui(28 + 4); var by = y0 - ui(28 + 4);
@ -146,7 +146,7 @@ if !ready exit;
var _btc = COLORS._main_icon_light; var _btc = COLORS._main_icon_light;
draw_sprite_stretched_ext(THEME.ui_panel_bg, 0, _btx, y0 - ui(26), _btw, _bth, _btc, 1); draw_sprite_stretched_ext(THEME.ui_panel_bg, 0, _btx, y0 - ui(26), _btw, _bth, _btc, 1);
draw_sprite_stretched_add(THEME.ui_panel_fg, 1, _btx, y0 - ui(26), _btw, _bth, _btc, 0.1); draw_sprite_stretched_add(THEME.ui_panel, 1, _btx, y0 - ui(26), _btw, _bth, _btc, 0.1);
_btx += ui(4); _btx += ui(4);
draw_set_text(f_p1, fa_left, fa_bottom, COLORS._main_text_sub); draw_set_text(f_p1, fa_left, fa_bottom, COLORS._main_text_sub);
@ -157,7 +157,7 @@ if !ready exit;
} #endregion } #endregion
draw_sprite_stretched(THEME.ui_panel_bg, 0, x0, y0, x1 - x0, y1 - y0); draw_sprite_stretched(THEME.ui_panel_bg, 0, x0, y0, x1 - x0, y1 - y0);
draw_sprite_stretched(THEME.ui_panel_fg, 0, x0, y0, x1 - x0, y1 - y0); draw_sprite_stretched_ext(THEME.ui_panel, 1, x0, y0, x1 - x0, y1 - y0, COLORS.panel_frame);
draw_sprite_bbox(THEME.ui_panel_tab, 3, tab_cover); draw_sprite_bbox(THEME.ui_panel_tab, 3, tab_cover);
switch(pages[project_page]) { switch(pages[project_page]) {

4
objects/o_dialog_splash/o_dialog_splash.yy
View file

@ -3,9 +3,9 @@
"%Name":"o_dialog_splash", "%Name":"o_dialog_splash",
"eventList":[ "eventList":[
{"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
{"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
{"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":62,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
{"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":1,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":1,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
{"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":62,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
{"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
], ],
"managed":true, "managed":true,
"name":"o_dialog_splash", "name":"o_dialog_splash",

2
objects/o_main/Draw_75.gml
View file

@ -160,7 +160,7 @@ if(winMan_isMinimized()) exit;
#region safe mode #region safe mode
if(PROJECT.safeMode) { if(PROJECT.safeMode) {
draw_sprite_stretched_ext(THEME.ui_panel_active, 0, 0, 0, WIN_W, WIN_H, COLORS._main_value_negative, 1); draw_sprite_stretched_ext(THEME.ui_panel, 1, 0, 0, WIN_W, WIN_H, COLORS._main_value_negative, 1);
draw_set_text(f_h1, fa_right, fa_bottom, COLORS._main_value_negative); draw_set_text(f_h1, fa_right, fa_bottom, COLORS._main_value_negative);
draw_set_alpha(0.25); draw_set_alpha(0.25);
draw_text(WIN_W - ui(16), WIN_H - ui(8), __txtx("safe_mode", "SAFE MODE")); draw_text(WIN_W - ui(16), WIN_H - ui(8), __txtx("safe_mode", "SAFE MODE"));

2
scripts/buttonColor/buttonColor.gml
View file

@ -186,7 +186,7 @@ function buttonColor(_onApply, dialog = noone) : widget() constructor {
draw_sprite_stretched_ext(THEME.widget_selecting, 0, _x, _y, _cw, _h, COLORS._main_accent, 1); draw_sprite_stretched_ext(THEME.widget_selecting, 0, _x, _y, _cw, _h, COLORS._main_accent, 1);
if(DRAGGING && DRAGGING.type == "Color" && hover && hoverRect) { if(DRAGGING && DRAGGING.type == "Color" && hover && hoverRect) {
draw_sprite_stretched_ext(THEME.ui_panel_active, 0, _x, _y, _cw, _h, COLORS._main_value_positive, 1); draw_sprite_stretched_ext(THEME.ui_panel, 1, _x, _y, _cw, _h, COLORS._main_value_positive, 1);
if(mouse_release(mb_left)) if(mouse_release(mb_left))
onApply(DRAGGING.data); onApply(DRAGGING.data);
} }

2
scripts/buttonGradient/buttonGradient.gml
View file

@ -245,7 +245,7 @@ function buttonGradient(_onApply, dialog = noone) : widget() constructor {
draw_sprite_stretched_ext(THEME.widget_selecting, 0, _x, _y, _w, h, COLORS._main_accent, 1); draw_sprite_stretched_ext(THEME.widget_selecting, 0, _x, _y, _w, h, COLORS._main_accent, 1);
if(DRAGGING && DRAGGING.type == "Gradient" && hover && hoverRect) { if(DRAGGING && DRAGGING.type == "Gradient" && hover && hoverRect) {
draw_sprite_stretched_ext(THEME.ui_panel_active, 0, _x, _y, _w, h, COLORS._main_value_positive, 1); draw_sprite_stretched_ext(THEME.ui_panel, 1, _x, _y, _w, h, COLORS._main_value_positive, 1);
if(mouse_release(mb_left)) if(mouse_release(mb_left))
onApply(DRAGGING.data); onApply(DRAGGING.data);
} }

2
scripts/buttonPalette/buttonPalette.gml
View file

@ -175,7 +175,7 @@ function buttonPalette(_onApply, dialog = noone) : widget() constructor {
draw_sprite_stretched_ext(THEME.widget_selecting, 0, _x, _y, _w, h, COLORS._main_accent, 1); draw_sprite_stretched_ext(THEME.widget_selecting, 0, _x, _y, _w, h, COLORS._main_accent, 1);
if(DRAGGING && DRAGGING.type == "Palette" && hover && hoverRect) { if(DRAGGING && DRAGGING.type == "Palette" && hover && hoverRect) {
draw_sprite_stretched_ext(THEME.ui_panel_active, 0, _x, _y, _w, h, COLORS._main_value_positive, 1); draw_sprite_stretched_ext(THEME.ui_panel, 1, _x, _y, _w, h, COLORS._main_value_positive, 1);
if(mouse_release(mb_left)) if(mouse_release(mb_left))
onApply(DRAGGING.data); onApply(DRAGGING.data);
} }

9
scripts/draw_UI_scale/draw_UI_scale.gml
View file

@ -1,7 +1,12 @@
function line_get_height(font = noone, offset = 0) { function line_get_height(font = noone, offset = 0) {
INLINE INLINE
var _f = font != noone? font : draw_get_font(); var _f = draw_get_font();
return global.LINE_HEIGHTS[$ _f] + offset * UI_SCALE;
if(font != noone) draw_set_font(font);
var _h = string_height("l") + offset * UI_SCALE;
draw_set_font(_f);
return _h;
} }
function line_get_width(txt, font = noone, offset = 0) { function line_get_width(txt, font = noone, offset = 0) {

2
scripts/globals/globals.gml
View file

@ -39,7 +39,7 @@
LATEST_VERSION = 11700; LATEST_VERSION = 11700;
VERSION = 11790; VERSION = 11790;
SAVE_VERSION = 11700; SAVE_VERSION = 11700;
VERSION_STRING = "1.17.9"; VERSION_STRING = "1.17.10.001";
BUILD_NUMBER = 11790; BUILD_NUMBER = 11790;
HOTKEYS = ds_map_create(); HOTKEYS = ds_map_create();

2
scripts/hotkey_data/hotkey_data.gml
View file

@ -172,6 +172,6 @@ function hotkey_draw(keyStr, _x, _y) {
var _tw = string_width( keyStr); var _tw = string_width( keyStr);
var _th = string_height(keyStr); var _th = string_height(keyStr);
draw_sprite_stretched_ext(THEME.ui_panel_fg, 1, _x - _tw - ui(4), _y - _th / 2 - ui(3), _tw + ui(8), _th + ui(3), COLORS._main_text_sub, 0.5); draw_sprite_stretched_ext(THEME.ui_panel, 1, _x - _tw - ui(4), _y - _th / 2 - ui(3), _tw + ui(8), _th + ui(3), COLORS._main_text_sub, 0.5);
draw_text(_x, _y, keyStr); draw_text(_x, _y, keyStr);
} }

2
scripts/materialBox/materialBox.gml
View file

@ -101,7 +101,7 @@ function materialBox(_onModify) : widget() constructor {
var _nx = sx1 - _tw; var _nx = sx1 - _tw;
var _ny = sy1 - _th; var _ny = sy1 - _th;
draw_sprite_stretched_ext(THEME.timeline_node, 0, _nx, _ny, _tw, _th, COLORS.panel_bg_clear_inner, 0.85); draw_sprite_stretched_ext(THEME.ui_panel, 0, _nx, _ny, _tw, _th, COLORS.panel_bg_clear_inner, 0.85);
draw_text_add(sx1 - ui(3), sy1 + ui(1), _txt); draw_text_add(sx1 - ui(3), sy1 + ui(1), _txt);
} }

4
scripts/node_armature_bind/node_armature_bind.gml
View file

@ -167,7 +167,7 @@ function Node_Armature_Bind(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr
if(point_in_rectangle(_m[0], _m[1], _x, ty, _x + _w, ty + _hh - 1)) { if(point_in_rectangle(_m[0], _m[1], _x, ty, _x + _w, ty + _hh - 1)) {
if(layer_dragging != noone) { if(layer_dragging != noone) {
draw_sprite_stretched_ext(THEME.ui_panel_active, 0, _x, ty, _w, _hh, COLORS._main_accent, 1); draw_sprite_stretched_ext(THEME.ui_panel, 1, _x, ty, _w, _hh, COLORS._main_accent, 1);
hovering = _bone; hovering = _bone;
} }
@ -191,7 +191,7 @@ function Node_Armature_Bind(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr
} }
if(layer_dragging != noone && !hovering) if(layer_dragging != noone && !hovering)
draw_sprite_stretched_ext(THEME.ui_panel_active, 0, _x, _ty, _w, bh - ui(32), COLORS._main_accent, 1); draw_sprite_stretched_ext(THEME.ui_panel, 1, _x, _ty, _w, bh - ui(32), COLORS._main_accent, 1);
#endregion #endregion
var amo = floor((ds_list_size(inputs) - input_fix_len) / data_length); var amo = floor((ds_list_size(inputs) - input_fix_len) / data_length);

2
scripts/node_array_pin/node_array_pin.gml
View file

@ -10,9 +10,7 @@ function Node_Array_Pin(_x, _y, _group = noone) : Node(_x, _y, _group) construct
hover_scale_to = 0; hover_scale_to = 0;
hover_alpha = 0; hover_alpha = 0;
bg_spr = THEME.node_pin_bg;
bg_spr_add = 0; bg_spr_add = 0;
bg_sel_spr = THEME.node_pin_bg_active;
outputs[| 0] = nodeValue("Array", self, JUNCTION_CONNECT.output, VALUE_TYPE.any, []); outputs[| 0] = nodeValue("Array", self, JUNCTION_CONNECT.output, VALUE_TYPE.any, []);

4
scripts/node_array_rearrange/node_array_rearrange.gml
View file

@ -42,7 +42,7 @@ function Node_Array_Rearrange(_x, _y, _group = noone) : Node(_x, _y, _group) con
var _ffx = _fx + ui(32 + 4); var _ffx = _fx + ui(32 + 4);
var _ffy = _fy + ui(4); var _ffy = _fy + ui(4);
draw_sprite_stretched_ext(THEME.timeline_node, 0, _fx, _fy, _w, _fh, CDEF.main_dkblack, 1); draw_sprite_stretched_ext(THEME.ui_panel, 0, _fx, _fy, _w, _fh, CDEF.main_dkblack, 1);
var hv = ordering == noone && _hover && point_in_rectangle(_m[0], _m[1], _fx, _fy, _fx + ui(32), _fy + _fh); var hv = ordering == noone && _hover && point_in_rectangle(_m[0], _m[1], _fx, _fy, _fx + ui(32), _fy + _fh);
var cc = hv? COLORS._main_icon : COLORS.node_composite_bg; var cc = hv? COLORS._main_icon : COLORS.node_composite_bg;
draw_sprite_ext(THEME.hamburger_s, 0, _fx + ui(16), _fy + _fh / 2, 1, 1, 0, cc, 1); draw_sprite_ext(THEME.hamburger_s, 0, _fx + ui(16), _fy + _fh / 2, 1, 1, 0, cc, 1);
@ -63,7 +63,7 @@ function Node_Array_Rearrange(_x, _y, _group = noone) : Node(_x, _y, _group) con
var _sx = _ffcx - _sw / 2; var _sx = _ffcx - _sw / 2;
var _sy = _ffy + _fsh / 2 - _sh / 2; var _sy = _ffy + _fsh / 2 - _sh / 2;
draw_sprite_stretched_ext(THEME.timeline_node, 0, _ffcx - _fsh / 2, _ffy, _fsh, _fsh, merge_color(COLORS._main_icon_dark, COLORS.node_composite_bg, 0.25), 1); draw_sprite_stretched_ext(THEME.ui_panel, 0, _ffcx - _fsh / 2, _ffy, _fsh, _fsh, merge_color(COLORS._main_icon_dark, COLORS.node_composite_bg, 0.25), 1);
draw_surface_ext_safe(_val, _sx, _sy, _ss, _ss); draw_surface_ext_safe(_val, _sx, _sy, _ss, _ss);
draw_set_color(COLORS.node_composite_bg); draw_set_color(COLORS.node_composite_bg);
break; break;

12
scripts/node_ase_file_read/node_ase_file_read.gml
View file

@ -120,22 +120,22 @@ function Node_ASE_File_Read(_x, _y, _group = noone) : Node(_x, _y, _group) const
var _tgh = hh - ui(4); var _tgh = hh - ui(4);
if(tag[$ "Name"] == current_tag) { if(tag[$ "Name"] == current_tag) {
draw_sprite_stretched_ext(THEME.timeline_node, 0, _x + 8, _tgy, _w - 16, _tgh, cc, 0.5); draw_sprite_stretched_ext(THEME.ui_panel, 0, _x + 8, _tgy, _w - 16, _tgh, cc, 0.5);
draw_sprite_stretched_ext(THEME.timeline_node, 0, _x + 8, _tgy, (_w - 16) * prog, _tgh, cc, 0.85); draw_sprite_stretched_ext(THEME.ui_panel, 0, _x + 8, _tgy, (_w - 16) * prog, _tgh, cc, 0.85);
draw_sprite_stretched_add(THEME.timeline_node, 1, _x + 8, _tgy, (_w - 16) * prog, _tgh, c_white, 0.1); draw_sprite_stretched_add(THEME.ui_panel, 1, _x + 8, _tgy, (_w - 16) * prog, _tgh, c_white, 0.1);
txt = $"{progFr}/{rn}"; txt = $"{progFr}/{rn}";
} else { } else {
draw_sprite_stretched_ext(THEME.timeline_node, 0, _x + 8, _tgy, 10, _tgh, cc, 0.85); draw_sprite_stretched_ext(THEME.ui_panel, 0, _x + 8, _tgy, 10, _tgh, cc, 0.85);
draw_sprite_stretched_add(THEME.timeline_node, 1, _x + 8, _tgy, 10, _tgh, c_white, 0.1); draw_sprite_stretched_add(THEME.ui_panel, 1, _x + 8, _tgy, 10, _tgh, c_white, 0.1);
txt = $"{rn}"; txt = $"{rn}";
} }
if(_hover && point_in_rectangle(_m[0], _m[1], _x + 8, _yy, _x + _w - 8, _yy + hh)) { if(_hover && point_in_rectangle(_m[0], _m[1], _x + 8, _yy, _x + _w - 8, _yy + hh)) {
draw_sprite_stretched_add(THEME.timeline_node, 0, _x + 8, _tgy, _w - 16, _tgh, c_white, 0.1); draw_sprite_stretched_add(THEME.ui_panel, 0, _x + 8, _tgy, _w - 16, _tgh, c_white, 0.1);
if(mouse_press(mb_left, _focus)) { if(mouse_press(mb_left, _focus)) {
var _currTag = getInputData(2); var _currTag = getInputData(2);

1
scripts/node_boolean/node_boolean.gml
View file

@ -7,7 +7,6 @@ function Node_Boolean(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c
hover_state_to = 0; hover_state_to = 0;
wd_checkBox = new checkBox( function() { inputs[| 0].setValue(!getInputData(0)); } ); wd_checkBox = new checkBox( function() { inputs[| 0].setValue(!getInputData(0)); } );
wd_checkBox.spr = THEME.node_checkbox;
inputs[| 0] = nodeValue("Value", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false) inputs[| 0] = nodeValue("Value", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false)
.setVisible(true, true); .setVisible(true, true);

2
scripts/node_data/node_data.gml
View file

@ -1783,7 +1783,7 @@ function Node(_x, _y, _group = noone) : __Node_Base(_x, _y) constructor {
} }
if(draw_droppable) { if(draw_droppable) {
// draw_sprite_stretched_ext(THEME.ui_panel_active, 0, xx, yy, w * _s, h * _s, COLORS._main_value_positive, 1); // draw_sprite_stretched_ext(THEME.ui_panel, 1, xx, yy, w * _s, h * _s, COLORS._main_value_positive, 1);
draw_sprite_stretched_ext(THEME.color_picker_box, 0, xx - 2 * _s, yy - 2 * _s, w * _s + 4 * _s, h * _s + 4 * _s, COLORS._main_value_positive, 1); draw_sprite_stretched_ext(THEME.color_picker_box, 0, xx - 2 * _s, yy - 2 * _s, w * _s + 4 * _s, h * _s + 4 * _s, COLORS._main_value_positive, 1);
draw_droppable = false; draw_droppable = false;

4
scripts/node_display_text/node_display_text.gml
View file

@ -181,7 +181,7 @@ function Node_Display_Text(_x, _y, _group = noone) : Node(_x, _y, _group) constr
_th = string_height(_bch) * _ss; _th = string_height(_bch) * _ss;
draw_sprite_stretched_points(THEME.ui_panel_bg, 0, _tx - 4, _y - 4, _tx + _tw + 4, _y + _th + 4, COLORS._main_icon_light); draw_sprite_stretched_points(THEME.ui_panel_bg, 0, _tx - 4, _y - 4, _tx + _tw + 4, _y + _th + 4, COLORS._main_icon_light);
draw_sprite_stretched_points(THEME.ui_panel_fg, 0, _tx - 4, _y - 4, _tx + _tw + 4, _y + _th + 4); draw_sprite_stretched_points(THEME.ui_panel, 1, _tx - 4, _y - 4, _tx + _tw + 4, _y + _th + 4);
draw_set_color(_cc); draw_set_color(_cc);
draw_text_add_float(_tx, _y, _bch, _ss); draw_text_add_float(_tx, _y, _bch, _ss);
@ -234,7 +234,7 @@ function Node_Display_Text(_x, _y, _group = noone) : Node(_x, _y, _group) constr
draw_set_color(COLORS._main_accent); draw_set_color(COLORS._main_accent);
if(PANEL_GRAPH.node_hovering == self && point_in_rectangle(_mx, _my, _tx - 4, _y - 4, _tx + _tw + 4, _y + _th + 4)) { if(PANEL_GRAPH.node_hovering == self && point_in_rectangle(_mx, _my, _tx - 4, _y - 4, _tx + _tw + 4, _y + _th + 4)) {
draw_sprite_stretched_points(THEME.ui_panel_fg, 1, _tx - 4, _y - 4, _tx + _tw + 4, _y + _th + 4, COLORS._main_accent, 1); draw_sprite_stretched_points(THEME.ui_panel, 1, _tx - 4, _y - 4, _tx + _tw + 4, _y + _th + 4, COLORS._main_accent, 1);
switch(string_lower(_c[1])) { switch(string_lower(_c[1])) {
case "graph" : FOCUSING_PANEL = PANEL_GRAPH; break; case "graph" : FOCUSING_PANEL = PANEL_GRAPH; break;

18
scripts/node_mk_flare/node_mk_flare.gml
View file

@ -68,8 +68,8 @@ function Node_MK_Flare(_x, _y, _group = noone) : Node_Processor(_x, _y, _group)
static __frame = function(_x, _y, _w, _h, _m, _hover) { static __frame = function(_x, _y, _w, _h, _m, _hover) {
var _hv = point_in_rectangle(_m[0], _m[1], _x, _y, _x + _w, _y + _h) && _hover; var _hv = point_in_rectangle(_m[0], _m[1], _x, _y, _x + _w, _y + _h) && _hover;
draw_sprite_stretched_ext(THEME.timeline_node, 0, _x, _y, _w, _h, _hv? CDEF.main_black : CDEF.main_mdblack, 1); draw_sprite_stretched_ext(THEME.ui_panel, 0, _x, _y, _w, _h, _hv? CDEF.main_black : CDEF.main_mdblack, 1);
draw_sprite_stretched_ext(THEME.timeline_node, 1, _x, _y, _w, _h, CDEF.main_dkgrey, 1); draw_sprite_stretched_ext(THEME.ui_panel, 1, _x, _y, _w, _h, CDEF.main_dkgrey, 1);
return _hv; return _hv;
} }
@ -143,10 +143,10 @@ function Node_MK_Flare(_x, _y, _group = noone) : Node_Processor(_x, _y, _group)
var _ffy = _fy + ui(4); var _ffy = _fy + ui(4);
var _ffw = _ffh; var _ffw = _ffh;
draw_sprite_stretched_ext(THEME.timeline_node, 0, _fx, _fy, _w, _fh, CDEF.main_dkblack, 1); draw_sprite_stretched_ext(THEME.ui_panel, 0, _fx, _fy, _w, _fh, CDEF.main_dkblack, 1);
var _hov = __frame(_ffx, _ffy, _ffw, _ffh, _m, _hover); var _hov = __frame(_ffx, _ffy, _ffw, _ffh, _m, _hover);
draw_sprite_stretched_ext(THEME.timeline_node, 0, _ffx, _ffy, _ffw * _flare.a, _ffh, CDEF.main_dkgrey, 1); draw_sprite_stretched_ext(THEME.ui_panel, 0, _ffx, _ffy, _ffw * _flare.a, _ffh, CDEF.main_dkgrey, 1);
draw_sprite_ext(s_flare_type, _flare.type, _ffx + _ffh / 2, _ffy + _ffh / 2, 1, 1, 0, c_white, 1); draw_sprite_ext(s_flare_type, _flare.type, _ffx + _ffh / 2, _ffy + _ffh / 2, 1, 1, 0, c_white, 1);
if(_hov && mouse_press(mb_left, _focus)) { if(_hov && mouse_press(mb_left, _focus)) {
flare_editing = i; flare_editing = i;
@ -177,7 +177,7 @@ function Node_MK_Flare(_x, _y, _group = noone) : Node_Processor(_x, _y, _group)
_ffw = ui(40); _ffw = ui(40);
var _hov = __frame(_ffx, _ffy, _ffw, _ffh, _m, _hover); var _hov = __frame(_ffx, _ffy, _ffw, _ffh, _m, _hover);
draw_sprite_stretched_ext(THEME.timeline_node, 0, _ffx, _ffy, _ffw * clamp(_flare.t, 0., 2.) / 2, _ffh, CDEF.main_dkgrey, 1); draw_sprite_stretched_ext(THEME.ui_panel, 0, _ffx, _ffy, _ffw * clamp(_flare.t, 0., 2.) / 2, _ffh, CDEF.main_dkgrey, 1);
draw_text(_ffx + _ffw / 2, _ffy + _ffh / 2, string(_flare.t)); draw_text(_ffx + _ffw / 2, _ffy + _ffh / 2, string(_flare.t));
if(_hov && mouse_press(mb_left, _focus)) { if(_hov && mouse_press(mb_left, _focus)) {
flare_editing = i; flare_editing = i;
@ -214,7 +214,7 @@ function Node_MK_Flare(_x, _y, _group = noone) : Node_Processor(_x, _y, _group)
_ffw = ui(80); _ffw = ui(80);
var _hov = __frame(_ffx, _ffy, _ffw, _ffh, _m, _hover); var _hov = __frame(_ffx, _ffy, _ffw, _ffh, _m, _hover);
draw_sprite_stretched_ext(THEME.timeline_node, 0, _ffx + _ffw * _flare.shade[0], _ffy, _ffw * (_flare.shade[1] - _flare.shade[0]), _ffh, CDEF.main_dkgrey, 1); draw_sprite_stretched_ext(THEME.ui_panel, 0, _ffx + _ffw * _flare.shade[0], _ffy, _ffw * (_flare.shade[1] - _flare.shade[0]), _ffh, CDEF.main_dkgrey, 1);
draw_text(_ffx + _ffw / 4, _ffy + _ffh / 2, string(_flare.shade[0])); draw_text(_ffx + _ffw / 4, _ffy + _ffh / 2, string(_flare.shade[0]));
draw_text(_ffx + _ffw / 4 * 3, _ffy + _ffh / 2, string(_flare.shade[1])); draw_text(_ffx + _ffw / 4 * 3, _ffy + _ffh / 2, string(_flare.shade[1]));
if(_hov && mouse_press(mb_left, _focus)) { if(_hov && mouse_press(mb_left, _focus)) {
@ -283,8 +283,8 @@ function Node_MK_Flare(_x, _y, _group = noone) : Node_Processor(_x, _y, _group)
var _fdw = _fh - ui(8); var _fdw = _fh - ui(8);
var _fdh = _fdw * FLARE_TYPE.size; var _fdh = _fdw * FLARE_TYPE.size;
draw_sprite_stretched_ext(THEME.timeline_node, 0, _fdx, _fdy, _fdw, _fdh, CDEF.main_mdblack, 1); draw_sprite_stretched_ext(THEME.ui_panel, 0, _fdx, _fdy, _fdw, _fdh, CDEF.main_mdblack, 1);
draw_sprite_stretched_ext(THEME.timeline_node, 1, _fdx, _fdy, _fdw, _fdh, CDEF.main_dkgrey, 1); draw_sprite_stretched_ext(THEME.ui_panel, 1, _fdx, _fdy, _fdw, _fdh, CDEF.main_dkgrey, 1);
var _flare = _flares[flare_editing]; var _flare = _flares[flare_editing];
@ -293,7 +293,7 @@ function Node_MK_Flare(_x, _y, _group = noone) : Node_Processor(_x, _y, _group)
var _ddy = _fdy + _fdw * i; var _ddy = _fdy + _fdw * i;
if(i == _flare.type) if(i == _flare.type)
draw_sprite_stretched_ext(THEME.timeline_node, 0, _ddx, _ddy, _fdw, _fdw, CDEF.main_dkgrey, 1); draw_sprite_stretched_ext(THEME.ui_panel, 0, _ddx, _ddy, _fdw, _fdw, CDEF.main_dkgrey, 1);
draw_sprite_ext(s_flare_type, i, _ddx + _fdw / 2, _ddy + _fdw / 2, 1, 1, 0, i == _flare.type? c_white : COLORS._main_icon, 1); draw_sprite_ext(s_flare_type, i, _ddx + _fdw / 2, _ddy + _fdw / 2, 1, 1, 0, i == _flare.type? c_white : COLORS._main_icon, 1);
} }
} }

184
scripts/node_note/node_note.gml
View file

@ -1,187 +1,3 @@
function Node_Note(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { function Node_Note(_x, _y, _group = noone) : Node(_x, _y, _group) constructor {
name = "New Note";
w = 240;
h = 160;
alpha = 1;
bg_spr = THEME.node_note_bg;
bg_sel_spr = THEME.node_note_selecting;
size_dragging = false;
size_dragging_w = w;
size_dragging_h = h;
size_dragging_mx = w;
size_dragging_my = h;
auto_height = false;
name_hover = false;
hover_progress = 0;
color = c_white;
text_color = c_black;
alpha = 1;
content = "";
attributes.expand = true;
inputs[| 0] = nodeValue("Size", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 240, 160 ] )
.setDisplay(VALUE_DISPLAY.vector)
.rejectArray();
inputs[| 1] = nodeValue("BG Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, CDEF.yellow )
.rejectArray();
inputs[| 2] = nodeValue("Alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1 )
.setDisplay(VALUE_DISPLAY.slider)
.rejectArray();
inputs[| 3] = nodeValue("Content", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "" )
.rejectArray();
inputs[| 4] = nodeValue("Text Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_black )
.rejectArray();
input_display_list = [ 3, 0, 4, 1, 2 ];
static move = function(_x, _y, _s) { #region
if(x == _x && y == _y) return;
var dx = x - _x;
var dy = y - _y;
x += dx / _s;
y += dy / _s;
if(!LOADING) PROJECT.modified = true;
} #endregion
static step = function() {
var si = getInputData(0);
w = si[0];
h = si[1];
color = getInputData(1);
alpha = getInputData(2);
content = getInputData(3);
}
static drawNodeBase = function(xx, yy) {
if(!attributes.expand) return false;
draw_sprite_stretched_ext(bg_spr, 0, xx, yy, w, h, color, alpha);
hover_progress = lerp_float(hover_progress, name_hover, 2);
draw_set_text(f_p0, fa_left, fa_top, text_color);
draw_text_ext_add(round(xx + 8), round(yy + 18), content, -1, w - 16);
draw_sprite_ext(THEME.node_note_pin, attributes.expand, xx + 10, yy + 10, 1, 1, 0, color, 1);
}
static drawNode = function(_x, _y, _mx, _my, _s) {
if(size_dragging) {
w = max(32, size_dragging_w + (mouse_mx - size_dragging_mx));
h = max(32, size_dragging_h + (mouse_my - size_dragging_my));
if(!key_mod_press(CTRL)) {
w = max(32, round(w / 32) * 32);
h = max(32, round(h / 32) * 32);
}
if(mouse_release(mb_left)) {
size_dragging = false;
inputs[| 0].setValue([ w, h ]);
}
}
var xx = x;
var yy = y;
var x0 = xx;
var y0 = yy;
var x1 = x0 + 16;
var y1 = y0 + 16;
if(point_in_rectangle(_mx, _my, x0, y0, x1, y1)) {
if(!attributes.expand) TOOLTIP = content;
if(mouse_press(mb_left))
attributes.expand = !attributes.expand;
}
if(!attributes.expand) {
draw_sprite_ext(THEME.node_note_pin, attributes.expand, xx + 10, yy + 10, 1, 1, 0, color, 1);
return false;
}
drawNodeBase(xx, yy, _s);
if(active_draw_index > -1) {
draw_sprite_stretched_ext(bg_sel_spr, 0, xx, yy, w, h, COLORS._main_accent, 1);
active_draw_index = -1;
}
var x1 = xx + w;
var y1 = yy + h;
var x0 = x1 - 16;
var y0 = y1 - 16;
var cc = merge_color(color, c_black, 0.25);
if(point_in_rectangle(_mx, _my, x0, y0, x1, y1)) {
draw_sprite_ext(THEME.node_note_resize, 1, x1, y1, 1, 1, 0, cc, 1);
PANEL_GRAPH.drag_locking = true;
if(mouse_press(mb_left)) {
size_dragging = true;
size_dragging_w = w;
size_dragging_h = h;
size_dragging_mx = mouse_mx;
size_dragging_my = mouse_my;
}
} else draw_sprite_ext(THEME.node_note_resize, 0, x1, y1, 1, 1, 0, cc, 1);
return noone;
}
static pointIn = function(_x, _y, _mx, _my, _s) {
if(!attributes.expand) return false;
var xx = x;
var yy = y;
var x1 = xx + w;
var y1 = yy + h;
var x0 = x1 - 16;
var y0 = y1 - 16;
var hover = point_in_rectangle(_mx, _my, xx, yy, xx + w, yy + h) && !point_in_rectangle(_mx, _my, x0, y0, x1, y1);
name_hover = hover;
return hover;
}
static drawBadge = function(_x, _y, _s) { #region
if(!active) return;
if(!attributes.expand) return false;
var xx = x + w;
var yy = y;
badgePreview = lerp_float(badgePreview, !!previewing, 2);
badgeInspect = lerp_float(badgeInspect, inspecting, 2);
if(badgePreview > 0) {
draw_sprite_ext(THEME.node_state, 0, xx, yy, badgePreview, badgePreview, 0, c_white, 1);
xx -= 28 * badgePreview;
}
if(badgeInspect > 0) {
draw_sprite_ext(THEME.node_state, 1, xx, yy, badgeInspect, badgeInspect, 0, c_white, 1);
xx -= 28 * badgeInspect;
}
if(isTool) {
draw_sprite_ext(THEME.node_state, 2, xx, yy, 1, 1, 0, c_white, 1);
xx -= 28 * 2;
}
inspecting = false;
previewing = 0;
} #endregion
} }

1
scripts/node_number/node_number.gml
View file

@ -5,7 +5,6 @@ function Node_Number(_x, _y, _group = noone) : Node(_x, _y, _group) constructor
setDimension(96, 32 + 24 * 1); setDimension(96, 32 + 24 * 1);
wd_slider = slider(0, 1, 0.01, function(val) { inputs[| 0].setValue(val); } ); wd_slider = slider(0, 1, 0.01, function(val) { inputs[| 0].setValue(val); } );
wd_slider.spr = THEME.node_slider;
slider_value = -1; slider_value = -1;
slider_surface = -1; slider_surface = -1;

2
scripts/node_pin/node_pin.gml
View file

@ -10,9 +10,7 @@ function Node_Pin(_x, _y, _group = noone) : Node(_x, _y, _group) constructor {
hover_scale_to = 0; hover_scale_to = 0;
hover_alpha = 0; hover_alpha = 0;
bg_spr = THEME.node_pin_bg;
bg_spr_add = 0; bg_spr_add = 0;
bg_sel_spr = THEME.node_pin_bg_active;
inputs[| 0] = nodeValue("In", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, 0 ) inputs[| 0] = nodeValue("In", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, 0 )
.setVisible(true, true); .setVisible(true, true);

2
scripts/node_sequence_anim/node_sequence_anim.gml
View file

@ -35,7 +35,7 @@ function Node_Sequence_Anim(_x, _y, _group = noone) : Node(_x, _y, _group) const
draw_sprite_stretched_ext(THEME.ui_panel_bg, 1, _x, _y, _w, _h, COLORS.node_composite_bg_blend, 1); draw_sprite_stretched_ext(THEME.ui_panel_bg, 1, _x, _y, _w, _h, COLORS.node_composite_bg_blend, 1);
if(_hover && point_in_rectangle(_m[0], _m[1], _x, _y, _x + _w, _y + _h) && inputs[| 2].value_from == noone) { if(_hover && point_in_rectangle(_m[0], _m[1], _x, _y, _x + _w, _y + _h) && inputs[| 2].value_from == noone) {
draw_sprite_stretched_add(THEME.ui_panel_fg, 1, _x, _y, _w, _h, c_white, 0.2); draw_sprite_stretched_add(THEME.ui_panel, 1, _x, _y, _w, _h, c_white, 0.2);
if(mouse_press(mb_left, _focus)) if(mouse_press(mb_left, _focus))
dialogPanelCall(new Panel_Array_Sequence(self)); dialogPanelCall(new Panel_Array_Sequence(self));

6
scripts/panel_color/panel_color.gml
View file

@ -83,10 +83,10 @@ function Panel_Color() : PanelContent() constructor {
draw_sprite_stretched_ext(THEME.menu_button_mask, 0, cx + ui(4), cy + ui(4), ui(16), ui(16), CURRENT_COLOR, _color_get_alpha(CURRENT_COLOR)); draw_sprite_stretched_ext(THEME.menu_button_mask, 0, cx + ui(4), cy + ui(4), ui(16), ui(16), CURRENT_COLOR, _color_get_alpha(CURRENT_COLOR));
draw_sprite_stretched_add(THEME.menu_button_mask, 1, cx + ui(4), cy + ui(4), ui(16), ui(16), c_white, 0.3); draw_sprite_stretched_add(THEME.menu_button_mask, 1, cx + ui(4), cy + ui(4), ui(16), ui(16), c_white, 0.3);
draw_sprite_stretched_ext(THEME.ui_panel_active, 0, cx, cy, ui(24), ui(24), c_white, 0.5); draw_sprite_stretched_ext(THEME.ui_panel, 1, cx, cy, ui(24), ui(24), c_white, 0.5);
if(pHOVER && point_in_rectangle(mx, my, cx, cy, cx + ui(24), cy + ui(24))) { if(pHOVER && point_in_rectangle(mx, my, cx, cy, cx + ui(24), cy + ui(24))) {
draw_sprite_stretched_ext(THEME.ui_panel_active, 0, cx, cy, ui(24), ui(24), c_white, 1); draw_sprite_stretched_ext(THEME.ui_panel, 1, cx, cy, ui(24), ui(24), c_white, 1);
if(mouse_press(mb_left, pFOCUS)) { if(mouse_press(mb_left, pFOCUS)) {
array_insert(colors, 0, CURRENT_COLOR); array_insert(colors, 0, CURRENT_COLOR);
@ -320,7 +320,7 @@ function Panel_Color() : PanelContent() constructor {
BLEND_NORMAL BLEND_NORMAL
if(DRAGGING && DRAGGING.type == "Color" && pHOVER) { if(DRAGGING && DRAGGING.type == "Color" && pHOVER) {
draw_sprite_stretched_ext(THEME.ui_panel_active, 0, 2, 2, w - 4, h - 4, COLORS._main_value_positive, 1); draw_sprite_stretched_ext(THEME.ui_panel, 1, 2, 2, w - 4, h - 4, COLORS._main_value_positive, 1);
if(mouse_release(mb_left)) if(mouse_release(mb_left))
setColor(DRAGGING.data); setColor(DRAGGING.data);
} }

8
scripts/panel_data/panel_data.gml
View file

@ -705,14 +705,14 @@ function Panel(_parent, _x, _y, _w, _h) constructor {
surface_reset_target(); surface_reset_target();
draw_surface_safe(content_surface, tx, ty); draw_surface_safe(content_surface, tx, ty);
draw_sprite_stretched(THEME.ui_panel_fg, 0, tx + padding, ty + padding, _tw, _th); draw_sprite_stretched_ext(THEME.ui_panel, 1, tx + padding, ty + padding, _tw, _th, COLORS.panel_frame);
if(tab) draw_sprite_bbox(THEME.ui_panel_tab, 3, tab_cover); if(tab) draw_sprite_bbox(THEME.ui_panel_tab, 3, tab_cover);
if(FOCUS == self && parent != noone) { if(FOCUS == self && parent != noone) {
draw_sprite_stretched_ext(THEME.ui_panel_active, 0, tx + padding, ty + padding, tw - padding * 2, th - padding * 2, COLORS._main_accent, 1); draw_sprite_stretched_ext(THEME.ui_panel, 1, tx + padding, ty + padding, tw - padding * 2, th - padding * 2, COLORS._main_accent, 1);
if(hasContent() && !m_in && m_ot) { if(hasContent() && !m_in && m_ot) {
draw_sprite_stretched_ext(THEME.ui_panel_active, 0, tx + padding, ty + padding, tw - padding * 2, th - padding * 2, c_white, 0.4); draw_sprite_stretched_ext(THEME.ui_panel, 1, tx + padding, ty + padding, tw - padding * 2, th - padding * 2, c_white, 0.4);
if(DOUBLE_CLICK) { if(DOUBLE_CLICK) {
extract(); extract();
@ -728,7 +728,7 @@ function Panel(_parent, _x, _y, _w, _h) constructor {
} }
if(draw_droppable) { if(draw_droppable) {
draw_sprite_stretched_ext(THEME.ui_panel_active, 0, tx + padding, ty + padding, tw - padding * 2, th - padding * 2, COLORS._main_value_positive, 1); draw_sprite_stretched_ext(THEME.ui_panel, 1, tx + padding, ty + padding, tw - padding * 2, th - padding * 2, COLORS._main_value_positive, 1);
draw_droppable = false; draw_droppable = false;
} }

2
scripts/panel_display_additional/panel_display_additional.gml
View file

@ -49,7 +49,7 @@ function panelDisplayDraw() {
surface_reset_target(); surface_reset_target();
draw_surface_safe(focusing_surface); draw_surface_safe(focusing_surface);
draw_sprite_stretched_ext(THEME.ui_panel_active, 1, x0, y0, ww, hh, COLORS._main_accent, 1); draw_sprite_stretched_ext(THEME.ui_panel, 2, x0, y0, ww, hh, COLORS._main_accent, 1);
} }
FOCUSING_PANEL = noone; FOCUSING_PANEL = noone;

4
scripts/panel_file_explorer/panel_file_explorer.gml
View file

@ -533,7 +533,7 @@ function Panel_File_Explorer() : PanelContent() constructor {
if(contentPane.hover && point_in_rectangle(_m[0], _m[1], _px, _py, _px + _tw, _py + _ph)) { if(contentPane.hover && point_in_rectangle(_m[0], _m[1], _px, _py, _px + _tw, _py + _ph)) {
if(!mouse_click(mb_left)) { if(!mouse_click(mb_left)) {
draw_sprite_stretched_ext(THEME.ui_panel_fg, 1, _px, _py, _tw, _ph, COLORS._main_icon_light, 1); draw_sprite_stretched_ext(THEME.ui_panel, 1, _px, _py, _tw, _ph, COLORS._main_icon_light, 1);
if(!instance_exists(o_dialog_menubox)) if(!instance_exists(o_dialog_menubox))
TOOLTIP = [ _th, "sprite" ]; TOOLTIP = [ _th, "sprite" ];
} }
@ -616,7 +616,7 @@ function Panel_File_Explorer() : PanelContent() constructor {
if(contentPane.hover && point_in_rectangle(_m[0], _m[1], _px, _py, _px + _pw, _py + _ph)) { if(contentPane.hover && point_in_rectangle(_m[0], _m[1], _px, _py, _px + _pw, _py + _ph)) {
if(!mouse_click(mb_left)) { if(!mouse_click(mb_left)) {
draw_sprite_stretched_ext(THEME.ui_panel_fg, 1, _px, _py, _pw, _ph, COLORS._main_icon_light, 1); draw_sprite_stretched_ext(THEME.ui_panel, 1, _px, _py, _pw, _ph, COLORS._main_icon_light, 1);
if(!instance_exists(o_dialog_menubox)) if(!instance_exists(o_dialog_menubox))
TOOLTIP = [ _th, "sprite" ]; TOOLTIP = [ _th, "sprite" ];
} }

12
scripts/panel_globalvar/panel_globalvar.gml
View file

@ -55,8 +55,8 @@ function Panel_Globalvar() : PanelContent() constructor {
var _bw = _ww / 2 - ui(4); var _bw = _ww / 2 - ui(4);
var _hov = pHOVER && point_in_rectangle(mx, my, _bx, _by, _bx + _bw, _by + _add_h); var _hov = pHOVER && point_in_rectangle(mx, my, _bx, _by, _bx + _bw, _by + _add_h);
draw_sprite_stretched_ext(THEME.timeline_node, 0, _bx, _by, _bw, _add_h, _hov? COLORS._main_value_positive : COLORS._main_icon, .3 + _hov * .1); draw_sprite_stretched_ext(THEME.ui_panel, 0, _bx, _by, _bw, _add_h, _hov? COLORS._main_value_positive : COLORS._main_icon, .3 + _hov * .1);
draw_sprite_stretched_ext(THEME.timeline_node, 1, _bx, _by, _bw, _add_h, _hov? COLORS._main_value_positive : COLORS._main_icon, .6 + _hov * .25); draw_sprite_stretched_ext(THEME.ui_panel, 1, _bx, _by, _bw, _add_h, _hov? COLORS._main_value_positive : COLORS._main_icon, .6 + _hov * .25);
draw_set_text(f_p2, fa_center, fa_center, _hov? COLORS._main_value_positive : COLORS._main_icon); draw_set_text(f_p2, fa_center, fa_center, _hov? COLORS._main_value_positive : COLORS._main_icon);
draw_text_add(_bx + _bw / 2, _by + _add_h / 2, __txt("Add")); draw_text_add(_bx + _bw / 2, _by + _add_h / 2, __txt("Add"));
@ -67,8 +67,8 @@ function Panel_Globalvar() : PanelContent() constructor {
_bx += _bw + ui(8); _bx += _bw + ui(8);
var _hov = pHOVER && point_in_rectangle(mx, my, _bx, _by, _bx + _bw, _by + _add_h); var _hov = pHOVER && point_in_rectangle(mx, my, _bx, _by, _bx + _bw, _by + _add_h);
draw_sprite_stretched_ext(THEME.timeline_node, 0, _bx, _by, _bw, _add_h, _hov? COLORS._main_icon_light : COLORS._main_icon, .3 + _hov * .1); draw_sprite_stretched_ext(THEME.ui_panel, 0, _bx, _by, _bw, _add_h, _hov? COLORS._main_icon_light : COLORS._main_icon, .3 + _hov * .1);
draw_sprite_stretched_ext(THEME.timeline_node, 1, _bx, _by, _bw, _add_h, _hov? COLORS._main_icon_light : COLORS._main_icon, .6 + _hov * .25); draw_sprite_stretched_ext(THEME.ui_panel, 1, _bx, _by, _bw, _add_h, _hov? COLORS._main_icon_light : COLORS._main_icon, .6 + _hov * .25);
draw_set_text(f_p2, fa_center, fa_center, _hov? COLORS._main_icon_light : COLORS._main_icon); draw_set_text(f_p2, fa_center, fa_center, _hov? COLORS._main_icon_light : COLORS._main_icon);
draw_text_add(_bx + _bw / 2, _by + _add_h / 2, __txt("Apply")); draw_text_add(_bx + _bw / 2, _by + _add_h / 2, __txt("Apply"));
@ -79,8 +79,8 @@ function Panel_Globalvar() : PanelContent() constructor {
} else { } else {
var _hov = pHOVER && point_in_rectangle(mx, my, _bx, _by, _ww, _by + _add_h); var _hov = pHOVER && point_in_rectangle(mx, my, _bx, _by, _ww, _by + _add_h);
draw_sprite_stretched_ext(THEME.timeline_node, 0, _bx, _by, _ww, _add_h, _hov? COLORS._main_value_positive : COLORS._main_icon, .3 + _hov * .1); draw_sprite_stretched_ext(THEME.ui_panel, 0, _bx, _by, _ww, _add_h, _hov? COLORS._main_value_positive : COLORS._main_icon, .3 + _hov * .1);
draw_sprite_stretched_ext(THEME.timeline_node, 1, _bx, _by, _ww, _add_h, _hov? COLORS._main_value_positive : COLORS._main_icon, .6 + _hov * .25); draw_sprite_stretched_ext(THEME.ui_panel, 1, _bx, _by, _ww, _add_h, _hov? COLORS._main_value_positive : COLORS._main_icon, .6 + _hov * .25);
draw_set_text(f_p2, fa_center, fa_center, _hov? COLORS._main_value_positive : COLORS._main_icon); draw_set_text(f_p2, fa_center, fa_center, _hov? COLORS._main_value_positive : COLORS._main_icon);
draw_text_add(_bx + _ww / 2, _by + _add_h / 2, __txt("Edit")); draw_text_add(_bx + _ww / 2, _by + _add_h / 2, __txt("Edit"));

4
scripts/panel_gradient/panel_gradient.gml
View file

@ -39,10 +39,10 @@ function Panel_Gradient() : PanelContent() constructor {
draw_set_text(f_p3, fa_left, fa_top, COLORS._main_text_sub); draw_set_text(f_p3, fa_left, fa_top, COLORS._main_text_sub);
draw_text_add(xx + pd, yy + ui(2), preset.name); draw_text_add(xx + pd, yy + ui(2), preset.name);
draw_sprite_stretched_add(THEME.ui_panel_fg, 1, xx + ui(4), _py, gww - ui(8), _ph, c_white, 0.3); draw_sprite_stretched_add(THEME.ui_panel, 1, xx + ui(4), _py, gww - ui(8), _ph, c_white, 0.3);
if(isHover) { if(isHover) {
sp_gradient.hover_content = true; sp_gradient.hover_content = true;
draw_sprite_stretched_ext(THEME.ui_panel_fg, 1, xx, yy, gww, hg, COLORS._main_accent, 1); draw_sprite_stretched_ext(THEME.ui_panel, 1, xx, yy, gww, hg, COLORS._main_accent, 1);
} }
if(isHover && mouse_press(mb_left, pFOCUS)) { if(isHover && mouse_press(mb_left, pFOCUS)) {

4
scripts/panel_graph/panel_graph.gml
View file

@ -2277,7 +2277,7 @@ function Panel_Graph(project = PROJECT) : PanelContent() constructor {
var y1 = y0 + hh; var y1 = y0 + hh;
draw_sprite_stretched( THEME.ui_panel_bg, 3, x0, y0, ww, hh); draw_sprite_stretched( THEME.ui_panel_bg, 3, x0, y0, ww, hh);
draw_sprite_stretched_add(THEME.ui_panel_fg, 0, x0, y0, ww, hh, c_white, 0.25); draw_sprite_stretched_add(THEME.ui_panel, 1, x0, y0, ww, hh, c_white, 0.25);
draw_sprite_stretched( THEME.button_hide_fill, 1, x0 + pd, y0 + pd, tw, th); draw_sprite_stretched( THEME.button_hide_fill, 1, x0 + pd, y0 + pd, tw, th);
tb_search.font = f_p2; tb_search.font = f_p2;
@ -2402,7 +2402,7 @@ function Panel_Graph(project = PROJECT) : PanelContent() constructor {
if(pHOVER && !_hv) { if(pHOVER && !_hv) {
draw_sprite_stretched_add(THEME.ui_panel_bg, 4, _sl_x, _sl_y, slider_width, _sl_h, COLORS._main_icon, 0.05); draw_sprite_stretched_add(THEME.ui_panel_bg, 4, _sl_x, _sl_y, slider_width, _sl_h, COLORS._main_icon, 0.05);
draw_sprite_stretched_add(THEME.ui_panel_fg, 1, _sl_x, _sl_y, slider_width, _sl_h, c_white, 0.1); draw_sprite_stretched_add(THEME.ui_panel, 1, _sl_x, _sl_y, slider_width, _sl_h, c_white, 0.1);
if(mouse_press(mb_left, pFOCUS)) if(mouse_press(mb_left, pFOCUS))
setSlideShow((ind + 1) % amo); setSlideShow((ind + 1) % amo);

8
scripts/panel_inspector/panel_inspector.gml
View file

@ -342,7 +342,7 @@ function Panel_Inspector() : PanelContent() constructor {
var widh = viewMode == INSP_VIEW_MODE.spacious? _lh + ui(6) + wh + ui(4) : max(wh, _lh); var widh = viewMode == INSP_VIEW_MODE.spacious? _lh + ui(6) + wh + ui(4) : max(wh, _lh);
if(jun != noone && _hover && point_in_rectangle(_m[0], _m[1], widx, widy, widx + widw, widy + widh)) { if(jun != noone && _hover && point_in_rectangle(_m[0], _m[1], widx, widy, widx + widw, widy + widh)) {
draw_sprite_stretched_ext(THEME.ui_panel_active, 0, widx, widy, widw, widh, COLORS._main_value_positive, 1); draw_sprite_stretched_ext(THEME.ui_panel, 1, widx, widy, widw, widh, COLORS._main_value_positive, 1);
attribute_hovering = drpFn; attribute_hovering = drpFn;
} }
@ -815,7 +815,7 @@ function Panel_Inspector() : PanelContent() constructor {
if(prop_highlight_time == 60) if(prop_highlight_time == 60)
contentPane.setScroll(_y - yy); contentPane.setScroll(_y - yy);
var aa = min(1, prop_highlight_time / 30); var aa = min(1, prop_highlight_time / 30);
draw_sprite_stretched_ext(THEME.ui_panel_active, 0, ui(4), yy, contentPane.surface_w - ui(4), _selH, COLORS._main_accent, aa); draw_sprite_stretched_ext(THEME.ui_panel, 1, ui(4), yy, contentPane.surface_w - ui(4), _selH, COLORS._main_accent, aa);
} }
if(_hover && lbHov && prop_dragging == noone && mouse_press(mb_left, pFOCUS)) { if(_hover && lbHov && prop_dragging == noone && mouse_press(mb_left, pFOCUS)) {
@ -837,7 +837,7 @@ function Panel_Inspector() : PanelContent() constructor {
var hov = PANEL_GRAPH.value_dragging != noone || (NODE_DROPPER_TARGET != noone && NODE_DROPPER_TARGET != jun); var hov = PANEL_GRAPH.value_dragging != noone || (NODE_DROPPER_TARGET != noone && NODE_DROPPER_TARGET != jun);
if(hov) { if(hov) {
draw_sprite_stretched_ext(THEME.ui_panel_active, 0, ui(4), _selY, contentPane.surface_w - ui(8), _selH, COLORS._main_value_positive, 1); draw_sprite_stretched_ext(THEME.ui_panel, 1, ui(4), _selY, contentPane.surface_w - ui(8), _selH, COLORS._main_value_positive, 1);
if(mouse_press(mb_left, NODE_DROPPER_TARGET_CAN)) { if(mouse_press(mb_left, NODE_DROPPER_TARGET_CAN)) {
NODE_DROPPER_TARGET.expression += $"{jun.node.internalName}.{jun.connect_type == JUNCTION_CONNECT.input? "inputs" : "outputs"}.{jun.internalName}"; NODE_DROPPER_TARGET.expression += $"{jun.node.internalName}.{jun.connect_type == JUNCTION_CONNECT.input? "inputs" : "outputs"}.{jun.internalName}";
NODE_DROPPER_TARGET.expressionUpdate(); NODE_DROPPER_TARGET.expressionUpdate();
@ -926,7 +926,7 @@ function Panel_Inspector() : PanelContent() constructor {
return hh; return hh;
} }
contentPane = new scrollPane(content_w, content_h, function(_y, _m) { contentPane = new scrollPane(content_w, content_h, function(_y, _m) {
var con_w = contentPane.surface_w - ui(4); var con_w = contentPane.surface_w - ui(4);
draw_clear_alpha(COLORS.panel_bg_clear, 0); draw_clear_alpha(COLORS.panel_bg_clear, 0);

2
scripts/panel_nodes/panel_nodes.gml
View file

@ -51,7 +51,7 @@ function Panel_Nodes() : PanelContent() constructor {
} }
} else } else
draw_sprite_stretched_ext(THEME.ui_panel_bg, 0, _x0, _y, _x1 - _x0, hg, COLORS._main_icon_light, 1); draw_sprite_stretched_ext(THEME.ui_panel_bg, 0, _x0, _y, _x1 - _x0, hg, COLORS._main_icon_light, 1);
draw_sprite_stretched_add(THEME.ui_panel_fg, 0, _x0, _y, _x1 - _x0, hg, c_white, .3); draw_sprite_stretched_add(THEME.ui_panel, 1, _x0, _y, _x1 - _x0, hg, c_white, .3);
var bw = ui(24); var bw = ui(24);
var bh = ui(24); var bh = ui(24);

10
scripts/panel_palette/panel_palette.gml
View file

@ -63,8 +63,8 @@ function Panel_Palette() : PanelContent() constructor {
var _add_h = ui(28); var _add_h = ui(28);
var _hov = pHOVER && point_in_rectangle(_m[0], _m[1], 0, yy, ww, yy + _add_h); var _hov = pHOVER && point_in_rectangle(_m[0], _m[1], 0, yy, ww, yy + _add_h);
draw_sprite_stretched_ext(THEME.timeline_node, 0, 0, yy, ww, _add_h, COLORS._main_value_positive, .4); draw_sprite_stretched_ext(THEME.ui_panel, 0, 0, yy, ww, _add_h, COLORS._main_value_positive, .4);
draw_sprite_stretched_ext(THEME.timeline_node, 1, 0, yy, ww, _add_h, COLORS._main_value_positive, .7 + _hov * .25); draw_sprite_stretched_ext(THEME.ui_panel, 1, 0, yy, ww, _add_h, COLORS._main_value_positive, .7 + _hov * .25);
draw_set_text(f_p2, fa_center, fa_center, COLORS._main_value_positive); draw_set_text(f_p2, fa_center, fa_center, COLORS._main_value_positive);
draw_text_add(ww / 2, yy + _add_h / 2, __txt("New palette")); draw_text_add(ww / 2, yy + _add_h / 2, __txt("New palette"));
@ -89,9 +89,9 @@ function Panel_Palette() : PanelContent() constructor {
var _add_w = ui(64); var _add_w = ui(64);
var _add_x = ww / 2 + sin(current_time / 400) * (ww - _add_w) / 2 - _add_w / 2; var _add_x = ww / 2 + sin(current_time / 400) * (ww - _add_w) / 2 - _add_w / 2;
draw_sprite_stretched_ext(THEME.timeline_node, 0, 0, yy, ww, _add_h, COLORS._main_value_positive, .4); draw_sprite_stretched_ext(THEME.ui_panel, 0, 0, yy, ww, _add_h, COLORS._main_value_positive, .4);
draw_sprite_stretched_ext(THEME.timeline_node, 0, _add_x, yy, _add_w, _add_h, COLORS._main_value_positive, .3); draw_sprite_stretched_ext(THEME.ui_panel, 0, _add_x, yy, _add_w, _add_h, COLORS._main_value_positive, .3);
draw_sprite_stretched_ext(THEME.timeline_node, 1, 0, yy, ww, _add_h, COLORS._main_value_positive, .7); draw_sprite_stretched_ext(THEME.ui_panel, 1, 0, yy, ww, _add_h, COLORS._main_value_positive, .7);
draw_set_text(f_p2, fa_center, fa_center, COLORS._main_value_positive); draw_set_text(f_p2, fa_center, fa_center, COLORS._main_value_positive);
draw_text_add(ww / 2, yy + _add_h / 2, __txt("Loading Lospec Palette...")); draw_text_add(ww / 2, yy + _add_h / 2, __txt("Loading Lospec Palette..."));

4
scripts/panel_presets/panel_presets.gml
View file

@ -221,8 +221,8 @@ function Panel_Presets(_node) : PanelContent() constructor {
} else { } else {
var _hov = pHOVER && point_in_rectangle(mx, my, _bx, _by, _bx + _ww, _by + _add_h); var _hov = pHOVER && point_in_rectangle(mx, my, _bx, _by, _bx + _ww, _by + _add_h);
draw_sprite_stretched_ext(THEME.timeline_node, 0, _bx, _by, _ww, _add_h, _hov? COLORS._main_value_positive : COLORS._main_icon, .3 + _hov * .1); draw_sprite_stretched_ext(THEME.ui_panel, 0, _bx, _by, _ww, _add_h, _hov? COLORS._main_value_positive : COLORS._main_icon, .3 + _hov * .1);
draw_sprite_stretched_ext(THEME.timeline_node, 1, _bx, _by, _ww, _add_h, _hov? COLORS._main_value_positive : COLORS._main_icon, .6 + _hov * .25); draw_sprite_stretched_ext(THEME.ui_panel, 1, _bx, _by, _ww, _add_h, _hov? COLORS._main_value_positive : COLORS._main_icon, .6 + _hov * .25);
draw_set_text(f_p2, fa_center, fa_center, _hov? COLORS._main_value_positive : COLORS._main_icon); draw_set_text(f_p2, fa_center, fa_center, _hov? COLORS._main_value_positive : COLORS._main_icon);
draw_text_add(_ww / 2, _by + _add_h / 2, __txt("New preset")); draw_text_add(_ww / 2, _by + _add_h / 2, __txt("New preset"));

6
scripts/panel_tunnels/panel_tunnels.gml
View file

@ -78,7 +78,7 @@ function Panel_Tunnels() : PanelContent() constructor {
tunnel_select = tunnel_select == node? noone : node; tunnel_select = tunnel_select == node? noone : node;
} else } else
draw_sprite_stretched_ext(THEME.ui_panel_bg, 0, 0, _y, ww, hg, COLORS._main_icon_light, 1); draw_sprite_stretched_ext(THEME.ui_panel_bg, 0, 0, _y, ww, hg, COLORS._main_icon_light, 1);
draw_sprite_stretched_add(THEME.ui_panel_fg, 0, 0, _y, ww, hg, c_white, .3); draw_sprite_stretched_add(THEME.ui_panel, 1, 0, _y, ww, hg, c_white, .3);
var key = node.inputs[| 0].getValue(0); var key = node.inputs[| 0].getValue(0);
var bw = ui(28); var bw = ui(28);
@ -162,8 +162,8 @@ function Panel_Tunnels() : PanelContent() constructor {
var _ww = w; var _ww = w;
var _hov = pHOVER && point_in_rectangle(mx, my, _bx, _by, _bx + _ww, _by + _add_h); var _hov = pHOVER && point_in_rectangle(mx, my, _bx, _by, _bx + _ww, _by + _add_h);
draw_sprite_stretched_ext(THEME.timeline_node, 0, _bx, _by, _ww, _add_h, _hov? COLORS._main_value_positive : COLORS._main_icon, .3 + _hov * .1); draw_sprite_stretched_ext(THEME.ui_panel, 0, _bx, _by, _ww, _add_h, _hov? COLORS._main_value_positive : COLORS._main_icon, .3 + _hov * .1);
draw_sprite_stretched_ext(THEME.timeline_node, 1, _bx, _by, _ww, _add_h, _hov? COLORS._main_value_positive : COLORS._main_icon, .6 + _hov * .25); draw_sprite_stretched_ext(THEME.ui_panel, 1, _bx, _by, _ww, _add_h, _hov? COLORS._main_value_positive : COLORS._main_icon, .6 + _hov * .25);
draw_set_text(f_p2, fa_center, fa_center, _hov? COLORS._main_value_positive : COLORS._main_icon); draw_set_text(f_p2, fa_center, fa_center, _hov? COLORS._main_value_positive : COLORS._main_icon);
draw_text_add(_ww / 2, _by + _add_h / 2, __txtx("panel_tunnel_create_tunnel", "Create tunnel")); draw_text_add(_ww / 2, _by + _add_h / 2, __txtx("panel_tunnel_create_tunnel", "Create tunnel"));

3
scripts/rotator/rotator.gml
View file

@ -8,9 +8,6 @@ function rotator(_onModify, _step = -1) : widget() constructor {
real_val = 0; real_val = 0;
side_button = noone; side_button = noone;
spr_bg = THEME.rotator_bg;
spr_knob = THEME.rotator_knob;
tb_value = new textBox(TEXTBOX_INPUT.number, onModify).setSlideStep(15); tb_value = new textBox(TEXTBOX_INPUT.number, onModify).setSlideStep(15);
tb_value.hide = true; tb_value.hide = true;

45
scripts/sprite_loader/sprite_loader.gml
View file

@ -18,34 +18,37 @@ function _sprite_path(rel, theme) { INLINE return $"{DIRECTORY}Themes/{theme}/gr
function _sprite_load_from_struct(str, theme, key) { function _sprite_load_from_struct(str, theme, key) {
var path = _sprite_path(str.path, theme); var path = _sprite_path(str.path, theme);
var numb = struct_try_get(str, "s", 1);
var sx = struct_try_get(str, "x", 0);
var sy = struct_try_get(str, "y", 0);
var s = sprite_add(path, str.s, false, true, str.x, str.y); var s = sprite_add(path, numb, false, true, sx, sy);
if(s < 0) { log_message("THEME", $"Load sprite {path} failed."); return 0; } if(s < 0) { log_message("THEME", $"Load sprite {path} failed."); return 0; }
if(struct_has(str, "slice")) { if(!struct_has(str, "slice")) return s;
var slice = sprite_nineslice_create();
slice.enabled = true; var slice = sprite_nineslice_create();
slice.enabled = true;
if(is_array(str.slice)) {
slice.left = str.slice[0];
slice.right = str.slice[1];
slice.top = str.slice[2];
slice.bottom = str.slice[3];
if(is_array(str.slice)) { } else if(is_real(str.slice)) {
slice.left = str.slice[0]; slice.left = str.slice;
slice.right = str.slice[1]; slice.right = str.slice;
slice.top = str.slice[2]; slice.top = str.slice;
slice.bottom = str.slice[3]; slice.bottom = str.slice;
} else if(is_real(str.slice)) {
slice.left = str.slice;
slice.right = str.slice;
slice.top = str.slice;
slice.bottom = str.slice;
}
if(struct_has(str, "slicemode"))
slice.tilemode = array_create(5, str.slicemode);
sprite_set_nineslice(s, slice);
} }
if(struct_has(str, "slicemode"))
slice.tilemode = array_create(5, str.slicemode);
sprite_set_nineslice(s, slice);
return s; return s;
} }

4
scripts/steam_ugc_collection/steam_ugc_collection.gml
View file

@ -82,10 +82,10 @@ function steam_ugc_collection_generate(file, dest_path = TEMPDIR + "steamUGCthum
BLEND_NORMAL BLEND_NORMAL
draw_sprite_ext(STEAM_AVATAR, 0, avx, avy, ss, ss, 0, c_white, 1); draw_sprite_ext(STEAM_AVATAR, 0, avx, avy, ss, ss, 0, c_white, 1);
BLEND_MULTIPLY BLEND_MULTIPLY
draw_sprite_stretched(THEME.timeline_node, 0, avx, avy, avw, avh); draw_sprite_stretched(THEME.ui_panel, 0, avx, avy, avw, avh);
BLEND_NORMAL BLEND_NORMAL
draw_sprite_stretched_add(THEME.timeline_node, 1, avx, avy, avw, avh, c_white, 0.3); draw_sprite_stretched_add(THEME.ui_panel, 1, avx, avy, avw, avh, c_white, 0.3);
surface_reset_target(); surface_reset_target();
} }

4
scripts/steam_ugc_project/steam_ugc_project.gml
View file

@ -89,10 +89,10 @@ function steam_ugc_project_generate(file, dest_path = TEMPDIR + "steamUGCthumbna
BLEND_NORMAL BLEND_NORMAL
draw_sprite_ext(STEAM_AVATAR, 0, avx, avy, ss, ss, 0, c_white, 1); draw_sprite_ext(STEAM_AVATAR, 0, avx, avy, ss, ss, 0, c_white, 1);
BLEND_MULTIPLY BLEND_MULTIPLY
draw_sprite_stretched(THEME.timeline_node, 0, avx, avy, avw, avh); draw_sprite_stretched(THEME.ui_panel, 0, avx, avy, avw, avh);
BLEND_NORMAL BLEND_NORMAL
draw_sprite_stretched_add(THEME.timeline_node, 1, avx, avy, avw, avh, c_white, 0.3); draw_sprite_stretched_add(THEME.ui_panel, 1, avx, avy, avw, avh, c_white, 0.3);
surface_reset_target(); surface_reset_target();
} }

4
scripts/surfaceBox/surfaceBox.gml
View file

@ -116,7 +116,7 @@ function surfaceBox(_onModify, def_path = "") : widget() constructor {
var _nx = sx1 - _tw; var _nx = sx1 - _tw;
var _ny = sy1 - _th; var _ny = sy1 - _th;
draw_sprite_stretched_ext(THEME.timeline_node, 0, _nx, _ny, _tw, _th, COLORS.panel_bg_clear_inner, 0.85); draw_sprite_stretched_ext(THEME.ui_panel, 0, _nx, _ny, _tw, _th, COLORS.panel_bg_clear_inner, 0.85);
draw_text_add(sx1 - ui(3), sy1 + ui(1), _txt); draw_text_add(sx1 - ui(3), sy1 + ui(1), _txt);
} }
@ -130,7 +130,7 @@ function surfaceBox(_onModify, def_path = "") : widget() constructor {
draw_sprite_stretched_ext(THEME.widget_selecting, 0, _x - ui(3), _y - ui(3), _w + ui(6), _h + ui(6), COLORS._main_accent, 1); draw_sprite_stretched_ext(THEME.widget_selecting, 0, _x - ui(3), _y - ui(3), _w + ui(6), _h + ui(6), COLORS._main_accent, 1);
if(DRAGGING && DRAGGING.type == "Asset" && hover && hoverRect) { if(DRAGGING && DRAGGING.type == "Asset" && hover && hoverRect) {
draw_sprite_stretched_ext(THEME.ui_panel_active, 0, _x, _y, _w, _h, COLORS._main_value_positive, 1); draw_sprite_stretched_ext(THEME.ui_panel, 1, _x, _y, _w, _h, COLORS._main_value_positive, 1);
if(mouse_release(mb_left)) if(mouse_release(mb_left))
onModify(DRAGGING.data.path); onModify(DRAGGING.data.path);
} }

2
scripts/textArea/textArea.gml
View file

@ -1018,7 +1018,7 @@ function textArea(_input, _onModify) : textInput(_input, _onModify) constructor
#endregion #endregion
if(DRAGGING && (DRAGGING.type == "Text" || DRAGGING.type == "Number") && hover && hoverRect) { if(DRAGGING && (DRAGGING.type == "Text" || DRAGGING.type == "Number") && hover && hoverRect) {
draw_sprite_stretched_ext(THEME.ui_panel_active, 0, _x, _y, _w, hh, COLORS._main_value_positive, 1); draw_sprite_stretched_ext(THEME.ui_panel, 1, _x, _y, _w, hh, COLORS._main_value_positive, 1);
if(mouse_release(mb_left)) if(mouse_release(mb_left))
onModify(DRAGGING.data); onModify(DRAGGING.data);
} }

2
scripts/textBox/textBox.gml
View file

@ -809,7 +809,7 @@ function textBox(_input, _onModify) : textInput(_input, _onModify) constructor {
} }
if(DRAGGING && (DRAGGING.type == "Text" || DRAGGING.type == "Number") && hover && hoverRect) { if(DRAGGING && (DRAGGING.type == "Text" || DRAGGING.type == "Number") && hover && hoverRect) {
draw_sprite_stretched_ext(THEME.ui_panel_active, 0, _x, _y, _w, _h, COLORS._main_value_positive, 1); draw_sprite_stretched_ext(THEME.ui_panel, 1, _x, _y, _w, _h, COLORS._main_value_positive, 1);
if(mouse_release(mb_left)) if(mouse_release(mb_left))
onModify(DRAGGING.data); onModify(DRAGGING.data);
} }

67
scripts/theme_definition/theme_definition.gml
View file

@ -1,12 +1,10 @@
function Theme() constructor { function Theme() constructor {
icon_24 = s_icon_24; icon_24 = s_icon_24;
icon_32 = s_icon_32;
icon_64 = s_icon_64; icon_64 = s_icon_64;
color_3d = s_color_3d; color_3d = s_color_3d;
color_3d_selected = s_color_3d_selected; color_3d_selected = s_color_3d_selected;
button_color_overlay = s_color_picker_sample;
color_picker_box = s_color_picker_box; color_picker_box = s_color_picker_box;
color_picker_sample = s_color_picker_sample; color_picker_sample = s_color_picker_sample;
dialog_active = s_dialog_active; dialog_active = s_dialog_active;
@ -20,17 +18,14 @@ function Theme() constructor {
ac_node = s_ac_node; ac_node = s_ac_node;
accept_16 = s_icon_accept_16; accept_16 = s_icon_accept_16;
accept = s_icon_accept_24; accept = s_icon_accept_24;
action_history = s_action_history;
add_16 = s_add_16; add_16 = s_add_16;
add_20 = s_add_20; add_20 = s_add_20;
add_64 = s_add_64;
add = s_add_24; add = s_add_24;
add_node_search_high = s_add_node_search_high; add_node_search_high = s_add_node_search_high;
addon_icon = s_addon; addon_icon = s_addon;
addon_setting = s_addon_setting; addon_setting = s_addon_setting;
animate_clock = s_animate_clock; animate_clock = s_animate_clock;
animate_node_go = s_animate_node_go; animate_node_go = s_animate_node_go;
animate_onion_skin = s_animate_onion_skin;
animate_prop_go = s_animate_prop_go; animate_prop_go = s_animate_prop_go;
animation_setting = s_animation_setting; animation_setting = s_animation_setting;
animation_stretch = s_animation_stretch; animation_stretch = s_animation_stretch;
@ -40,7 +35,6 @@ function Theme() constructor {
arrow_wire_16 = s_arrow_wire_16; arrow_wire_16 = s_arrow_wire_16;
bone = s_bone; bone = s_bone;
button_path_icon = s_button_path_icon; button_path_icon = s_button_path_icon;
button_path_not_found_icon = s_button_path_not_found_icon;
cache_group = s_cache_group; cache_group = s_cache_group;
cache = s_cache; cache = s_cache;
canvas_20 = s_canvas_20; canvas_20 = s_canvas_20;
@ -49,7 +43,6 @@ function Theme() constructor {
circle_16 = s_circle_16; circle_16 = s_circle_16;
circle = s_circle_8; circle = s_circle_8;
circle_toggle_8 = s_circle_toggle_8; circle_toggle_8 = s_circle_toggle_8;
close_16 = s_close_16;
code_show_auto = s_code_show_auto; code_show_auto = s_code_show_auto;
code_show_line = s_code_show_line; code_show_line = s_code_show_line;
code_syntax_highlight = s_code_syntax_highlight; code_syntax_highlight = s_code_syntax_highlight;
@ -67,7 +60,6 @@ function Theme() constructor {
display_palette = s_display_palette; display_palette = s_display_palette;
duplicate = s_duplicate; duplicate = s_duplicate;
explorer = s_file_explorer; explorer = s_file_explorer;
export_package = s_icon_export_package;
feedback_24 = s_feedback_24; feedback_24 = s_feedback_24;
feedback = s_feedback_16; feedback = s_feedback_16;
file = s_file; file = s_file;
@ -81,7 +73,6 @@ function Theme() constructor {
frame_range = s_frame_range; frame_range = s_frame_range;
gear = s_gear_24; gear = s_gear_24;
grad_blend = s_grad_blend; grad_blend = s_grad_blend;
graph = s_graph;
group_s = s_group_16; group_s = s_group_16;
group = s_group_24; group = s_group_24;
hamburger_s = s_hamburger_s; hamburger_s = s_hamburger_s;
@ -89,7 +80,6 @@ function Theme() constructor {
heart = s_heart; heart = s_heart;
icon_3d_anchor = s_3d_anchor; icon_3d_anchor = s_3d_anchor;
icon_active_split = s_panel_active_split; icon_active_split = s_panel_active_split;
icon_array_processor = s_icon_array_processor;
icon_canvas = s_icon_canvas; icon_canvas = s_icon_canvas;
icon_center_canvas = s_icon_center_canvas; icon_center_canvas = s_icon_center_canvas;
icon_cmd_enter = s_icon_cmd_enter; icon_cmd_enter = s_icon_cmd_enter;
@ -97,7 +87,6 @@ function Theme() constructor {
icon_delete = s_delete_16; icon_delete = s_delete_16;
icon_font = s_icon_font; icon_font = s_icon_font;
icon_grid_setting = s_icon_grid_setting; icon_grid_setting = s_icon_grid_setting;
icon_grid = s_icon_grid;
icon_minimap = s_icon_minimap; icon_minimap = s_icon_minimap;
icon_preview_export = s_icon_preview_export; icon_preview_export = s_icon_preview_export;
icon_random = s_random; icon_random = s_random;
@ -111,7 +100,6 @@ function Theme() constructor {
image_20 = s_image_20; image_20 = s_image_20;
info = s_info; info = s_info;
inspector_view = s_icon_inspector_view; inspector_view = s_icon_inspector_view;
itch = s_itch;
junc_visible = s_junc_visible; junc_visible = s_junc_visible;
keyframe_override = s_icon_keyframe_override; keyframe_override = s_icon_keyframe_override;
loading_s = s_loading_s; loading_s = s_loading_s;
@ -123,26 +111,17 @@ function Theme() constructor {
message_16_grey_bubble = s_icon_message_16_grey_bubble; message_16_grey_bubble = s_icon_message_16_grey_bubble;
message_16_grey = s_icon_message_16_grey; message_16_grey = s_icon_message_16_grey;
message_16 = s_icon_message_16; message_16 = s_icon_message_16;
message_20 = s_icon_message_20;
message_24 = s_icon_message_24;
minus_16 = s_minus_16; minus_16 = s_minus_16;
minus_20 = s_minus_20;
minus = s_minus_24; minus = s_minus_24;
new_file = s_new; new_file = s_new;
new_line_shift = s_new_line_shift; new_line_shift = s_new_line_shift;
node_create = s_node_create;
node_dropper = s_icon_node_dropper; node_dropper = s_icon_node_dropper;
node_goto = s_node_goto; node_goto = s_node_goto;
node_move = s_node_move;
node_name_type = s_node_name_type; node_name_type = s_node_name_type;
node_output_visible = s_icon_output_visibility;
node_processor_icon = s_node_processor; node_processor_icon = s_node_processor;
node_resize = s_node_resize; node_resize = s_node_resize;
node_use_expression = s_node_use_experssion; node_use_expression = s_node_use_experssion;
node_use_global = s_node_use_global;
node_use_project = s_node_use_project; node_use_project = s_node_use_project;
noti_icon_console_failed = s_noti_icon_console_failed;
noti_icon_console = s_noti_icon_console;
noti_icon_error = s_noti_icon_error; noti_icon_error = s_noti_icon_error;
noti_icon_file_load = s_noti_icon_file_load; noti_icon_file_load = s_noti_icon_file_load;
noti_icon_file_save = s_noti_icon_file_save; noti_icon_file_save = s_noti_icon_file_save;
@ -166,10 +145,6 @@ function Theme() constructor {
play_all = s_play_all; play_all = s_play_all;
play_sound = s_icon_play_sound; play_sound = s_icon_play_sound;
preset = s_preset; preset = s_preset;
preview_hide = s_hide_preview;
preview_light = s_icon_preview_light;
project_fix_palette = s_project_fix_palette;
project = s_project;
redo = s_redo; redo = s_redo;
refresh_16 = s_refresh_16; refresh_16 = s_refresh_16;
refresh_20 = s_refresh_20; refresh_20 = s_refresh_20;
@ -195,10 +170,7 @@ function Theme() constructor {
tab_exit = s_tab_exit; tab_exit = s_tab_exit;
text_bullet = s_text_bullet; text_bullet = s_text_bullet;
text_popup = s_text_popup; text_popup = s_text_popup;
text_slider = s_slider;
text = s_name; text = s_name;
three_dots = s_three_dots;
timeline_clock = s_timeline_clock;
timeline_graph = s_timeline_graph; timeline_graph = s_timeline_graph;
trophy = s_trophy; trophy = s_trophy;
tunnel = s_tunnel; tunnel = s_tunnel;
@ -218,14 +190,12 @@ function Theme() constructor {
view_zoom = s_view_zoom; view_zoom = s_view_zoom;
visible_12 = s_visible_12; visible_12 = s_visible_12;
visible = s_visible; visible = s_visible;
websocket = s_websocket;
wiki = s_wiki; wiki = s_wiki;
window_exit = s_window_exit; window_exit = s_window_exit;
window_fullscreen = s_window_fullscreen; window_fullscreen = s_window_fullscreen;
window_maximize = s_window_maximize; window_maximize = s_window_maximize;
window_minimize = s_window_minimize; window_minimize = s_window_minimize;
workshop_collection = s_group_workshop; workshop_collection = s_group_workshop;
workshop_download = s_workshop_download;
workshop_project = s_project_workshop; workshop_project = s_project_workshop;
workshop_update = s_workshop_update; workshop_update = s_workshop_update;
workshop_upload = s_workshop_upload; workshop_upload = s_workshop_upload;
@ -233,8 +203,6 @@ function Theme() constructor {
inspector_area_type = s_prop_area_type; inspector_area_type = s_prop_area_type;
inspector_area = s_inspector_area; inspector_area = s_inspector_area;
inspector_corner = s_inspector_corner;
inspector_padding = s_inspector_padding;
inspector_surface_halign = s_inspector_surface_halign; inspector_surface_halign = s_inspector_surface_halign;
inspector_surface_valign = s_inspector_surface_valign; inspector_surface_valign = s_inspector_surface_valign;
inspector_text_halign = s_inspector_text_halign; inspector_text_halign = s_inspector_text_halign;
@ -264,50 +232,29 @@ function Theme() constructor {
node_active = s_node_active; node_active = s_node_active;
node_bg_name = s_node_bg_name; node_bg_name = s_node_bg_name;
node_frame_name = s_node_frame_name; node_frame_name = s_node_frame_name;
node_bg_pill = s_node_bg_pill;
node_bg = s_node_bg; node_bg = s_node_bg;
node_checkbox = s_node_checkbox;
node_coor_pin = s_node_coor_pin; node_coor_pin = s_node_coor_pin;
node_deprecated_badge = s_node_deprecated_badge; node_deprecated_badge = s_node_deprecated_badge;
node_frame_bg = s_node_frame_bg; node_frame_bg = s_node_frame_bg;
node_frame_title = s_node_frame_title;
node_glow_border = s_node_bg_glow; node_glow_border = s_node_bg_glow;
node_junction_name_bg = s_node_junction_name_bg; node_junction_name_bg = s_node_junction_name_bg;
node_new_badge = s_node_new_badge; node_new_badge = s_node_new_badge;
node_note_bg = s_node_note_bg;
node_note_pin = s_node_note_pin;
node_note_resize = s_node_note_resize;
node_note_selecting = s_node_note_selecting;
node_note_title = s_node_note_title;
node_pin_bg_active = s_node_bg_pin_active;
node_pin_bg = s_node_bg_pin;
node_rotator_bg = s_node_rotator_bg;
node_rotator_knob = s_node_rotator_knob;
node_slider = s_node_slider;
node_state = s_node_state; node_state = s_node_state;
node_trigger_icon = s_node_bg_trigger; node_trigger_icon = s_node_bg_trigger;
node_websocket_receive = s_websocket_receive; node_websocket_receive = s_websocket_receive;
node_websocket_send = s_websocket_send; node_websocket_send = s_websocket_send;
gradient_mask = s_gradient_mask;
key_display = s_key_display; key_display = s_key_display;
menu_button_mask = s_menu_white; menu_button_mask = s_menu_white;
menu_button = s_menu_button; menu_button = s_menu_button;
menu_separator = s_menu_separator;
palette_mask = s_palette_mask; palette_mask = s_palette_mask;
palette_selecting = s_palette_selecting; palette_selecting = s_palette_selecting;
palette_separator = s_palette_separator;
timeline_color = s_ui_timeline_color; timeline_color = s_ui_timeline_color;
timeline_dopesheet_bg = s_timeline_dopesheet_bg;
timeline_folder = s_ui_timeline_folder;
timeline_node = s_ui_timeline_node;
tool_side = s_tool_side; tool_side = s_tool_side;
toolbar_shadow = s_toolbar_shadow;
toolbar = s_toolbar; toolbar = s_toolbar;
ui_panel_active = s_ui_panel_active; ui_panel = s_ui_panel;
ui_panel_bg_cover = s_empty; ui_panel_bg_cover = s_empty;
ui_panel_bg = s_ui_panel_bg; ui_panel_bg = s_ui_panel_bg;
ui_panel_fg = s_ui_panel_fg;
ui_panel_tab = s_ui_panel_tab; ui_panel_tab = s_ui_panel_tab;
ui_scrollbar = s_ui_scroll_bar; ui_scrollbar = s_ui_scroll_bar;
ui_selection_range_hori = s_ui_selection_range_hori; ui_selection_range_hori = s_ui_selection_range_hori;
@ -322,20 +269,16 @@ function Theme() constructor {
anchor_scale_hori = s_anchor_scale_hori; anchor_scale_hori = s_anchor_scale_hori;
anchor_scale = s_anchor_scale; anchor_scale = s_anchor_scale;
anchor_selector = s_anchor_selector; anchor_selector = s_anchor_selector;
anchor_solid_hori = s_anchor_solid;
anchor = s_anchor; anchor = s_anchor;
cursor_path_add = s_cursor_path_add; cursor_path_add = s_cursor_path_add;
cursor_path_anchor = s_cursor_path_anchor; cursor_path_anchor = s_cursor_path_anchor;
cursor_path_move = s_cursor_path_move; cursor_path_move = s_cursor_path_move;
cursor_path_remove = s_cursor_path_remove; cursor_path_remove = s_cursor_path_remove;
preview_bone_IK = s_bone_IK; preview_bone_IK = s_bone_IK;
preview_crosshair = s_preview_crosshair;
timeline_ease = s_timeline_ease; timeline_ease = s_timeline_ease;
timeline_elastic = s_timeline_elastic;
timeline_key_ease = s_timelime_key_ease; timeline_key_ease = s_timelime_key_ease;
timeline_key_empty = s_timelime_key_empty; timeline_key_empty = s_timelime_key_empty;
timeline_keyframe_outline = s_timeline_keyframe_outline;
timeline_keyframe_selecting = s_timeline_keyframe_selecting; timeline_keyframe_selecting = s_timeline_keyframe_selecting;
timeline_keyframe = s_timeline_keyframes; timeline_keyframe = s_timeline_keyframes;
timeline_onion_skin = s_timeline_onion_skin; timeline_onion_skin = s_timeline_onion_skin;
@ -358,7 +301,6 @@ function Theme() constructor {
bone_tool_move = s_bone_tool_move; bone_tool_move = s_bone_tool_move;
bone_tool_remove = s_bone_tool_remove; bone_tool_remove = s_bone_tool_remove;
bone_tool_scale = s_bone_tool_scale; bone_tool_scale = s_bone_tool_scale;
bone_tool_transform = s_bone_tool_transform;
canvas_draw_layer = s_canvas_draw_layer; canvas_draw_layer = s_canvas_draw_layer;
canvas_iso_angle = s_canvas_iso_angle; canvas_iso_angle = s_canvas_iso_angle;
canvas_fill_type = s_canvas_fill_type; canvas_fill_type = s_canvas_fill_type;
@ -394,8 +336,6 @@ function Theme() constructor {
canvas_tools_skew = s_canvas_tools_skew; canvas_tools_skew = s_canvas_tools_skew;
control_add = s_control_add; control_add = s_control_add;
control_pin = s_control_pin; control_pin = s_control_pin;
control_remove = s_control_remove;
control_unpin = s_control_unpin;
crop_fit_height = s_crop_fit_height; crop_fit_height = s_crop_fit_height;
crop_fit_width = s_crop_fit_width; crop_fit_width = s_crop_fit_width;
crop_tool = s_crop_tool; crop_tool = s_crop_tool;
@ -407,7 +347,6 @@ function Theme() constructor {
path_tools_draw = s_path_tools_draw; path_tools_draw = s_path_tools_draw;
path_tools_rectangle = s_path_tools_rectangle; path_tools_rectangle = s_path_tools_rectangle;
path_tools_transform = s_path_tools_transform; path_tools_transform = s_path_tools_transform;
splice_draw = s_splice_draw;
strand_comb = s_strand_tool_comb; strand_comb = s_strand_tool_comb;
strand_cut = s_strand_tool_cut; strand_cut = s_strand_tool_cut;
strand_grab = s_strand_tool_grab; strand_grab = s_strand_tool_grab;
@ -421,7 +360,6 @@ function Theme() constructor {
tools_canvas_channel = s_canvas_channel; tools_canvas_channel = s_canvas_channel;
button_def = s_button; button_def = s_button;
button_hide_circle_28 = s_button_hide_circle_28;
button_hide_fill = s_button_hide_fill; button_hide_fill = s_button_hide_fill;
button_hide_left = s_button_hide_left; button_hide_left = s_button_hide_left;
button_hide_middle = s_button_hide_middle; button_hide_middle = s_button_hide_middle;
@ -575,9 +513,10 @@ function ThemeColor() constructor {
panel_animation_dope_blend_default = merge_color(CDEF.blue, CDEF.main_dkblack, 0.5); panel_animation_dope_blend_default = merge_color(CDEF.blue, CDEF.main_dkblack, 0.5);
panel_animation_dope_blend = CDEF.main_dkblack; panel_animation_dope_blend = CDEF.main_dkblack;
panel_bg_clear_inner = CDEF.main_dkblack; panel_bg_clear_inner = CDEF.main_dkblack;
panel_bg_clear = CDEF.main_black; panel_bg_clear = CDEF.main_black;
panel_frame = CDEF.main_dkgrey;
panel_prop_bg = CDEF.main_ltgrey; panel_prop_bg = CDEF.main_ltgrey;
panel_tab = CDEF.white; panel_tab = CDEF.white;
panel_tab_hover = CDEF.white; panel_tab_hover = CDEF.white;

BIN
sprites/s_ui_panel/a9fbae5e-8d08-41bc-94e6-606ca5d7c680.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 383 B

BIN
sprites/s_ui_panel/d1bb66ba-563d-478d-b11d-96e79c67e6fe.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 397 B

BIN
sprites/s_ui_panel/dc817d33-1430-4da7-b5e5-45dc53e2a31d.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 360 B

BIN
sprites/s_ui_panel/layers/a9fbae5e-8d08-41bc-94e6-606ca5d7c680/ed9e0b6c-dca5-4b40-8c4e-d14025a7bdc6.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 383 B

BIN
sprites/s_ui_panel/layers/d1bb66ba-563d-478d-b11d-96e79c67e6fe/ed9e0b6c-dca5-4b40-8c4e-d14025a7bdc6.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 397 B

BIN
sprites/s_ui_panel/layers/dc817d33-1430-4da7-b5e5-45dc53e2a31d/ed9e0b6c-dca5-4b40-8c4e-d14025a7bdc6.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 360 B

28
sprites/s_ui_panel_active/s_ui_panel_active.yy → sprites/s_ui_panel/s_ui_panel.yy
View file

@ -1,6 +1,6 @@
{ {
"$GMSprite":"", "$GMSprite":"",
"%Name":"s_ui_panel_active", "%Name":"s_ui_panel",
"bboxMode":0, "bboxMode":0,
"bbox_bottom":11, "bbox_bottom":11,
"bbox_left":0, "bbox_left":0,
@ -12,17 +12,18 @@
"edgeFiltering":false, "edgeFiltering":false,
"For3D":false, "For3D":false,
"frames":[ "frames":[
{"$GMSpriteFrame":"","%Name":"1cec423d-3a88-433e-82e0-c95cdb1085d1","name":"1cec423d-3a88-433e-82e0-c95cdb1085d1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, {"$GMSpriteFrame":"","%Name":"dc817d33-1430-4da7-b5e5-45dc53e2a31d","name":"dc817d33-1430-4da7-b5e5-45dc53e2a31d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
{"$GMSpriteFrame":"","%Name":"70eb96f1-0114-48d6-a0fd-dd87beb39bc5","name":"70eb96f1-0114-48d6-a0fd-dd87beb39bc5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, {"$GMSpriteFrame":"","%Name":"d1bb66ba-563d-478d-b11d-96e79c67e6fe","name":"d1bb66ba-563d-478d-b11d-96e79c67e6fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
{"$GMSpriteFrame":"","%Name":"a9fbae5e-8d08-41bc-94e6-606ca5d7c680","name":"a9fbae5e-8d08-41bc-94e6-606ca5d7c680","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
], ],
"gridX":0, "gridX":0,
"gridY":0, "gridY":0,
"height":12, "height":12,
"HTile":false, "HTile":false,
"layers":[ "layers":[
{"$GMImageLayer":"","%Name":"a5d22c37-c25c-4f41-97aa-deb81a71f901","blendMode":0,"displayName":"default","isLocked":false,"name":"a5d22c37-c25c-4f41-97aa-deb81a71f901","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, {"$GMImageLayer":"","%Name":"ed9e0b6c-dca5-4b40-8c4e-d14025a7bdc6","blendMode":0,"displayName":"default","isLocked":false,"name":"ed9e0b6c-dca5-4b40-8c4e-d14025a7bdc6","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,},
], ],
"name":"s_ui_panel_active", "name":"s_ui_panel",
"nineSlice":{ "nineSlice":{
"$GMNineSliceData":"", "$GMNineSliceData":"",
"bottom":4, "bottom":4,
@ -53,7 +54,7 @@
"resourceVersion":"2.0", "resourceVersion":"2.0",
"sequence":{ "sequence":{
"$GMSequence":"", "$GMSequence":"",
"%Name":"s_ui_panel_active", "%Name":"s_ui_panel",
"autoRecord":true, "autoRecord":true,
"backdropHeight":768, "backdropHeight":768,
"backdropImageOpacity":0.5, "backdropImageOpacity":0.5,
@ -69,7 +70,7 @@
}, },
"eventStubScript":null, "eventStubScript":null,
"eventToFunction":{}, "eventToFunction":{},
"length":2.0, "length":3.0,
"lockOrigin":false, "lockOrigin":false,
"moments":{ "moments":{
"$KeyframeStore<MomentsEventKeyframe>":"", "$KeyframeStore<MomentsEventKeyframe>":"",
@ -77,7 +78,7 @@
"resourceType":"KeyframeStore<MomentsEventKeyframe>", "resourceType":"KeyframeStore<MomentsEventKeyframe>",
"resourceVersion":"2.0", "resourceVersion":"2.0",
}, },
"name":"s_ui_panel_active", "name":"s_ui_panel",
"playback":1, "playback":1,
"playbackSpeed":30.0, "playbackSpeed":30.0,
"playbackSpeedType":0, "playbackSpeedType":0,
@ -89,11 +90,14 @@
"tracks":[ "tracks":[
{"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore<SpriteFrameKeyframe>":"","Keyframes":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore<SpriteFrameKeyframe>":"","Keyframes":[
{"$Keyframe<SpriteFrameKeyframe>":"","Channels":{ {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1cec423d-3a88-433e-82e0-c95cdb1085d1","path":"sprites/s_ui_panel_active/s_ui_panel_active.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc817d33-1430-4da7-b5e5-45dc53e2a31d","path":"sprites/s_ui_panel/s_ui_panel.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
},"Disabled":false,"id":"08bf518a-2659-4794-b7e7-f7afa7b3b756","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,}, },"Disabled":false,"id":"28f4119a-ce18-4c62-b526-1ea16a9c4184","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
{"$Keyframe<SpriteFrameKeyframe>":"","Channels":{ {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
"0":{"$SpriteFrameKeyframe":"","Id":{"name":"70eb96f1-0114-48d6-a0fd-dd87beb39bc5","path":"sprites/s_ui_panel_active/s_ui_panel_active.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1bb66ba-563d-478d-b11d-96e79c67e6fe","path":"sprites/s_ui_panel/s_ui_panel.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
},"Disabled":false,"id":"d0acd14e-ef8f-4091-ad52-78f3d677ca5d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,}, },"Disabled":false,"id":"3b4c34f8-2ad1-4777-8515-c6e47a98658c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
{"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9fbae5e-8d08-41bc-94e6-606ca5d7c680","path":"sprites/s_ui_panel/s_ui_panel.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
},"Disabled":false,"id":"63409912-27f0-43f0-9768-f775de1ceb1e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
],"resourceType":"KeyframeStore<SpriteFrameKeyframe>","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ],"resourceType":"KeyframeStore<SpriteFrameKeyframe>","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,},
], ],
"visibleRange":null, "visibleRange":null,

BIN
sprites/s_ui_panel_active/1cec423d-3a88-433e-82e0-c95cdb1085d1.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 372 B

BIN
sprites/s_ui_panel_active/70eb96f1-0114-48d6-a0fd-dd87beb39bc5.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 365 B

BIN
sprites/s_ui_panel_active/layers/1cec423d-3a88-433e-82e0-c95cdb1085d1/a5d22c37-c25c-4f41-97aa-deb81a71f901.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 372 B

BIN
sprites/s_ui_panel_active/layers/70eb96f1-0114-48d6-a0fd-dd87beb39bc5/a5d22c37-c25c-4f41-97aa-deb81a71f901.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 365 B

BIN
sprites/s_ui_panel_fg/0027ec19-6f9d-45c7-bcc4-b9bc0c6d69de.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 422 B

BIN
sprites/s_ui_panel_fg/e601bdfa-4018-48a3-9783-4d3ae7008144.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 372 B

BIN
sprites/s_ui_panel_fg/layers/0027ec19-6f9d-45c7-bcc4-b9bc0c6d69de/72fc0a7c-7c43-4a85-9ea1-4b967ee76f27.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 422 B

BIN
sprites/s_ui_panel_fg/layers/e601bdfa-4018-48a3-9783-4d3ae7008144/72fc0a7c-7c43-4a85-9ea1-4b967ee76f27.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 372 B

113
sprites/s_ui_panel_fg/s_ui_panel_fg.yy
View file

@ -1,113 +0,0 @@
{
"$GMSprite":"",
"%Name":"s_ui_panel_fg",
"bboxMode":0,
"bbox_bottom":11,
"bbox_left":0,
"bbox_right":11,
"bbox_top":0,
"collisionKind":1,
"collisionTolerance":0,
"DynamicTexturePage":false,
"edgeFiltering":false,
"For3D":false,
"frames":[
{"$GMSpriteFrame":"","%Name":"0027ec19-6f9d-45c7-bcc4-b9bc0c6d69de","name":"0027ec19-6f9d-45c7-bcc4-b9bc0c6d69de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
{"$GMSpriteFrame":"","%Name":"e601bdfa-4018-48a3-9783-4d3ae7008144","name":"e601bdfa-4018-48a3-9783-4d3ae7008144","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
],
"gridX":0,
"gridY":0,
"height":12,
"HTile":false,
"layers":[
{"$GMImageLayer":"","%Name":"72fc0a7c-7c43-4a85-9ea1-4b967ee76f27","blendMode":0,"displayName":"default","isLocked":false,"name":"72fc0a7c-7c43-4a85-9ea1-4b967ee76f27","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,},
],
"name":"s_ui_panel_fg",
"nineSlice":{
"$GMNineSliceData":"",
"bottom":5,
"enabled":true,
"guideColour":[4294902015,4294902015,4294902015,4294902015,],
"highlightColour":1728023040,
"highlightStyle":0,
"left":5,
"resourceType":"GMNineSliceData",
"resourceVersion":"2.0",
"right":5,
"tileMode":[
0,
0,
0,
0,
0,
],
"top":5,
},
"origin":4,
"parent":{
"name":"UI",
"path":"folders/theme/UI.yy",
},
"preMultiplyAlpha":false,
"resourceType":"GMSprite",
"resourceVersion":"2.0",
"sequence":{
"$GMSequence":"",
"%Name":"s_ui_panel_fg",
"autoRecord":true,
"backdropHeight":768,
"backdropImageOpacity":0.5,
"backdropImagePath":"",
"backdropWidth":1366,
"backdropXOffset":0.0,
"backdropYOffset":0.0,
"events":{
"$KeyframeStore<MessageEventKeyframe>":"",
"Keyframes":[],
"resourceType":"KeyframeStore<MessageEventKeyframe>",
"resourceVersion":"2.0",
},
"eventStubScript":null,
"eventToFunction":{},
"length":2.0,
"lockOrigin":false,
"moments":{
"$KeyframeStore<MomentsEventKeyframe>":"",
"Keyframes":[],
"resourceType":"KeyframeStore<MomentsEventKeyframe>",
"resourceVersion":"2.0",
},
"name":"s_ui_panel_fg",
"playback":1,
"playbackSpeed":30.0,
"playbackSpeedType":0,
"resourceType":"GMSequence",
"resourceVersion":"2.0",
"showBackdrop":true,
"showBackdropImage":false,
"timeUnits":1,
"tracks":[
{"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore<SpriteFrameKeyframe>":"","Keyframes":[
{"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0027ec19-6f9d-45c7-bcc4-b9bc0c6d69de","path":"sprites/s_ui_panel_fg/s_ui_panel_fg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
},"Disabled":false,"id":"8bfd9313-13ae-42d6-a868-137abd546637","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
{"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e601bdfa-4018-48a3-9783-4d3ae7008144","path":"sprites/s_ui_panel_fg/s_ui_panel_fg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
},"Disabled":false,"id":"da7665e8-391f-4023-939b-12b3c8d615bf","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
],"resourceType":"KeyframeStore<SpriteFrameKeyframe>","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,},
],
"visibleRange":null,
"volume":1.0,
"xorigin":6,
"yorigin":6,
},
"swatchColours":null,
"swfPrecision":0.5,
"textureGroupId":{
"name":"Default",
"path":"texturegroups/Default",
},
"type":0,
"VTile":false,
"width":12,
}