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

- [Canvas] Frame deletion now require shift key to prevent misclick.

Browse source
This commit is contained in:
Tanasart 2024-06-29 14:06:15 +07:00
parent b79900fb72
commit 6bd74835f4
2 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
scripts/node_canvas/node_canvas.gml
View file

@ -54,21 +54,22 @@ function Node_Canvas(_x, _y, _group = noone) : Node(_x, _y, _group) constructor
frame_renderer_x_max = 0; frame_renderer_x_max = 0;
frame_renderer_content = surface_create(1, 1); frame_renderer_content = surface_create(1, 1);
frame_renderer = new Inspector_Custom_Renderer(function(_x, _y, _w, _m, _hover, _focus) { #region frame_renderer frame_renderer = new Inspector_Custom_Renderer(function(_x, _y, _w, _m, _hover, _focus, _full = true) { #region frame_renderer
var _h = 64; var _h = _full? 64 : 48;
_y += 8;
var _anim = getInputData(12); var _anim = getInputData(12);
var _cnt_hover = false; var _cnt_hover = false;
draw_sprite_stretched_ext(THEME.ui_panel_bg, 1, _x, _y, _w, _h, COLORS.node_composite_bg_blend, 1); if(_full) {
_y += 8;
draw_sprite_stretched_ext(THEME.ui_panel_bg, 1, _x, _y, _w, _h, COLORS.node_composite_bg_blend, 1);
}
if(_hover && frame_renderer.parent != noone && point_in_rectangle(_m[0], _m[1], _x, _y, _x + _w, _y + _h)) { if(_hover && frame_renderer.parent != noone && point_in_rectangle(_m[0], _m[1], _x, _y, _x + _w, _y + _h)) {
frame_renderer.parent.scroll_lock = true; frame_renderer.parent.scroll_lock = true;
_cnt_hover = _hover; _cnt_hover = _hover;
} }
var _pd = ui(2); var _pd = _full? ui(2) : 0;
var _aw = ui(32); var _aw = ui(32);
var _ww = _w - _pd - _aw; var _ww = _w - _pd - _aw;
var _hh = _h - _pd - _pd; var _hh = _h - _pd - _pd;
@ -116,7 +117,7 @@ function Node_Canvas(_x, _y, _group = noone) : Node(_x, _y, _group) constructor
var _del_y = _sy + 10; var _del_y = _sy + 10;
var _del_a = noone; var _del_a = noone;
if(point_in_circle(_msx, _msy, _del_x, _del_y, 8)) { if(key_mod_press(SHIFT) && point_in_circle(_msx, _msy, _del_x, _del_y, 8)) {
_del_a = 1; _del_a = 1;
if(mouse_press(mb_left, _focus)) if(mouse_press(mb_left, _focus))
@ -163,7 +164,7 @@ function Node_Canvas(_x, _y, _group = noone) : Node(_x, _y, _group) constructor
update(); update();
} }
return 8 + _h; return _h + 8 * _full;
}); #endregion }); #endregion
temp_surface = array_create(1); temp_surface = array_create(1);

9
scripts/node_canvas_group/node_canvas_group.gml
View file

@ -42,10 +42,12 @@ function Node_Canvas_Group(_x, _y, _group) : Node_Collection(_x, _y, _group) con
}); });
frame_renderer = new Inspector_Custom_Renderer(function(_x, _y, _w, _m, _hover, _focus) { frame_renderer = new Inspector_Custom_Renderer(function(_x, _y, _w, _m, _hover, _focus) {
var _h = ui(4); var _h = 0;
var _yy = _y; var _yy = _y;
for (var i = 0, n = array_length(canvases); i < n; i++) { draw_sprite_stretched_ext(THEME.ui_panel_bg, 1, _x, _y, _w, frame_renderer.h, COLORS.node_composite_bg_blend, 1);
for (var i = array_length(canvases) - 1; i >= 0; i--) {
var _canvas = canvases[i]; var _canvas = canvases[i];
var _frame_render = _canvas.frame_renderer; var _frame_render = _canvas.frame_renderer;
@ -53,13 +55,14 @@ function Node_Canvas_Group(_x, _y, _group) : Node_Collection(_x, _y, _group) con
_frame_render.rx = frame_renderer.rx; _frame_render.rx = frame_renderer.rx;
_frame_render.ry = frame_renderer.ry; _frame_render.ry = frame_renderer.ry;
var _wdh = _frame_render.draw(_x, _yy, _w, _m, _hover, _focus); var _wdh = _frame_render.draw(_x, _yy, _w, _m, _hover, _focus, false);
if(!is_undefined(_wdh)) { if(!is_undefined(_wdh)) {
_h += _wdh; _h += _wdh;
_yy += _wdh; _yy += _wdh;
} }
} }
frame_renderer.h = _h;
return _h; return _h;
}); });