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

- [Graph Panel] Clicking on a pin now won't open up loop dialog.

Browse source
This commit is contained in:
Tanasart 2024-08-06 16:29:04 +07:00
parent d4cfc91cd9
commit 8319963f65
5 changed files with 13 additions and 19 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.

4
objects/o_dialog_splash/Create_0.gml
View file

@ -114,9 +114,7 @@ event_inherited();
meta_filter = []; meta_filter = [];
sp_sample = new scrollPane(x1 - x0 - ui(12), y1 - y0 - 1, function(_y, _m) { #region sp_sample = new scrollPane(x1 - x0 - ui(12), y1 - y0 - 1, function(_y, _m) { #region
draw_clear_alpha(CDEF.main_black, 0); draw_clear_alpha(COLORS.panel_bg_clear, 0);
draw_set_color(CDEF.main_black);
draw_rectangle(0, 1, sp_sample.surface_w, sp_sample.surface_h - 1, false);
var txt = pages[project_page]; var txt = pages[project_page];
var list, _group_label; var list, _group_label;

4
scripts/node_value_types/node_value_types.gml
View file

@ -195,9 +195,7 @@ function value_color(i) {
return JUNCTION_COLORS[i]; return JUNCTION_COLORS[i];
} }
function value_color_bg(i) { function value_color_bg(i) { return CDEF.main_dkgrey; }
return #3b3b4e;
}
function value_color_bg_array(i) { function value_color_bg_array(i) {
static JUNCTION_COLORS = [ static JUNCTION_COLORS = [

17
scripts/panel_graph/panel_graph.gml
View file

@ -1414,14 +1414,11 @@ function Panel_Graph(project = PROJECT) : PanelContent() constructor {
if(is_instanceof(junction_hovering, Node_Feedback_Inline)) { if(is_instanceof(junction_hovering, Node_Feedback_Inline)) {
var _jun = junction_hovering.junc_out; var _jun = junction_hovering.junc_out;
array_push(menu, menuItem($"[{_jun.node.display_name}] {_jun.getName()}", function(data) { array_push(menu, menuItem($"[{_jun.node.display_name}] {_jun.getName()}", function(data) /*=>*/ { __junction_hovering.destroy(); }, THEME.feedback));
__junction_hovering.destroy();
}, THEME.feedback));
} else { } else {
var _jun = junction_hovering.value_from; var _jun = junction_hovering.value_from;
array_push(menu, menuItem($"[{_jun.node.display_name}] {_jun.getName()}", function(data) { array_push(menu, menuItem($"[{_jun.node.display_name}] {_jun.getName()}", function(data) /*=>*/ { __junction_hovering.removeFrom(); }, THEME.cross));
__junction_hovering.removeFrom();
}, THEME.cross));
} }
} }
@ -1805,10 +1802,7 @@ function Panel_Graph(project = PROJECT) : PanelContent() constructor {
} }
} }
value_dragging = noone; if(_connect[0] == -7 && !is_instanceof(value_dragging.node, Node_Pin)) {
connection_draw_mouse = noone;
if(_connect[0] == -7) {
if(_connect[1].value_from_loop != noone) if(_connect[1].value_from_loop != noone)
_connect[1].value_from_loop.destroy(); _connect[1].value_from_loop.destroy();
@ -1839,6 +1833,9 @@ function Panel_Graph(project = PROJECT) : PanelContent() constructor {
menuCall(,,, menu); menuCall(,,, menu);
} }
value_dragging = noone;
connection_draw_mouse = noone;
} }
function draggingValue() { function draggingValue() {

7
scripts/project_data/project_data.gml
View file

@ -43,7 +43,7 @@
snap : false, snap : false,
size : [ 16, 16 ], size : [ 16, 16 ],
opacity : 0.5, opacity : 0.5,
color : COLORS.panel_preview_grid, color : cola(COLORS.panel_preview_grid),
pixel : false, pixel : false,
} }
@ -54,9 +54,10 @@
snap : true, snap : true,
size : 16, size : 16,
opacity : 0.05, opacity : 0.05,
color : c_white, color : cola(c_white),
highlight : 12, highlight : 12,
} }
graph_display_parameter = { graph_display_parameter = {
show_grid : true, show_grid : true,
show_dimension : true, show_dimension : true,
@ -75,7 +76,7 @@
enabled: false, enabled: false,
range: [ -1, 1 ], range: [ -1, 1 ],
step: 1, step: 1,
color: [ c_red, c_blue ], color: [ cola(c_red), cola(c_blue) ],
alpha: 0.5, alpha: 0.5,
on_top: true, on_top: true,
}; };