diff --git a/datafiles/data/Theme.zip b/datafiles/data/Theme.zip index cfe1f8dce..38ea96154 100644 Binary files a/datafiles/data/Theme.zip and b/datafiles/data/Theme.zip differ diff --git a/objects/o_dialog_add_node/Create_0.gml b/objects/o_dialog_add_node/Create_0.gml index 3e93bd3da..d5f5225b8 100644 --- a/objects/o_dialog_add_node/Create_0.gml +++ b/objects/o_dialog_add_node/Create_0.gml @@ -40,6 +40,8 @@ event_inherited(); tooltip_surface = -1; content_hoverable = true; + canvas = false; + #region ---- category ---- category = NODE_CATEGORY; switch(instanceof(context)) { @@ -146,7 +148,7 @@ event_inherited(); if(!_node) return; - if(is_instanceof(context, Node_Canvas) || is_instanceof(context, Node_Canvas_Group)) { + if(canvas) { UNDO_HOLDING = true; context.nodeTool = new canvas_tool_node(context, _node).init(); UNDO_HOLDING = false; diff --git a/scripts/node_canvas/node_canvas.gml b/scripts/node_canvas/node_canvas.gml index 429ab5b85..1554b8d95 100644 --- a/scripts/node_canvas/node_canvas.gml +++ b/scripts/node_canvas/node_canvas.gml @@ -336,7 +336,7 @@ function Node_Canvas(_x, _y, _group = noone) : Node(_x, _y, _group) constructor __action_rotate_90_ccw = method(self, function() { if(tool_selection.is_selected) tool_selection.rotate90ccw() else canvas_action_rotate( 90); }); __action_flip_h = method(self, function() { if(tool_selection.is_selected) tool_selection.flipH() else canvas_action_flip(1); }); __action_flip_v = method(self, function() { if(tool_selection.is_selected) tool_selection.flipV() else canvas_action_flip(0); }); - __action_add_node = method(self, function(ctx) { dialogCall(o_dialog_add_node, mouse_mx + 8, mouse_my + 8, { context: ctx }); }); + __action_add_node = method(self, function(ctx) { var dia = dialogCall(o_dialog_add_node, mouse_mx + 8, mouse_my + 8, { context: ctx }); dia.canvas = true; }); __action_make_brush = method(self, function() { if(brush.brush_use_surface) { brush.brush_surface = noone; diff --git a/scripts/node_mk_subpixel/node_mk_subpixel.gml b/scripts/node_mk_subpixel/node_mk_subpixel.gml index d3f1a1b5e..4b6077935 100644 --- a/scripts/node_mk_subpixel/node_mk_subpixel.gml +++ b/scripts/node_mk_subpixel/node_mk_subpixel.gml @@ -72,6 +72,8 @@ function Node_MK_Subpixel(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou update_on_frame = _flku; + if(!is_surface(_surf)) return _outSurf; + var _dim = surface_get_dimension(_surf); var sh = sh_mk_subpixel_hex_disc; _outSurf = surface_verify(_outSurf, _dim[0], _dim[1]); diff --git a/scripts/outputBox/outputBox.gml b/scripts/outputBox/outputBox.gml index 03bbdca5d..445eaf2dc 100644 --- a/scripts/outputBox/outputBox.gml +++ b/scripts/outputBox/outputBox.gml @@ -15,6 +15,13 @@ function outputBox() : widget() constructor { draw_set_text(font, fa_left, fa_top, COLORS._main_text_sub); + // if(typeof(_value) == "ref") { + // var _hh = ui(96); + + + // return _hh; + // } + var _txt = string(_value); var _bh = string_height("l"); var _sh = string_height_ext(_txt, -1, w - ui(16)); diff --git a/scripts/panel_gradient/panel_gradient.gml b/scripts/panel_gradient/panel_gradient.gml index be61fe3b7..9d28989d0 100644 --- a/scripts/panel_gradient/panel_gradient.gml +++ b/scripts/panel_gradient/panel_gradient.gml @@ -25,7 +25,7 @@ function Panel_Gradient() : PanelContent() constructor { for(var j = 0; j < col; j++) { var ind = i * col + j; if(ind >= amo) break; - + var xx = j * gw; var gww = gw - ui(8); var _py = yy + ui(18); diff --git a/scripts/surfaceBox/surfaceBox.gml b/scripts/surfaceBox/surfaceBox.gml index 22e833f64..8f5bedec4 100644 --- a/scripts/surfaceBox/surfaceBox.gml +++ b/scripts/surfaceBox/surfaceBox.gml @@ -140,9 +140,9 @@ function surfaceBox(_onModify, def_path = "") : widget() constructor { return h; } - static clone = function() { #region + static clone = function() { var cln = new surfaceBox(onModify, def_path); return cln; - } #endregion + } } \ No newline at end of file diff --git a/sprites/s_icon_canvas/2865b94d-491b-4d7d-bdc6-ebbdb34cf4d4.png b/sprites/s_icon_canvas/2865b94d-491b-4d7d-bdc6-ebbdb34cf4d4.png new file mode 100644 index 000000000..0ae6bbd29 Binary files /dev/null and b/sprites/s_icon_canvas/2865b94d-491b-4d7d-bdc6-ebbdb34cf4d4.png differ diff --git a/sprites/s_icon_canvas/802eedb3-856f-4c55-b600-b07717c204af.png b/sprites/s_icon_canvas/802eedb3-856f-4c55-b600-b07717c204af.png deleted file mode 100644 index 37f213d72..000000000 Binary files a/sprites/s_icon_canvas/802eedb3-856f-4c55-b600-b07717c204af.png and /dev/null differ diff --git a/sprites/s_icon_canvas/layers/2865b94d-491b-4d7d-bdc6-ebbdb34cf4d4/012c44a9-0460-4825-872f-2945ce4902c9.png b/sprites/s_icon_canvas/layers/2865b94d-491b-4d7d-bdc6-ebbdb34cf4d4/012c44a9-0460-4825-872f-2945ce4902c9.png new file mode 100644 index 000000000..0ae6bbd29 Binary files /dev/null and b/sprites/s_icon_canvas/layers/2865b94d-491b-4d7d-bdc6-ebbdb34cf4d4/012c44a9-0460-4825-872f-2945ce4902c9.png differ diff --git a/sprites/s_icon_canvas/layers/802eedb3-856f-4c55-b600-b07717c204af/01cca658-3f63-4487-8a8e-1847568814bc.png b/sprites/s_icon_canvas/layers/802eedb3-856f-4c55-b600-b07717c204af/01cca658-3f63-4487-8a8e-1847568814bc.png deleted file mode 100644 index 37f213d72..000000000 Binary files a/sprites/s_icon_canvas/layers/802eedb3-856f-4c55-b600-b07717c204af/01cca658-3f63-4487-8a8e-1847568814bc.png and /dev/null differ diff --git a/sprites/s_icon_canvas/s_icon_canvas.yy b/sprites/s_icon_canvas/s_icon_canvas.yy index 281b10206..494f40ff4 100644 --- a/sprites/s_icon_canvas/s_icon_canvas.yy +++ b/sprites/s_icon_canvas/s_icon_canvas.yy @@ -2,24 +2,24 @@ "$GMSprite":"", "%Name":"s_icon_canvas", "bboxMode":0, - "bbox_bottom":15, - "bbox_left":0, - "bbox_right":15, - "bbox_top":0, + "bbox_bottom":14, + "bbox_left":1, + "bbox_right":13, + "bbox_top":1, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"802eedb3-856f-4c55-b600-b07717c204af","name":"802eedb3-856f-4c55-b600-b07717c204af","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"2865b94d-491b-4d7d-bdc6-ebbdb34cf4d4","name":"2865b94d-491b-4d7d-bdc6-ebbdb34cf4d4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":16, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"01cca658-3f63-4487-8a8e-1847568814bc","blendMode":0,"displayName":"default","isLocked":false,"name":"01cca658-3f63-4487-8a8e-1847568814bc","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"012c44a9-0460-4825-872f-2945ce4902c9","blendMode":0,"displayName":"default","isLocked":false,"name":"012c44a9-0460-4825-872f-2945ce4902c9","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_icon_canvas", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"802eedb3-856f-4c55-b600-b07717c204af","path":"sprites/s_icon_canvas/s_icon_canvas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"719a7433-7c7c-4930-8897-a925eb668da2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2865b94d-491b-4d7d-bdc6-ebbdb34cf4d4","path":"sprites/s_icon_canvas/s_icon_canvas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ec091327-1106-402e-9b3a-c76995dccdc2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null,