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

UI

Browse source
This commit is contained in:
Tanasart 2023-11-13 21:42:14 +07:00
parent a1b8f26abd
commit 4df0892dad
39 changed files with 134 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
datafiles/data/themes/default.zip
View file

Binary file not shown.

4
objects/_p_dialog/Create_0.gml
View file

@ -1,4 +1,8 @@
/// @description init
#macro DIALOG_PAD 8
#macro DIALOG_DRAW_BG draw_sprite_stretched(THEME.dialog_bg, 0, dialog_x - 8, dialog_y - 8, dialog_w + 16, dialog_h + 16);
#macro DIALOG_DRAW_FOCUS draw_sprite_stretched_ext(THEME.dialog_active, 0, dialog_x - 8, dialog_y - 8, dialog_w + 16, dialog_h + 16, COLORS._main_accent, 1);
#region data
with(_p_dialog) other.depth = min(depth - 1, other.depth);

6
objects/o_dialog_about/Draw_64.gml
View file

@ -2,9 +2,9 @@
if !ready exit;
#region base UI
draw_sprite_stretched(THEME.dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h);
DIALOG_DRAW_BG
if(sFOCUS)
draw_sprite_stretched_ext(THEME.dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h, COLORS._main_accent, 1);
DIALOG_DRAW_FOCUS
#endregion
#region about
@ -20,7 +20,7 @@ if !ready exit;
draw_text(cx, ly, "2021, MakhamDev");
var thank_y = dialog_y + ui(188);
draw_sprite_stretched(THEME.ui_panel_bg, 0, dialog_x + ui(24), thank_y - ui(8), dialog_w - ui(48), thank_h + ui(16));
draw_sprite_stretched(THEME.ui_panel_bg, 1, dialog_x + ui(24), thank_y - ui(8), dialog_w - ui(48), thank_h + ui(16));
sc_thank.setFocusHover(sFOCUS, sHOVER);
sc_thank.draw(dialog_x + ui(32), thank_y);
#endregion

4
objects/o_dialog_add_multiple_images/Draw_64.gml
View file

@ -2,9 +2,9 @@
if !ready exit;
#region base UI
draw_sprite_stretched(THEME.dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h);
DIALOG_DRAW_BG
if(sFOCUS)
draw_sprite_stretched_ext(THEME.dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h, COLORS._main_accent, 1);
DIALOG_DRAW_FOCUS
draw_set_text(f_p0, fa_left, fa_top, COLORS._main_text);
draw_text(dialog_x + ui(24), dialog_y + ui(16), __txtx("add_images_title_images", "Import multiple images"));

9
objects/o_dialog_add_node/Create_0.gml
View file

