@yuneta/gobj-ui 7.23.105 → 7.23.107

package/dist/gobj-ui.cjs.js

@@ -56082,8 +56082,13 @@ function figure_shape_of(gobj, desc, record, geometry, flags) {
 	let labels = (0, _yuneta_gobj_js.gobj_read_bool_attr)(gobj, "node_labels");
 	let figure = node_figure_of(gobj, desc, geometry || {});
 	let paint = node_paint_of(gobj, desc, geometry);
-	let stroke = paint.stroke;
-	let line_width = Math.max(paint.lineWidth, 1.5);
+	let fill = dark ? mix_colors(paint.fill, .25, "#2c3542") : mix_colors(paint.fill, .1, "#ffffff");
+	let stroke = dark ? mix_colors(paint.fill, .85, "#ffffff") : paint.fill;
+	let line_width = 2;
+	if (paint.stroke !== getStrokeColor(paint.fill)) {
+		stroke = paint.stroke;
+		line_width = Math.max(paint.lineWidth, 2);
+	}
 	if (f.selected) {
 		stroke = SELECT_RING;
 		line_width = 3;
@@ -56101,7 +56106,7 @@ function figure_shape_of(gobj, desc, record, geometry, flags) {
 	let style = {
 		size: [side, side],
 		radius: figure === "square" ? Math.round(side / 5) : 0,
-		fill: paint.fill,
+		fill,
 		stroke,
 		lineWidth: line_width,
 		lineDash: dash,
@@ -63919,6 +63924,7 @@ function ac_layout_autoset(gobj, event, kw, src) {
 function ac_camera_changed(gobj, event, kw, src) {
 	(0, _yuneta_gobj_js.gobj_write_attr)(gobj, "camera", {
 		zoom: kw.zoom,
+		node: kw.node,
 		x: kw.x,
 		y: kw.y
 	});

package/dist/gobj-ui.es.js

@@ -56077,8 +56077,13 @@ function figure_shape_of(gobj, desc, record, geometry, flags) {
 	let labels = gobj_read_bool_attr(gobj, "node_labels");
 	let figure = node_figure_of(gobj, desc, geometry || {});
 	let paint = node_paint_of(gobj, desc, geometry);
-	let stroke = paint.stroke;
-	let line_width = Math.max(paint.lineWidth, 1.5);
+	let fill = dark ? mix_colors(paint.fill, .25, "#2c3542") : mix_colors(paint.fill, .1, "#ffffff");
+	let stroke = dark ? mix_colors(paint.fill, .85, "#ffffff") : paint.fill;
+	let line_width = 2;
+	if (paint.stroke !== getStrokeColor(paint.fill)) {
+		stroke = paint.stroke;
+		line_width = Math.max(paint.lineWidth, 2);
+	}
 	if (f.selected) {
 		stroke = SELECT_RING;
 		line_width = 3;
@@ -56096,7 +56101,7 @@ function figure_shape_of(gobj, desc, record, geometry, flags) {
 	let style = {
 		size: [side, side],
 		radius: figure === "square" ? Math.round(side / 5) : 0,
-		fill: paint.fill,
+		fill,
 		stroke,
 		lineWidth: line_width,
 		lineDash: dash,
@@ -63914,6 +63919,7 @@ function ac_layout_autoset(gobj, event, kw, src) {
 function ac_camera_changed(gobj, event, kw, src) {
 	gobj_write_attr(gobj, "camera", {
 		zoom: kw.zoom,
+		node: kw.node,
 		x: kw.x,
 		y: kw.y
 	});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yuneta/gobj-ui",
-  "version": "7.23.105",
+  "version": "7.23.107",
   "type": "module",
   "main": "dist/gobj-ui.cjs.js",
   "module": "dist/gobj-ui.es.js",

package/src/c_g6_nodes_tree.js

@@ -2456,8 +2456,29 @@ function figure_shape_of(gobj, desc, record, geometry, flags)
     let figure = node_figure_of(gobj, desc, geometry || {});
     let paint = node_paint_of(gobj, desc, geometry);
 
-    let stroke = paint.stroke;
-    let line_width = Math.max(paint.lineWidth, 1.5);
+    /*  THE SAME PAINT AS THE CARD, and that is the point: a card, a
+     *  pill and a figure are one record drawn at three sizes, so they
+     *  cannot wear two different colour languages. The card is html and
+     *  writes `color-mix()`; a canvas shape cannot, so the same mix is
+     *  computed here -- with `mix_colors()`, which is in this file
+     *  already and for this very reason (the ports).
+     *
+     *  It also gives the figure an EDGE. It used to be the raw topic
+     *  colour filled, ringed by `getStrokeColor()` -- the same colour
+     *  darkened 20%, which measures 1.4:1 against its own fill: not a
+     *  border, a ramp, and a fan of them reads as a blurred picture.
+     *  Tint inside, vivid colour around it, and the canto is there.  */
+    let fill = dark? mix_colors(paint.fill, 0.25, "#2c3542")
+                   : mix_colors(paint.fill, 0.10, "#ffffff");
+    let stroke = dark? mix_colors(paint.fill, 0.85, "#ffffff") : paint.fill;
+    let line_width = 2;
+    /*  A paint somebody CHOSE (a node's or a topic's own, saved in
+     *  `__graphs__`) is not ours to reinterpret: it comes through as
+     *  it was chosen.  */
+    if(paint.stroke !== getStrokeColor(paint.fill)) {
+        stroke = paint.stroke;
+        line_width = Math.max(paint.lineWidth, 2);
+    }
     if(f.selected) {
         stroke = SELECT_RING;
         line_width = 3;
@@ -2480,7 +2501,7 @@ function figure_shape_of(gobj, desc, record, geometry, flags)
     let style = {
         size: [side, side],
         radius: (figure === 'square')? Math.round(side / 5) : 0,
-        fill: paint.fill,
+        fill: fill,
         stroke: stroke,
         lineWidth: line_width,
         lineDash: dash,

package/src/c_yui_treedb_graph.js

@@ -2900,8 +2900,13 @@ function ac_layout_autoset(gobj, event, kw, src)
  ************************************************************/
 function ac_camera_changed(gobj, event, kw, src)
 {
+    /*  `node` travels with the rest and is not optional: a camera is a
+     *  NODE at a viewport pixel, and one rebuilt here as `{zoom, x, y}`
+     *  -- which is what this did -- is a camera the engine refuses to
+     *  restore, so the graph came back at the right zoom in the wrong
+     *  place. Copy the fields the contract names, all of them.  */
     gobj_write_attr(gobj, "camera", {
-        zoom: kw.zoom, x: kw.x, y: kw.y
+        zoom: kw.zoom, node: kw.node, x: kw.x, y: kw.y
     });
     gobj_save_persistent_attrs(gobj, "camera");
     return 0;