ntk 8.18.1 → 8.20.0

package/lib/text/layout.js

@@ -916,6 +916,9 @@ export class TextLayout {
   draw(ctx, x = 0, y = 0) {
     const app = ctx.window.app;
     const Render = app.display.Render;
+    // The context's composite op, as `fillText` takes it. A context that is
+    // not ntk's has none to give, and its text goes source-over.
+    const op = ctx._op?.() ?? Render.PictOp.Over;
     // One batch for the whole layout, not one per line: every positioned
     // run carries its own absolute baseline, so a uniformly coloured
     // paragraph becomes a single glyph composite instead of one per line.
@@ -929,9 +932,9 @@ export class TextLayout {
       // (drawGlyphRuns composites straight onto the picture and can see
       // neither)
       if (typeof ctx.drawGlyphs === 'function') {
-        ctx.drawGlyphs(Render.PictOp.Over, src, batch);
+        ctx.drawGlyphs(op, src, batch);
       } else {
-        drawGlyphRuns(app, Render.PictOp.Over, src.id, ctx.picture.id, batch);
+        drawGlyphRuns(app, op, src.id, ctx.picture.id, batch);
       }
       batch = [];
     };
@@ -942,7 +945,7 @@ export class TextLayout {
     // height and its font's extent again on either side for ink that
     // overhangs the box, is outside the rows the clip lets through: nothing
     // of it could have landed on a pixel.
-    const rows = visibleRows(ctx, y);
+    const rows = visibleRows(ctx, y, op);
     for (const line of this.lines) {
       if (rows) {
         const reach = line.height + line.ascent + line.descent;
@@ -1493,12 +1496,15 @@ function sliceLevels(key, start, end) {
  * The rows of a layout drawn at `y` that the context can show — its clip's
  * box, or the whole surface with no clip — in the layout's own coordinates.
  * Null where that cannot be said, and the whole layout is drawn: a context
- * that is not ntk's, a transform that is more than a translation, or a
- * shadow, which lands where the text is not.
+ * that is not ntk's, a transform that is more than a translation, a
+ * shadow, which lands where the text is not, or an `op` like `copy` that
+ * clears the box round all the glyphs drawn — a line the clip hides still
+ * widens that box along the rows it does not hide.
  */
-function visibleRows(ctx, y) {
+function visibleRows(ctx, y, op) {
   if (typeof ctx.drawGlyphs !== 'function') return null;
   if (typeof ctx._clipExtents !== 'function') return null;
+  if (typeof ctx._maskBounded === 'function' && !ctx._maskBounded(op)) return null;
   const m = ctx._m;
   if (!m || m[0] !== 1 || m[1] !== 0 || m[2] !== 0 || m[3] !== 1) return null;
   if (typeof ctx._shadowed !== 'function' || ctx._shadowed()) return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ntk",
-  "version": "8.18.1",
+  "version": "8.20.0",
   "description": "Desktop UI toolkit for X11 with canvas-like 2d and OpenGL rendering",
   "author": "Andrey Sidorov <sidorares@yandex.ru>",
   "license": "MIT",