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

- [Inspector Panel] Clicking on a frame will now only show frame now in the inspector.

Browse source
This commit is contained in:
Tanasart 2024-07-29 15:25:29 +07:00
parent 662d04e30b
commit 24e33606f5
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scripts/node_frame/node_frame.gml
View file

@ -172,11 +172,10 @@ function Node_Frame(_x, _y, _group = noone) : Node(_x, _y, _group) constructor {
if(w * _s < 32 || h * _s < 32) return point_in_rectangle(_mx, _my, xx, yy, x1, y1); if(w * _s < 32 || h * _s < 32) return point_in_rectangle(_mx, _my, xx, yy, x1, y1);
if(point_in_rectangle(_mx, _my, xx, yy, x1, y1) || size_dragging) if(point_in_rectangle(_mx, _my, xx, yy, x1, y1) || size_dragging)
draw_sprite_ext_add(THEME.node_resize, 0, x1 - shf, y1 - shf, ics, ics, 0, c_white, 0.5); draw_sprite_ext_add(THEME.node_resize, 0, x1 - shf, y1 - shf, ics, ics, 0, c_white, 0.15);
if(!name_hover && point_in_rectangle(_mx, _my, x0, y0, x1, y1)) { if(!name_hover && point_in_rectangle(_mx, _my, x0, y0, x1, y1)) {
draw_sprite_ext_add(THEME.node_resize, 0, x1 - shf, y1 - shf, ics, ics, 0, c_white, 1); draw_sprite_ext_add(THEME.node_resize, 0, x1 - shf, y1 - shf, ics, ics, 0, c_white, 0.30);
PANEL_GRAPH.drag_locking = true; PANEL_GRAPH.drag_locking = true;
if(mouse_press(mb_left)) { if(mouse_press(mb_left)) {

12
scripts/panel_inspector/panel_inspector.gml
View file

@ -949,6 +949,9 @@ function Panel_Inspector() : PanelContent() constructor {
if(inspectGroup >= 0) if(inspectGroup >= 0)
return drawNodeProperties(_y, _m, inspecting); return drawNodeProperties(_y, _m, inspecting);
if(is_instanceof(inspecting, Node_Frame))
return drawNodeProperties(_y, _m, inspecting);
for( var i = 0, n = min(10, array_length(inspectings)); i < n; i++ ) { for( var i = 0, n = min(10, array_length(inspectings)); i < n; i++ ) {
if(i) { if(i) {
_y += ui(8); _y += ui(8);
@ -1080,7 +1083,14 @@ function Panel_Inspector() : PanelContent() constructor {
inspectGroup = array_length(_nodes) > 1; inspectGroup = array_length(_nodes) > 1;
inspectings = array_empty(_nodes)? [ inspecting ] : _nodes; inspectings = array_empty(_nodes)? [ inspecting ] : _nodes;
for( var i = 1, n = array_length(_nodes); i < n; i++ ) if(instanceof(_nodes[i]) != instanceof(_nodes[0])) { inspectGroup = -1; break; } for( var i = 1, n = array_length(_nodes); i < n; i++ ) {
if(instanceof(_nodes[i]) != instanceof(_nodes[0])) {
inspectGroup = -1;
break;
}
}
if(is_instanceof(inspecting, Node_Frame)) inspectGroup = 0;
title = inspecting.renamed? inspecting.display_name : inspecting.name; title = inspecting.renamed? inspecting.display_name : inspecting.name;
inspecting.inspectorStep(); inspecting.inspectorStep();