1.15.1 update

This commit is contained in:
Tanasart 2023-09-02 12:47:27 +02:00
parent 7ad45363c7
commit 47615ff56a
6 changed files with 6 additions and 5 deletions

View File

@ -20,7 +20,7 @@ draw_set_alpha(1);
draw_set_text(f_p0, fa_left, fa_top, COLORS._main_text);
draw_text(dialog_x + ui(24), py, __txtx("crashed_content", "Restore previous project before crash?"));
var bw = ui(96), bh = TEXTBOX_HEIGHT;
var bw = ui(96), bh = BUTTON_HEIGHT;
var bx1 = dialog_x + dialog_w - ui(16);
var by1 = dialog_y + dialog_h - ui(16);
var bx0 = bx1 - bw;

View File

@ -33,7 +33,7 @@ if !ready exit;
var txt = $"Save project '{filename_name(project.path)}' before exit?";
draw_text(dialog_x + ui(24), py, txt);
var bw = ui(96), bh = TEXTBOX_HEIGHT;
var bw = ui(96), bh = BUTTON_HEIGHT;
var bx1 = dialog_x + dialog_w - ui(16);
var by1 = dialog_y + dialog_h - ui(16);
var bx0 = bx1 - bw;

View File

@ -21,7 +21,7 @@ draw_set_alpha(1);
draw_text_line(dialog_x + ui(24), py, __txtx("dialog_migration_content",
"You can press migrate files or manually move all custom collections, assets, palettes, gradients, fonts and presets."), -1, dialog_w - ui(48));
var bw = ui(112), bh = TEXTBOX_HEIGHT;
var bw = ui(112), bh = BUTTON_HEIGHT;
var bx1 = dialog_x + dialog_w - ui(16);
var by1 = dialog_y + dialog_h - ui(16);
var bx0 = bx1 - bw;

View File

@ -50,7 +50,7 @@ event_inherited();
var _h = string_height_ext(_line, -1, ww);
yy += (!!i) * ui(16);
draw_sprite_stretched_ext(THEME.group_label, 1, xx, yy - ui(4), ww, _h + ui(8), COLORS._main_icon, 1);
draw_sprite_stretched_ext(THEME.group_label, 1, xx, _y + yy - ui(4), ww, _h + ui(8), COLORS._main_icon, 1);
draw_text_line(xx + ui(16), _y + yy, _line, -1, ww);
yy += ui(8);
break;

View File

@ -21,7 +21,7 @@ draw_set_alpha(1);
draw_set_text(f_p0, fa_left, fa_top, COLORS._main_text);
draw_text(dialog_x + ui(24), py, __txtx("dialog_exit_content", "Save progress before close?"));
var bw = ui(96), bh = TEXTBOX_HEIGHT;
var bw = ui(96), bh = BUTTON_HEIGHT;
var bx1 = dialog_x + dialog_w - ui(16);
var by1 = dialog_y + dialog_h - ui(16);
var bx0 = bx1 - bw;

View File

@ -22,6 +22,7 @@ function line_get_width(txt, font = noone, offset = 0) {
#region global
#macro TEXTBOX_HEIGHT line_get_height(f_p0, 8)
#macro BUTTON_HEIGHT line_get_height(f_p0, 12)
function ui(val) {
gml_pragma("forceinline");