diff --git a/datafiles/data/Theme.zip b/datafiles/data/Theme.zip index 35f058312..c05957c84 100644 Binary files a/datafiles/data/Theme.zip and b/datafiles/data/Theme.zip differ diff --git a/objects/o_dialog_splash/Create_0.gml b/objects/o_dialog_splash/Create_0.gml index a576cd707..ae35f3171 100644 --- a/objects/o_dialog_splash/Create_0.gml +++ b/objects/o_dialog_splash/Create_0.gml @@ -114,9 +114,7 @@ event_inherited(); meta_filter = []; sp_sample = new scrollPane(x1 - x0 - ui(12), y1 - y0 - 1, function(_y, _m) { #region - draw_clear_alpha(CDEF.main_black, 0); - draw_set_color(CDEF.main_black); - draw_rectangle(0, 1, sp_sample.surface_w, sp_sample.surface_h - 1, false); + draw_clear_alpha(COLORS.panel_bg_clear, 0); var txt = pages[project_page]; var list, _group_label; diff --git a/scripts/node_value_types/node_value_types.gml b/scripts/node_value_types/node_value_types.gml index 95c819482..8e65d7d59 100644 --- a/scripts/node_value_types/node_value_types.gml +++ b/scripts/node_value_types/node_value_types.gml @@ -195,9 +195,7 @@ function value_color(i) { return JUNCTION_COLORS[i]; } -function value_color_bg(i) { - return #3b3b4e; -} +function value_color_bg(i) { return CDEF.main_dkgrey; } function value_color_bg_array(i) { static JUNCTION_COLORS = [ diff --git a/scripts/panel_graph/panel_graph.gml b/scripts/panel_graph/panel_graph.gml index 040d852bb..5ad53d4f7 100644 --- a/scripts/panel_graph/panel_graph.gml +++ b/scripts/panel_graph/panel_graph.gml @@ -1414,14 +1414,11 @@ function Panel_Graph(project = PROJECT) : PanelContent() constructor { if(is_instanceof(junction_hovering, Node_Feedback_Inline)) { var _jun = junction_hovering.junc_out; - array_push(menu, menuItem($"[{_jun.node.display_name}] {_jun.getName()}", function(data) { - __junction_hovering.destroy(); - }, THEME.feedback)); + array_push(menu, menuItem($"[{_jun.node.display_name}] {_jun.getName()}", function(data) /*=>*/ { __junction_hovering.destroy(); }, THEME.feedback)); + } else { var _jun = junction_hovering.value_from; - array_push(menu, menuItem($"[{_jun.node.display_name}] {_jun.getName()}", function(data) { - __junction_hovering.removeFrom(); - }, THEME.cross)); + array_push(menu, menuItem($"[{_jun.node.display_name}] {_jun.getName()}", function(data) /*=>*/ { __junction_hovering.removeFrom(); }, THEME.cross)); } } @@ -1805,10 +1802,7 @@ function Panel_Graph(project = PROJECT) : PanelContent() constructor { } } - value_dragging = noone; - connection_draw_mouse = noone; - - if(_connect[0] == -7) { + if(_connect[0] == -7 && !is_instanceof(value_dragging.node, Node_Pin)) { if(_connect[1].value_from_loop != noone) _connect[1].value_from_loop.destroy(); @@ -1839,6 +1833,9 @@ function Panel_Graph(project = PROJECT) : PanelContent() constructor { menuCall(,,, menu); } + + value_dragging = noone; + connection_draw_mouse = noone; } function draggingValue() { diff --git a/scripts/project_data/project_data.gml b/scripts/project_data/project_data.gml index e88effd53..17db0bcd8 100644 --- a/scripts/project_data/project_data.gml +++ b/scripts/project_data/project_data.gml @@ -43,7 +43,7 @@ snap : false, size : [ 16, 16 ], opacity : 0.5, - color : COLORS.panel_preview_grid, + color : cola(COLORS.panel_preview_grid), pixel : false, } @@ -54,9 +54,10 @@ snap : true, size : 16, opacity : 0.05, - color : c_white, + color : cola(c_white), highlight : 12, } + graph_display_parameter = { show_grid : true, show_dimension : true, @@ -75,7 +76,7 @@ enabled: false, range: [ -1, 1 ], step: 1, - color: [ c_red, c_blue ], + color: [ cola(c_red), cola(c_blue) ], alpha: 0.5, on_top: true, };