ntk 8.12.11 → 8.12.13

package/lib/renderingcontext_2d.js

@@ -3640,7 +3640,17 @@ class RenderingContext2d {
     const y = Math.min(...ys);
     const w = Math.max(...xs) - x;
     const h = Math.max(...ys) - y;
-    if (!(w > 0 && h > 0)) return null;
+    // A rectangle of no area is still one, and clips everything: what a box
+    // of no height clips its content to, a menu at `max-height: 0`. Taken
+    // for a path, it built the mask the size of the surface, and every
+    // rectangle clipped inside it was intersected into that mask; the
+    // intersection of an empty one is empty, and every consumer draws
+    // nothing through that, as where two rectangles do not meet.
+    if (!(w > 0 && h > 0)) {
+      return Number.isFinite(w) && Number.isFinite(h)
+        ? { x: 0, y: 0, w: 0, h: 0 }
+        : null;
+    }
     // Server clip rectangles are integers, so a fractional edge could only
     // be honoured by rounding — which would differ from the mask path's
     // antialiased edge by up to a pixel. Rare, so leave those to the mask

package/lib/window.js

@@ -1560,6 +1560,7 @@ export default class Window extends Drawable {
 
   _runFrame() {
     const f = this._frame;
+    const startedAt = performance.now();
     if (
       !f.pending.size &&
       !f.rafCbs.length &&
@@ -1601,7 +1602,7 @@ export default class Window extends Drawable {
     // that drew nothing has to fall back to the timer, or nothing would ever
     // run the next frame.
     if (!this._clockOnPresent()) this._armFence();
-    this._armTimer();
+    this._armTimer(startedAt);
   }
 
   /**
@@ -2156,8 +2157,14 @@ export default class Window extends Drawable {
    * and arming one would only cap the rate the display just set. An explicit
    * `frameInterval` is honoured in both, since a cap the caller asked for
    * applies whatever ends the frame.
+   *
+   * The period runs from the start of the frame (`startedAt`), not from its
+   * end: a frame's own work is part of its period, not a pause owed after it.
+   * Counted from the end, a window whose frames took 3 ms drew one every 19
+   * under a 16.7 ms interval — a GL map panned by an animation, whose window
+   * is on the fence, ran at 51 frames a second on a 60 Hz panel.
    */
-  _armTimer() {
+  _armTimer(startedAt = performance.now()) {
     const f = this._frame;
     if (f.timer) return;
     let period = this.frameInterval;
@@ -2169,7 +2176,7 @@ export default class Window extends Drawable {
     f.timer = setTimeout(() => {
       f.timer = null;
       if (f.pending.size || f.rafCbs.length || f.needsRedraw) this._scheduleFrame();
-    }, period);
+    }, Math.max(0, period - (performance.now() - startedAt)));
     if (typeof f.timer.unref === 'function') f.timer.unref();
   }
 

package/package.json

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