Cleanup

base/sources/context.ts

@@ -707,6 +707,11 @@ function context_is_decal_mask_paint(): bool {
 	return context_is_decal() && operator_shortcut(map_get(config_keymap, "decal_mask") + "+" + map_get(config_keymap, "action_paint"), shortcut_type_t.DOWN);
 }
 
+function context_is_floating_toolbar(): bool {
+	// Header is off -> floating toolbar
+	return config_raw.layout[layout_size_t.HEADER] == 0;
+}
+
 function context_get_area_type(): area_type_t {
 	if (context_in_viewport()) {
 		return area_type_t.VIEWPORT;

base/sources/nodes/brush_output_node.ts

@@ -0,0 +1,11 @@
+
+function brush_output_node_create(raw: ui_node_t, args: f32_array_t): brush_output_node_t {
+    context_raw.run_brush = brush_output_node_run;
+	context_raw.parse_brush_inputs = brush_output_node_parse_inputs;
+
+    let n: brush_output_node_t = {};
+	n.base = logic_node_create(n);
+    n.raw = raw;
+    brush_output_node_create_ext(n);
+    return n;
+}

base/sources/ui_toolbar.ts

@@ -82,6 +82,11 @@ function ui_toolbar_get_w(): i32 {
 	return w;
 }
 
+function ui_toolbar_get_x(): i32 {
+	let ui: ui_t = ui_base_ui;
+	return 5 * ui_SCALE(ui);
+}
+
 function ui_toolbar_render_ui() {
 	let ui: ui_t = ui_base_ui;
 
@@ -92,10 +97,9 @@ function ui_toolbar_render_ui() {
 	let h: i32 = sys_height() - ui_header_h;
 	let _WINDOW_BG_COL: i32 = ui.ops.theme.WINDOW_BG_COL;
 
-	if (config_raw.layout[layout_size_t.HEADER] == 0) {
-		// Header is off -> floating toolbar
-		x += 5 * ui_SCALE(ui);
-		y += 5 * ui_SCALE(ui);
+	if (context_is_floating_toolbar()) {
+		x += ui_toolbar_get_x();
+		y += ui_toolbar_get_x();
 		h = ui_toolbar_tool_names.length * (ui_toolbar_w + 2);
 		ui.ops.theme.WINDOW_BG_COL = ui.ops.theme.SEPARATOR_COL;
 	}
@@ -208,8 +212,7 @@ function ui_toolbar_render_ui() {
 		ui.image_scroll_align = true;
 	}
 
-	if (config_raw.layout[layout_size_t.HEADER] == 0) {
-		// Header is off -> floating toolbar
+	if (context_is_floating_toolbar()) {
 		ui_toolbar_w = 0;
 		ui.ops.theme.WINDOW_BG_COL = _WINDOW_BG_COL;
 	}