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

- [Menubox] Fix nested box register click on the parent instead of the child.

Browse source
This commit is contained in:
Tanasart 2024-06-12 09:34:02 +07:00
parent e09089b3b2
commit 4cb9bb5360
5 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
datafiles/data/Theme.zip
View file

Binary file not shown.

2
objects/o_dialog_menubox/Draw_64.gml
View file

@ -37,7 +37,7 @@ if(!ready) exit;
draw_sprite_stretched_ext(THEME.textbox, 3, dialog_x, yy, dialog_w, _h, _hc, _ha);
var _click = (!mouse_inside && mouse_release(mb_left)) || keyboard_check_released(vk_enter);
var _click = sFOCUS && (!mouse_inside && mouse_release(mb_left)) || keyboard_check_released(vk_enter);
if(_hovering_ch && is_instanceof(_menuItem, MenuItem) && _menuItem.active && _click) {

2
scripts/globals/globals.gml
View file

@ -38,7 +38,7 @@
LATEST_VERSION = 11700;
VERSION = 11740;
SAVE_VERSION = 11700;
VERSION_STRING = "1.17.4";
VERSION_STRING = "1.17.4.001";
BUILD_NUMBER = 11740;
globalvar HOTKEYS, HOTKEY_CONTEXT;

7
scripts/node_data/node_data.gml
View file

@ -75,7 +75,8 @@ function Node(_x, _y, _group = noone) : __Node_Base(_x, _y) constructor {
icon = noone;
icon_24 = noone;
bg_spr = THEME.node_bg;
bg_sel_spr = THEME.node_active;
bg_spr_add = true;
bg_sel_spr = THEME.node_active;
name = "";
display_name = "";
@ -208,7 +209,7 @@ function Node(_x, _y, _group = noone) : __Node_Base(_x, _y) constructor {
["Params Width", function() { return attributes.node_param_width; }, new textBox(TEXTBOX_INPUT.number, function(val) { attributes.node_param_width = val; refreshNodeDisplay(); }) ],
"Node update",
["Auto update", function() { return attributes.update_graph; }, new checkBox(function() { attributes.update_graph = !attributes.update_graph; }) ],
["Auto update", function() { return attributes.update_graph; }, new checkBox(function() { attributes.update_graph = !attributes.update_graph; }) ],
["Update trigger", function() { return attributes.show_update_trigger; }, new checkBox(function() { attributes.show_update_trigger = !attributes.show_update_trigger; }) ],
];
@ -1673,6 +1674,8 @@ function Node(_x, _y, _group = noone) : __Node_Base(_x, _y) constructor {
draw_droppable = false;
}
if(bg_spr_add) draw_sprite_stretched_add(bg_spr, 1, xx, yy, w * _s, h * _s, c_white, 0.15);
return _s > 0.5? drawJunctions(xx, yy, _mx, _my, _s) : drawJunctions_fast(xx, yy, _mx, _my, _s);
} #endregion

1
scripts/node_pin/node_pin.gml
View file

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