@ -264,12 +264,12 @@ event_inherited();
var name = "";
if(i == -1) {
draw_set_text(f_p0b, fa_left, fa_center, COLORS._main_text_accent);
//draw_set_text(f_p0b, fa_left, fa_center, COLORS._main_text_accent);
name = "All";
} else {
var cat = category[| i];
name = cat.name;
draw_set_text(f_p0, fa_left, fa_center, COLORS._main_text);
//draw_set_text(f_p0, fa_left, fa_center, COLORS._main_text);
if(array_length(cat.filter)) {
if(!array_exists(cat.filter, context)) {
@ -283,7 +283,7 @@ event_inherited();
BLEND_OVERRIDE;
if(i == ADD_NODE_PAGE) {
draw_sprite_stretched(THEME.ui_panel_bg, 1, 0, _y + hh, category_width - ui(32), hg);
//draw_sprite_stretched(THEME.ui_panel_bg, 1, 0, _y + hh, category_width - ui(32), hg);
} else if(sHOVER && catagory_pane.hover && point_in_rectangle(_m[0], _m[1], 0, _y + hh, category_width - ui(32), _y + hh + hg - 1)) {
draw_sprite_stretched_ext(THEME.ui_panel_bg, 0, 0, _y + hh, category_width - ui(32), hg, CDEF.main_white, 1);
if(mouse_click(mb_left, sFOCUS)) {
@ -295,6 +295,9 @@ event_inherited();
}
BLEND_NORMAL;
if(i == ADD_NODE_PAGE) draw_set_text(f_p0b, fa_left, fa_center, COLORS._main_text_accent);
else draw_set_text(f_p0, fa_left, fa_center, COLORS._main_text_inner);
name = __txt(name);
draw_text(ui(8), _y + hh + hg / 2, name);
hh += hg;

4
objects/o_dialog_add_node/Draw_64.gml
View file

@ -2,8 +2,8 @@
if !ready exit;
#region base UI
draw_sprite_stretched(THEME.dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h);
if(sFOCUS) draw_sprite_stretched_ext(THEME.dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h, COLORS._main_accent, 1);
DIALOG_DRAW_BG
if(sFOCUS) DIALOG_DRAW_FOCUS
#endregion
#region search

6
objects/o_dialog_assetbox/Create_0.gml
View file

@ -41,16 +41,16 @@ event_inherited();
#endregion
#region surface
folderW = ui(204);
folderW = ui(200);
folderW_dragging = false;
folderW_drag_mx = 0;
folderW_drag_sx = 0;
content_w = dialog_w - ui(34) - folderW;
content_w = dialog_w - ui(38) - folderW;
content_h = dialog_h - ui(32);
function onResize() {
content_w = dialog_w - ui(34) - folderW;
content_w = dialog_w - ui(38) - folderW;
content_h = dialog_h - ui(32);
contentPane.resize(content_w, content_h);

12
objects/o_dialog_assetbox/Draw_64.gml
View file

@ -1,8 +1,8 @@
/// @description init
#region base UI
draw_sprite_stretched(THEME.dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h);
DIALOG_DRAW_BG
if(sFOCUS)
draw_sprite_stretched_ext(THEME.dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h, COLORS._main_accent, 1);
DIALOG_DRAW_FOCUS
#endregion
#region draw
@ -20,8 +20,8 @@
draw_set_text(f_p0b, fa_left, fa_top, COLORS._main_text);
draw_text(dialog_x + ui(16), dialog_y + ui(16), __txt("Assets"));
draw_sprite_stretched(THEME.ui_panel_bg, 1, dialog_x + ui(16), dialog_y + ui(48), folderW - ui(24), dialog_h - ui(64));
draw_sprite_stretched(THEME.ui_panel_bg, 1, dialog_x + ui(12) + folderW, dialog_y + ui(16), dialog_w - ui(28) - folderW, dialog_h - ui(32));
//draw_sprite_stretched(THEME.ui_panel_bg, 1, dialog_x + ui(16), dialog_y + ui(48), folderW - ui(24), dialog_h - ui(64));
draw_sprite_stretched(THEME.ui_panel_bg, 1, dialog_x + ui(12 - 4) + folderW, dialog_y + ui(16), dialog_w - ui(28) - folderW, dialog_h - ui(32));
var dx0 = dialog_x + ui(16) + folderW - ui(8);
var dx1 = dialog_x + ui(16) + folderW;
@ -38,8 +38,8 @@
}
folderPane.setFocusHover(sFOCUS, sHOVER);
folderPane.draw(dialog_x + ui(16), dialog_y + ui(48));
folderPane.draw(dialog_x + ui(12), dialog_y + ui(48));
contentPane.setFocusHover(sFOCUS, sHOVER);
contentPane.draw(dialog_x + ui(12) + folderW, dialog_y + ui(16));
contentPane.draw(dialog_x + ui(12 - 4) + folderW, dialog_y + ui(16));
#endregion

5
objects/o_dialog_color_selector/Create_0.gml
View file

@ -64,9 +64,8 @@ event_inherited();
var isHover = _hover && point_in_rectangle(_m[0], _m[1], ui(4), yy, ui(4) + sp_preset_w - ui(16), yy + _height);
draw_sprite_stretched(THEME.ui_panel_bg, 1, ui(4), yy, sp_preset_w - ui(16), _height);
if(isHover)
draw_sprite_stretched_ext(THEME.node_active, 1, ui(4), yy, sp_preset_w - ui(16), _height, COLORS._main_accent, 1);
draw_sprite_stretched(THEME.ui_panel_bg, 3, ui(4), yy, sp_preset_w - ui(16), _height);
if(isHover) draw_sprite_stretched_ext(THEME.ui_panel_fg, 1, ui(4), yy, sp_preset_w - ui(16), _height, COLORS._main_accent, 1);
var x0 = ui(16) + (i == -1) * ui(8 + 6);
var cc = i == preset_selecting? COLORS._main_accent : COLORS._main_text_sub;

14
objects/o_dialog_color_selector/Draw_64.gml
View file

@ -16,12 +16,16 @@ if !ready exit;
var content_x = dialog_x + presets_w + ui(16);
var content_w = dialog_w - presets_w - ui(16);
draw_sprite_stretched(THEME.dialog_bg, 0, presets_x, dialog_y, presets_w, dialog_h);
if(sFOCUS) draw_sprite_stretched_ext(THEME.dialog_active, 0, presets_x, dialog_y, presets_w, dialog_h, COLORS._main_accent, 1);
var p = DIALOG_PAD;
var p2 = DIALOG_PAD * 2;
draw_sprite_stretched(THEME.dialog_bg, 0, content_x, dialog_y, content_w, dialog_h);
draw_sprite_stretched(THEME.dialog_bg, 0, presets_x - p, dialog_y - p, presets_w + p2, dialog_h + p2);
if(sFOCUS)
draw_sprite_stretched_ext(THEME.dialog_active, 0, presets_x - p, dialog_y - p, presets_w + p2, dialog_h + p2, COLORS._main_accent, 1);
draw_sprite_stretched(THEME.dialog_bg, 0, content_x - p, dialog_y - p, content_w + p2, dialog_h + p2);
if(sFOCUS)
draw_sprite_stretched_ext(THEME.dialog_active, 0, content_x, dialog_y, content_w, dialog_h, COLORS._main_accent, 1);
draw_sprite_stretched_ext(THEME.dialog_active, 0, content_x - p, dialog_y - p, content_w + p2, dialog_h + p2, COLORS._main_accent, 1);
draw_set_text(f_p0, fa_left, fa_top, COLORS._main_text);
draw_text(presets_x + ui(24), dialog_y + ui(16), __txt("Palettes"));
@ -31,7 +35,7 @@ if !ready exit;
#endregion
#region palette
draw_sprite_stretched(THEME.ui_panel_bg, 0, presets_x + ui(16), dialog_y + ui(44), ui(240 - 32), dialog_h - ui(60));
draw_sprite_stretched(THEME.ui_panel_bg, 1, presets_x + ui(16), dialog_y + ui(44), ui(240 - 32), dialog_h - ui(60));
sp_presets.setFocusHover(sFOCUS, sHOVER);
sp_presets.draw(presets_x + ui(24), dialog_y + ui(44));

4
objects/o_dialog_crashed/Draw_64.gml
View file

@ -6,9 +6,9 @@ draw_rectangle(0, 0, WIN_W, WIN_H, false);
draw_set_alpha(1);
#region base UI
draw_sprite_stretched(THEME.dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h);
DIALOG_DRAW_BG
if(sFOCUS)
draw_sprite_stretched_ext(THEME.dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h, COLORS._main_accent, 1);
DIALOG_DRAW_FOCUS
#endregion
#region text

4
objects/o_dialog_drag_folder/Draw_64.gml
View file

@ -2,9 +2,9 @@
if !ready exit;
#region base UI
draw_sprite_stretched(THEME.dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h);
DIALOG_DRAW_BG
if(sFOCUS)
draw_sprite_stretched_ext(THEME.dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h, COLORS._main_accent, 1);
DIALOG_DRAW_FOCUS
draw_set_text(f_p0, fa_left, fa_top, COLORS._main_text);
draw_text(dialog_x + ui(24), dialog_y + ui(16), __txtx("add_images_title_direcory", "Import directory"));

4
objects/o_dialog_exit/Draw_64.gml
View file

@ -17,9 +17,9 @@ if !ready exit;
#endregion
#region base UI
draw_sprite_stretched(THEME.dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h);
DIALOG_DRAW_BG
if(sFOCUS)
draw_sprite_stretched_ext(THEME.dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h, COLORS._main_accent, 1);
DIALOG_DRAW_FOCUS
#endregion
#region text

4
objects/o_dialog_file_name_collection/Draw_64.gml
View file

@ -1,8 +1,8 @@
/// @description init
#region base UI
draw_sprite_stretched(THEME.dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h);
DIALOG_DRAW_BG
if(sFOCUS)
draw_sprite_stretched_ext(THEME.dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h, COLORS._main_accent, 1);
DIALOG_DRAW_FOCUS
#endregion
#region draw TB

4
objects/o_dialog_gradient/Create_0.gml
View file

@ -97,7 +97,7 @@ event_inherited();
var _gradient = GRADIENTS[i];
var isHover = point_in_rectangle(_m[0], _m[1], ui(4), yy, ui(4) + sp_preset_w - ui(16), yy + hg);
draw_sprite_stretched(THEME.ui_panel_bg, 1, ui(4), yy, sp_preset_w - ui(16), hg);
draw_sprite_stretched(THEME.ui_panel_bg, 3, ui(4), yy, sp_preset_w - ui(16), hg);
if(_hover && isHover)
draw_sprite_stretched_ext(THEME.node_active, 1, ui(4), yy, sp_preset_w - ui(16), hg, COLORS._main_accent, 1);
@ -162,7 +162,7 @@ event_inherited();
var isHover = _hover && point_in_rectangle(_m[0], _m[1], ui(4), yy, ui(4) + sp_palette_w - ui(16), yy + _height);
draw_sprite_stretched(THEME.ui_panel_bg, 1, ui(4), yy, sp_palette_w - ui(16), _height);
draw_sprite_stretched(THEME.ui_panel_bg, 3, ui(4), yy, sp_palette_w - ui(16), _height);
if(isHover)
draw_sprite_stretched_ext(THEME.node_active, 1, ui(4), yy, sp_palette_w - ui(16), _height, COLORS._main_accent, 1);

19
objects/o_dialog_gradient/Draw_64.gml
View file

@ -19,14 +19,17 @@ if !ready exit;
var palette_x = content_x + content_w + ui(16);
var palette_w = ui(240);
draw_sprite_stretched(THEME.dialog_bg, 0, presets_x, dialog_y, presets_w, dialog_h);
if(sFOCUS) draw_sprite_stretched_ext(THEME.dialog_active, 0, presets_x, dialog_y, presets_w, dialog_h, COLORS._main_accent, 1);
var p = DIALOG_PAD;
var p2 = DIALOG_PAD * 2;
draw_sprite_stretched(THEME.dialog_bg, 0, content_x, dialog_y, content_w, dialog_h);
if(sFOCUS) draw_sprite_stretched_ext(THEME.dialog_active, 0, content_x, dialog_y, content_w, dialog_h, COLORS._main_accent, 1);
draw_sprite_stretched(THEME.dialog_bg, 0, presets_x - p, dialog_y - p, presets_w + p2, dialog_h + p2);
if(sFOCUS) draw_sprite_stretched_ext(THEME.dialog_active, 0, presets_x - p, dialog_y - p, presets_w + p2, dialog_h + p2, COLORS._main_accent, 1);
draw_sprite_stretched(THEME.dialog_bg, 0, palette_x, dialog_y, presets_w, dialog_h);
if(sFOCUS) draw_sprite_stretched_ext(THEME.dialog_active, 0, palette_x, dialog_y, presets_w, dialog_h, COLORS._main_accent, 1);
draw_sprite_stretched(THEME.dialog_bg, 0, content_x - p, dialog_y - p, content_w + p2, dialog_h + p2);
if(sFOCUS) draw_sprite_stretched_ext(THEME.dialog_active, 0, content_x - p, dialog_y - p, content_w + p2, dialog_h + p2, COLORS._main_accent, 1);
draw_sprite_stretched(THEME.dialog_bg, 0, palette_x - p, dialog_y - p, presets_w + p2, dialog_h + p2);
if(sFOCUS) draw_sprite_stretched_ext(THEME.dialog_active, 0, palette_x - p, dialog_y - p, presets_w + p2, dialog_h + p2, COLORS._main_accent, 1);
draw_set_text(f_p0, fa_left, fa_top, COLORS._main_text);
draw_text(presets_x + ui(24), dialog_y + ui(16), __txt("Presets"));
@ -37,7 +40,7 @@ if !ready exit;
#endregion
#region presets
draw_sprite_stretched(THEME.ui_panel_bg, 0, presets_x + ui(16), dialog_y + ui(44), ui(240 - 32), dialog_h - ui(60));
draw_sprite_stretched(THEME.ui_panel_bg, 1, presets_x + ui(16), dialog_y + ui(44), ui(240 - 32), dialog_h - ui(60));
sp_presets.setFocusHover(sFOCUS, sHOVER);
sp_presets.draw(presets_x + ui(16 + 8), dialog_y + ui(44));
@ -79,7 +82,7 @@ if !ready exit;
#endregion
#region palette
draw_sprite_stretched(THEME.ui_panel_bg, 0, palette_x + ui(16), dialog_y + ui(44), ui(240 - 32), dialog_h - ui(60));
draw_sprite_stretched(THEME.ui_panel_bg, 1, palette_x + ui(16), dialog_y + ui(44), ui(240 - 32), dialog_h - ui(60));
sp_palettes.setFocusHover(sFOCUS, sHOVER);
sp_palettes.draw(palette_x + ui(16 + 8), dialog_y + ui(44));

4
objects/o_dialog_group_input_order/Draw_64.gml
View file

@ -2,9 +2,9 @@
if !ready exit;
#region base UI
draw_sprite_stretched(THEME.dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h);
DIALOG_DRAW_BG
if(sFOCUS)
draw_sprite_stretched_ext(THEME.dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h, COLORS._main_accent, 1);
DIALOG_DRAW_FOCUS
draw_set_text(f_p0, fa_left, fa_top, COLORS._main_text);
draw_text(dialog_x + ui(24), dialog_y + ui(20), __txtx("dialog_group_order_title", "Input order"));

4
objects/o_dialog_group_output_order/Draw_64.gml
View file

@ -2,9 +2,9 @@
if !ready exit;
#region base UI
draw_sprite_stretched(THEME.dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h);
DIALOG_DRAW_BG
if(sFOCUS)
draw_sprite_stretched_ext(THEME.dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h, COLORS._main_accent, 1);
DIALOG_DRAW_FOCUS
draw_set_text(f_p0, fa_left, fa_top, COLORS._main_text);
draw_text(dialog_x + ui(24), dialog_y + ui(20), __txtx("dialog_group_order_title", "Input order"));

6
objects/o_dialog_image_array_edit/Draw_64.gml
View file

@ -3,9 +3,9 @@ if !ready exit;
if !target exit;
#region base UI
draw_sprite_stretched(THEME.dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h);
DIALOG_DRAW_BG
if(sFOCUS)
draw_sprite_stretched_ext(THEME.dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h, COLORS._main_accent, 1);
DIALOG_DRAW_FOCUS
draw_set_text(f_p0, fa_left, fa_top, COLORS._main_text);
draw_text(dialog_x + ui(padding), dialog_y + ui(20), __txtx("array_edit_title", "Image array edit"));
@ -17,7 +17,7 @@ if !target exit;
var pw = dialog_w - ui(padding + padding);
var ph = dialog_h - ui(title_height + padding);
draw_sprite_stretched(THEME.ui_panel_bg, 0, px - ui(8), py - ui(8), pw + ui(16), ph + ui(16));
draw_sprite_stretched(THEME.ui_panel_bg, 1, px - ui(8), py - ui(8), pw + ui(16), ph + ui(16));
sp_content.setFocusHover(sFOCUS, sHOVER);
sp_content.draw(px, py);
#endregion

6
objects/o_dialog_l_system/Draw_64.gml
View file

@ -2,9 +2,9 @@
if !ready exit;
#region base UI
draw_sprite_stretched(THEME.dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h);
DIALOG_DRAW_BG
if(sFOCUS)
draw_sprite_stretched_ext(THEME.dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h, COLORS._main_accent, 1);
DIALOG_DRAW_FOCUS
draw_set_text(f_p0, fa_left, fa_top, COLORS._main_text);
draw_text(dialog_x + ui(padding), dialog_y + ui(20), "Lindenmayer System reference");
@ -16,7 +16,7 @@ if !ready exit;
var pw = dialog_w - ui(padding + padding);
var ph = dialog_h - ui(title_height + padding);
draw_sprite_stretched(THEME.ui_panel_bg, 0, px - ui(8), py - ui(8), pw + ui(16), ph + ui(16));
draw_sprite_stretched(THEME.ui_panel_bg, 1, px - ui(8), py - ui(8), pw + ui(16), ph + ui(16));
sp_note.setFocusHover(sFOCUS, sHOVER);
sp_note.draw(px, py);
#endregion

6
objects/o_dialog_lua_reference/Draw_64.gml
View file

@ -2,9 +2,9 @@
if !ready exit;
#region base UI
draw_sprite_stretched(THEME.dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h);
DIALOG_DRAW_BG
if(sFOCUS)
draw_sprite_stretched_ext(THEME.dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h, COLORS._main_accent, 1);
DIALOG_DRAW_FOCUS
draw_set_text(f_p0, fa_left, fa_top, COLORS._main_text);
draw_text(dialog_x + ui(padding), dialog_y + ui(20), "Lua reference");
@ -16,7 +16,7 @@ if !ready exit;
var pw = dialog_w - ui(padding + padding);
var ph = dialog_h - ui(title_height + padding);
draw_sprite_stretched(THEME.ui_panel_bg, 0, px - ui(8), py - ui(8), pw + ui(16), ph + ui(16));
draw_sprite_stretched(THEME.ui_panel_bg, 1, px - ui(8), py - ui(8), pw + ui(16), ph + ui(16));
sp_note.setFocusHover(sFOCUS, sHOVER);
sp_note.draw(px, py);
#endregion

4
objects/o_dialog_migration/Draw_64.gml
View file

@ -6,9 +6,9 @@ draw_rectangle(0, 0, WIN_W, WIN_H, false);
draw_set_alpha(1);
#region base UI
draw_sprite_stretched(THEME.dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h);
DIALOG_DRAW_BG
if(sFOCUS)
draw_sprite_stretched_ext(THEME.dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h, COLORS._main_accent, 1);
DIALOG_DRAW_FOCUS
#endregion
#region text

6
objects/o_dialog_output_visibility/Draw_64.gml
View file

@ -2,9 +2,9 @@
if !ready exit;
#region base UI
draw_sprite_stretched(THEME.dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h);
DIALOG_DRAW_BG
if(sFOCUS)
draw_sprite_stretched_ext(THEME.dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h, COLORS._main_accent, 1);
DIALOG_DRAW_FOCUS
draw_set_text(f_p0, fa_left, fa_top, COLORS._main_text);
draw_text(dialog_x + ui(24), dialog_y + ui(20), __txtx("output_visibility_title", "Outputs visibility"));
@ -16,7 +16,7 @@ if !ready exit;
var pw = dialog_w - ui(padding + padding);
var ph = dialog_h - ui(title_height + padding)
draw_sprite_stretched(THEME.ui_panel_bg, 0, px - ui(8), py - ui(8), pw + ui(16), ph + ui(16));
draw_sprite_stretched(THEME.ui_panel_bg, 1, px - ui(8), py - ui(8), pw + ui(16), ph + ui(16));
sc_outputs.setFocusHover(sFOCUS, sHOVER);
sc_outputs.draw(px, py);
#endregion

2
objects/o_dialog_palette/Create_0.gml
View file

@ -71,7 +71,7 @@ event_inherited();
path: ""
} : PALETTES[i];
var isHover = sHOVER && sp_presets.hover && point_in_rectangle(_m[0], _m[1], ui(4), yy, ui(4) + sp_preset_w - ui(16), yy + hg);
draw_sprite_stretched(THEME.ui_panel_bg, 1, ui(4), yy, sp_preset_w - ui(16), hg);
draw_sprite_stretched(THEME.ui_panel_bg, 3, ui(4), yy, sp_preset_w - ui(16), hg);
if(isHover)
draw_sprite_stretched_ext(THEME.node_active, 1, ui(4), yy, sp_preset_w - ui(16), hg, COLORS._main_accent, 1);

13
objects/o_dialog_palette/Draw_64.gml
View file

@ -17,11 +17,14 @@ if palette == 0 exit;
var content_x = dialog_x + presets_w + ui(16);
var content_w = dialog_w - presets_w - ui(16);
draw_sprite_stretched(THEME.dialog_bg, 0, presets_x, dialog_y, presets_w, dialog_h);
if(sFOCUS) draw_sprite_stretched_ext(THEME.dialog_active, 0, presets_x, dialog_y, presets_w, dialog_h, COLORS._main_accent, 1);
var p = DIALOG_PAD;
var p2 = DIALOG_PAD * 2;
draw_sprite_stretched(THEME.dialog_bg, 0, content_x, dialog_y, content_w, dialog_h);
if(sFOCUS) draw_sprite_stretched_ext(THEME.dialog_active, 0, content_x, dialog_y, content_w, dialog_h, COLORS._main_accent, 1);
draw_sprite_stretched(THEME.dialog_bg, 0, presets_x - p, dialog_y - p, presets_w + p2, dialog_h + p2);
if(sFOCUS) draw_sprite_stretched_ext(THEME.dialog_active, 0, presets_x - p, dialog_y - p, presets_w + p2, dialog_h + p2, COLORS._main_accent, 1);
draw_sprite_stretched(THEME.dialog_bg, 0, content_x - p, dialog_y - p, content_w + p2, dialog_h + p2);
if(sFOCUS) draw_sprite_stretched_ext(THEME.dialog_active, 0, content_x - p, dialog_y - p, content_w + p2, dialog_h + p2, COLORS._main_accent, 1);
draw_set_text(f_p0, fa_left, fa_top, COLORS._main_text);
draw_text(presets_x + ui(24), dialog_y + ui(16), __txt("Presets"));
@ -31,7 +34,7 @@ if palette == 0 exit;
#endregion
#region presets
draw_sprite_stretched(THEME.ui_panel_bg, 0, presets_x + ui(16), dialog_y + ui(44), ui(240 - 32), dialog_h - ui(60));
draw_sprite_stretched(THEME.ui_panel_bg, 1, presets_x + ui(16), dialog_y + ui(44), ui(240 - 32), dialog_h - ui(60));
sp_presets.setFocusHover(sFOCUS, sHOVER);
sp_presets.draw(presets_x + ui(24), dialog_y + ui(44));

4
objects/o_dialog_panel/Draw_64.gml
View file

@ -6,7 +6,7 @@ if !ready exit;
var m_in = point_in_rectangle(mouse_mx, mouse_my, dialog_x + p, dialog_y + p, dialog_x + dialog_w - p, dialog_y + dialog_h - p);
var m_ot = point_in_rectangle(mouse_mx, mouse_my, dialog_x, dialog_y, dialog_x + dialog_w, dialog_y + dialog_h);
draw_sprite_stretched(THEME.dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h);
DIALOG_DRAW_BG
#endregion
#region content
@ -68,7 +68,7 @@ if !ready exit;
destroy_on_click_out = !destroy_on_click_out;
if(sFOCUS) {
draw_sprite_stretched_ext(THEME.dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h, COLORS._main_accent, 1);
DIALOG_DRAW_FOCUS
if(!m_in && m_ot) {
draw_sprite_stretched_ext(THEME.dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h, c_white, 0.4);

15
objects/o_dialog_preference/Create_0.gml
View file

@ -35,7 +35,7 @@ event_inherited();
sections = array_create(array_length(page));
sp_page = new scrollPane(page_width - ui(4), dialog_h - ui(title_height + padding), function(_y, _m, _r) {
draw_clear_alpha(COLORS.panel_bg_clear, 0);
draw_clear_alpha(COLORS.panel_bg_clear, 1);
var ww = sp_page.surface_w;
var hh = 0;
@ -44,11 +44,13 @@ event_inherited();
var hs = line_get_height(f_p1, 8);
for(var i = 0; i < array_length(page); i++) {
draw_set_text(f_p0, fa_left, fa_center, COLORS._main_text);
if(i == page_current) draw_set_text(f_p0b, fa_left, fa_center, COLORS._main_text_accent);
else draw_set_text(f_p0, fa_left, fa_center, COLORS._main_text_inner);
if(i == page_current) {
draw_sprite_stretched(THEME.ui_panel_bg, 0, 0, yl, ww, hg);
//draw_sprite_stretched(THEME.ui_panel_bg, 0, 0, yl, ww, hg);
} else if(sHOVER && point_in_rectangle(_m[0], _m[1], 0, yl, ww, yl + hg)) {
draw_sprite_stretched_ext(THEME.ui_panel_bg, 0, 0, yl, ww, hg, c_white, 0.75);
draw_sprite_stretched_ext(THEME.ui_panel_bg, 0, 0, yl, ww, hg, CDEF.main_white, 1);
if(mouse_click(mb_left, sFOCUS)) {
page_current = i;
sp_pref.setScroll(0);
@ -490,7 +492,8 @@ event_inherited();
}
if(ind % 2 == 0)
draw_sprite_stretched_ext(THEME.ui_panel_bg, 0, 0, yy - padd, sp_colors.surface_w, th + padd * 2, COLORS.dialog_preference_prop_bg, 1);
draw_sprite_stretched_ext(THEME.ui_panel_bg, 0, 0, yy - padd,
sp_colors.surface_w, th + padd * 2, COLORS.dialog_preference_prop_bg, 1);
var keyStr = string_replace_all(key, "_", " ");
keyStr = string_replace(keyStr, cat + " ", "");
@ -559,7 +562,7 @@ event_inherited();
hk_editing = noone;
sp_hotkey = new scrollPane(dialog_w - ui(padding + padding + page_width), dialog_h - ui(title_height + padding), function(_y, _m) {
draw_clear_alpha(COLORS.panel_bg_clear, 1);
draw_clear_alpha(COLORS.panel_bg_clear, 0);
var padd = ui(8);
var hh = ui(8);
var currGroup = noone;

6
objects/o_dialog_preference/Draw_64.gml
View file

@ -2,9 +2,9 @@
if !ready exit;
#region base UI
draw_sprite_stretched(THEME.dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h);
DIALOG_DRAW_BG
if(sFOCUS)
draw_sprite_stretched_ext(THEME.dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h, COLORS._main_accent, 1);
DIALOG_DRAW_FOCUS
draw_set_text(f_p0, fa_left, fa_top, COLORS._main_text);
draw_text(dialog_x + ui(56), dialog_y + ui(20), __txt("Preferences"));
@ -28,7 +28,7 @@ if !ready exit;
var pw = dialog_w - ui(padding + page_width + padding);
var ph = dialog_h - ui(title_height + padding);
draw_sprite_stretched(THEME.ui_panel_bg, 0, px - ui(8), py - ui(8), pw + ui(16), ph + ui(16));
draw_sprite_stretched(THEME.ui_panel_bg, 1, px - ui(8), py - ui(8), pw + ui(16), ph + ui(16));
tb_search.auto_update = true;
tb_search.no_empty = false;

6
objects/o_dialog_preset/Draw_64.gml
View file

@ -2,9 +2,9 @@
if !ready exit;
#region base UI
draw_sprite_stretched(THEME.dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h);
DIALOG_DRAW_BG
if(sFOCUS)
draw_sprite_stretched_ext(THEME.dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h, COLORS._main_accent, 1);
DIALOG_DRAW_FOCUS
draw_set_text(f_p0, fa_left, fa_top, COLORS._main_text);
draw_text(dialog_x + ui(24), dialog_y + ui(20), __txt("Presets"));
@ -16,7 +16,7 @@ if !ready exit;
var pw = dialog_w - ui(padding + padding);
var ph = dialog_h - ui(title_height + padding)
draw_sprite_stretched(THEME.ui_panel_bg, 0, px - ui(8), py - ui(8), pw + ui(16), ph + ui(16));
draw_sprite_stretched(THEME.ui_panel_bg, 1, px - ui(8), py - ui(8), pw + ui(16), ph + ui(16));
sc_presets.setFocusHover(sFOCUS, sHOVER);
sc_presets.draw(px, py);

6
objects/o_dialog_release_note/Draw_64.gml
View file

@ -2,16 +2,16 @@
if !ready exit;
#region base UI
draw_sprite_stretched(THEME.dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h);
DIALOG_DRAW_BG
if(sFOCUS)
draw_sprite_stretched_ext(THEME.dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h, COLORS._main_accent, 1);
DIALOG_DRAW_FOCUS
#endregion
#region text
draw_set_text(f_p0, fa_left, fa_top, COLORS._main_text);
draw_text(dialog_x + ui(24), dialog_y + ui(16), string(VERSION_STRING) + " Release note");
draw_sprite_stretched(THEME.ui_panel_bg, 0, dialog_x + ui(24), dialog_y + ui(48), dialog_w - ui(48), dialog_h - ui(72));
draw_sprite_stretched(THEME.ui_panel_bg, 1, dialog_x + ui(24), dialog_y + ui(48), dialog_w - ui(48), dialog_h - ui(72));
sp_note.setFocusHover(sFOCUS, sHOVER);
sp_note.draw(dialog_x + ui(40), dialog_y + ui(56));

4
objects/o_dialog_run_shell/Draw_64.gml
View file

@ -11,8 +11,8 @@ if !ready exit;
#endregion
#region base UI
draw_sprite_stretched(THEME.dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h);
if(sFOCUS) draw_sprite_stretched_ext(THEME.dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h, COLORS._main_accent, 1);
DIALOG_DRAW_BG
if(sFOCUS) DIALOG_DRAW_FOCUS
#endregion
#region text

4
objects/o_dialog_save/Draw_64.gml
View file

@ -7,9 +7,9 @@ draw_rectangle(0, 0, WIN_W, WIN_H, false);
draw_set_alpha(1);
#region base UI
draw_sprite_stretched(THEME.dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h);
DIALOG_DRAW_BG
if(sFOCUS)
draw_sprite_stretched_ext(THEME.dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h, COLORS._main_accent, 1);
DIALOG_DRAW_FOCUS
#endregion
#region text

6
objects/o_dialog_splash/Draw_64.gml
View file

@ -2,9 +2,9 @@
if !ready exit;
#region base UI
draw_sprite_stretched(THEME.dialog_bg, 0, dialog_x, dialog_y, dialog_w, dialog_h);
DIALOG_DRAW_BG
if(sFOCUS)
draw_sprite_stretched_ext(THEME.dialog_active, 0, dialog_x, dialog_y, dialog_w, dialog_h, COLORS._main_accent, 1);
DIALOG_DRAW_FOCUS
#endregion
#region content
@ -42,7 +42,7 @@ if !ready exit;
draw_set_text(f_p0, fa_left, fa_bottom, COLORS._main_text_sub);
draw_text(x0, y0 - ui(4), __txt("Recent files"));
draw_sprite_stretched(THEME.ui_panel_bg, 0, x0, y0, x1 - x0, y1 - y0);
//draw_sprite_stretched(THEME.ui_panel_bg, 1, x0, y0, x1 - x0, y1 - y0);
sp_recent.setFocusHover(sFOCUS, sHOVER);
sp_recent.draw(x0 + ui(6), y0);
draw_sprite_stretched(THEME.ui_panel_fg, 0, x0, y0, x1 - x0, y1 - y0);

4
scripts/color_selector/color_selector.gml
View file

@ -135,7 +135,7 @@ function colorSelector(onApply = noone) constructor {
var col_x = _x + ui(8);
var col_y = _y + ui(8);
draw_sprite_stretched(THEME.ui_panel_bg, 0, col_x - ui(8), col_y - ui(8), ui(256 + 16), ui(256 + 16));
draw_sprite_stretched(THEME.ui_panel_bg, 1, col_x - ui(8), col_y - ui(8), ui(256 + 16), ui(256 + 16));
color_surface = surface_verify(color_surface, 256, 256);
surface_set_target(color_surface);
@ -161,7 +161,7 @@ function colorSelector(onApply = noone) constructor {
var hue_x = col_x + ui(280);
var hue_y = col_y;
draw_sprite_stretched(THEME.ui_panel_bg, 0, hue_x - ui(8), hue_y - ui(8), ui(32), ui(256 + 16));
draw_sprite_stretched(THEME.ui_panel_bg, 1, hue_x - ui(8), hue_y - ui(8), ui(32), ui(256 + 16));
if(disp_mode == 0) {
shader_set(sh_color_picker_side_hue);

13
scripts/directory_object/directory_object.gml
View file

@ -190,17 +190,17 @@ function DirectoryObject(name, path) constructor {
var color_selecting = struct_try_get(_colors, "selecting", COLORS.collection_path_current_bg);
if(path == parent.context.path)
draw_sprite_stretched_ext(THEME.group_label, 1, _x + ui(28), _y, _w - ui(36), hg, color_selecting, 1);
//if(path == parent.context.path)
//draw_sprite_stretched_ext(THEME.group_label, 1, _x + ui(28), _y, _w - ui(36), hg, color_selecting, 1);
if(!ds_list_empty(subDir) && _hover && point_in_rectangle(_m[0], _m[1], _x, _y, ui(32), _y + hg - 1)) {
draw_sprite_stretched_ext(THEME.group_label, 1, _x, _y, ui(32), hg, color_selecting, 1);
draw_sprite_stretched_ext(THEME.ui_panel_bg, 0, _x, _y, ui(32), hg, CDEF.main_white, 1);
if(mouse_press(mb_left, _focus))
open = !open;
}
if(_hover && point_in_rectangle(_m[0], _m[1], _x + ui(32), _y, _w, _y + hg - 1)) {
draw_sprite_stretched_ext(THEME.group_label, 1, _x + ui(28), _y, _w - ui(36), hg, color_selecting, 1);
draw_sprite_stretched_ext(THEME.ui_panel_bg, 0, _x + ui(28), _y, _w - ui(36), hg, CDEF.main_white, 1);
if(mouse_press(mb_left, _focus)) {
if(!ds_list_empty(subDir))
open = !open;
@ -215,8 +215,9 @@ function DirectoryObject(name, path) constructor {
if(ds_list_empty(subDir)) draw_sprite_ui_uniform(THEME.folder_content, parent.context == self, _x + ui(16), _y + hg / 2 - 1, 1, COLORS.collection_folder_empty);
else draw_sprite_ui_uniform(THEME.folder_content, open, _x + ui(16), _y + hg / 2 - 1, 1, COLORS.collection_folder_nonempty);
draw_set_text(f_p0, fa_left, fa_center, COLORS._main_text_inner);
draw_text(_x + ui(32), _y + hg / 2, name);
if(path == parent.context.path) draw_set_text(f_p0b, fa_left, fa_center, COLORS._main_text_accent);
else draw_set_text(f_p0, fa_left, fa_center, COLORS._main_text_inner);
draw_text_add(_x + ui(32), _y + hg / 2, name);
hh += hg;
_y += hg;

6
scripts/draw_text_function/draw_text_function.gml
View file

@ -8,6 +8,12 @@ function draw_text_add(_x, _y, _text, scale = 1) {
BLEND_NORMAL;
}
function draw_text_over(_x, _y, _text, scale = 1) {
BLEND_OVERRIDE;
draw_text_transformed(_x, _y, _text, scale, scale, 0);
BLEND_NORMAL;
}
function draw_text_ext_add(_x, _y, _text, _sep, _w, scale = 1) {
BLEND_ALPHA_MULP;
var h = __draw_text_ext_transformed(_x, _y, _text, _sep, _w, scale, scale, 0);

7
scripts/panel_addon/panel_addon.gml
View file

@ -70,11 +70,10 @@ function Panel_Addon() : PanelContent() constructor {
var hover = pHOVER && point_in_rectangle(_m[0], _m[1], 0, by, ww, by + hh);
if(_addon.open)
draw_sprite_stretched_ext(THEME.ui_panel_bg, 0, 0, by, ww, hh, COLORS._main_icon, 1);
if(_addon.open) draw_sprite_stretched_ext(THEME.ui_panel_bg, 3, 0, by, ww, hh, COLORS._main_icon_light, 1);
var cc = merge_color(COLORS._main_icon_light, COLORS._main_icon, hover? 0 : 0.25);
draw_sprite_stretched_ext(THEME.ui_panel_bg, 0, 0, by, ww, hg, cc, 1);
var cc = hover? c_white : COLORS._main_icon_light;
draw_sprite_stretched_ext(THEME.ui_panel_bg, 3, 0, by, ww, hg, cc, 1);
draw_set_text(f_p0, fa_left, fa_center, COLORS._main_text);
draw_text_add(ui(44), by + hg / 2, _addon.name);

6
scripts/panel_collection/panel_collection.gml
View file

@ -314,8 +314,8 @@ function Panel_Collection() : PanelContent() constructor {
}); #endregion
folderPane = new scrollPane(group_w - ui(8), content_h, function(_y, _m) { #region
draw_clear_alpha(COLORS.panel_bg_clear, 0);
draw_sprite_stretched(THEME.ui_panel_bg, 1, ui(8), 0, folderPane.surface_w - ui(8), folderPane.surface_h);
draw_clear_alpha(COLORS.panel_bg_clear, 1);
//draw_sprite_stretched(THEME.ui_panel_bg, 1, ui(8), 0, folderPane.surface_w - ui(8), folderPane.surface_h);
var hh = ui(8);
_y += ui(8);
@ -352,7 +352,7 @@ function Panel_Collection() : PanelContent() constructor {
} #endregion
function drawContent(panel) { #region
draw_clear_alpha(COLORS.panel_bg_clear, 0);
draw_clear_alpha(COLORS.panel_bg_clear, 1);
var content_y = ui(48);
draw_sprite_stretched(THEME.ui_panel_bg, 1, group_w, content_y, content_w, content_h);

9
scripts/panel_menu/panel_menu.gml
View file

@ -74,7 +74,7 @@ function Panel_Menu() : PanelContent() constructor {
else
gameframe_set_fullscreen(2);
},, ["", "Fullscreen"]),
menuItem(__txt("Close current file"), function() { PANEL_GRAPH.close(); },, [ "", "Close file" ]),
menuItem(__txt("Close current project"), function() { PANEL_GRAPH.close(); },, [ "", "Close file" ]),
menuItem(__txt("Close all projects"), function() { for( var i = array_length(PROJECTS) - 1; i >= 0; i-- ) closeProject(PROJECTS[i]); },, [ "", "Close all" ]),
menuItem(__txt("Close program"), function() { window_close(); },, [ "", "Close program" ]),
];
@ -88,13 +88,6 @@ function Panel_Menu() : PanelContent() constructor {
menuItem(__txtx("panel_menu_help_wiki", "Community Wiki"), function() {
url_open("https://pixel-composer.fandom.com/wiki/Pixel_Composer_Wiki");
}, THEME.wiki),
//-1,
//menuItem(__txtx("panel_menu_itch", "itch.io page"), function() {
// url_open("https://makham.itch.io/pixel-composer");
//}, THEME.itch),
//menuItem(__txtx("panel_menu_steam", "Steam page"), function() {
// url_open("https://store.steampowered.com/app/2299510/Pixel_Composer");
//}, THEME.steam),
-1,
menuItem(__txtx("panel_menu_local_directory", "Open local directory"), function() {
shellOpenExplorer(DIRECTORY);