Build with frame border fix

Author: linev

build/jsroot.js

@@ -1,4 +1,4 @@
-// https://root.cern/js/ v7.10.0
+// https://root.cern/js/ v7.10.99
 (function (global, factory) {
 typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 typeof define === 'function' && define.amd ? define(['exports'], factory) :
@@ -10,11 +10,11 @@ var _documentCurrentScript = typeof document !== 'undefined' ? document.currentS
 
 /** @summary version id
   * @desc For the JSROOT release the string in format 'major.minor.patch' like '7.0.0' */
-const version_id = '7.10.0',
+const version_id = 'dev',
 
 /** @summary version date
   * @desc Release date in format day/month/year like '14/04/2022' */
-version_date = '27/10/2025',
+version_date = '3/11/2025',
 
 /** @summary version id and date
   * @desc Produced by concatenation of {@link version_id} and {@link version_date}
@@ -81558,7 +81558,7 @@ class TAxisPainter extends ObjectPainter {
 
    /** @summary Draw axis labels
      * @return {Promise} with array label size and max width */
-   async drawLabels(axis_g, axis, w, h, handle, side, labelsFont, labeloffset, tickSize, ticksPlusMinus, max_text_width, frame_ygap) {
+   async drawLabels(axis_g, axis, w, h, handle, labelsside, labelsFont, labeloffset, tickSize, ticksPlusMinus, max_text_width, frame_ygap) {
       const center_lbls = this.isCenteredLabels(),
             label_g = [axis_g.append('svg:g').attr('class', 'axis_labels')],
             lbl_pos = handle.lbl_pos || handle.major,
@@ -81630,13 +81630,8 @@ class TAxisPainter extends ObjectPainter {
          }
       }
 
-      let pr = Promise.resolve();
-
-      for (let lcnt = 0; lcnt < label_g.length; ++lcnt) {
-         if (lcnt > 0)
-            side = -side;
-
-         pr = pr.then(() => this.startTextDrawingAsync(labelsFont, 'font', label_g[lcnt])).then(() => {
+      const draw_labels = (lcnt, side) => {
+         return this.startTextDrawingAsync(labelsFont, 'font', label_g[lcnt]).then(() => {
             let lastpos = 0;
             const fix_coord = this.vertical ? -labeloffset * side : labeloffset * side + ticksPlusMinus * tickSize;
 
@@ -81682,7 +81677,8 @@ class TAxisPainter extends ObjectPainter {
                if (this.vertical) {
                   arg.x = fix_coord;
                   arg.y = pos;
-                  arg.align = rotate_lbls ? (this.optionLeft || this.reverseAlign ? 23 : 21) : (this.optionLeft || this.reverseAlign ? 12 : 32);
+                  const flag = this.optionLeft || this.reverseAlign || (side < 0);
+                  arg.align = rotate_lbls ? (flag ? 23 : 21) : (flag ? 12 : 32);
                   if (this.cutLabels()) {
                      const gap = labelsFont.size * (rotate_lbls ? 1.5 : 0.6);
                      if ((pos < gap) || (pos > h - gap))
@@ -81752,14 +81748,16 @@ class TAxisPainter extends ObjectPainter {
                });
             }
 
-            if ((lcnt > 1) && applied_scale)
+            if ((lcnt > 0) && applied_scale)
                this.scaleTextDrawing(applied_scale, label_g[lcnt]);
 
             return this.finishTextDrawing(label_g[lcnt], true);
          });
-      }
+      };
 
-      return pr.then(() => {
+      return draw_labels(0, labelsside).then(() => {
+         return label_g.length < 2 ? true : draw_labels(1, -labelsside);
+      }).then(() => {
          this._maxlbllen = maxtextlen; // for internal use in palette painter
 
          if (lbl_tilt) {
@@ -84535,6 +84533,11 @@ class TFramePainter extends FrameInteractive {
             this.fillatt.setSolidColor('white');
          else if ((pad?.fFillStyle === 4000) && !this.fillatt.empty()) // special case of transpad.C macro, which set transparent pad
             this.fillatt.setOpacity(0);
+
+         if (pad && (pad.fFrameBorderMode || (pad.fFrameBorderSize !== 1))) {
+            this.#border_mode = pad.fFrameBorderMode;
+            this.#border_size = pad.fFrameBorderSize;
+         }
       }
 
       if (!tframe && (pad?.fFrameLineColor !== undefined))
@@ -90044,6 +90047,10 @@ class TPadPainter extends ObjectPainter {
       padOpt('GRIDX', p => { p.fGridx = 1; });
       padOpt('GRIDY', p => { p.fGridy = 1; });
       padOpt('GRID', p => { p.fGridx = p.fGridy = 1; });
+      padOpt('TICKX2', p => { p.fTickx = 2; });
+      padOpt('TICKY2', p => { p.fTicky = 2; });
+      padOpt('TICKZ2', p => { p.fTickz = 2; });
+      padOpt('TICK2', p => { p.fTickx = p.fTicky = 2; });
       padOpt('TICKX', p => { p.fTickx = 1; });
       padOpt('TICKY', p => { p.fTicky = 1; });
       padOpt('TICKZ', p => { p.fTickz = 1; });
@@ -93203,6 +93210,14 @@ class THistDrawOptions {
          pad.fGridx = 1;
       if (d.check('GRIDY') && pad)
          pad.fGridy = 1;
+      if (d.check('TICKXY2') && pad)
+         pad.fTickx = pad.fTicky = 2;
+      if (d.check('TICKX2') && pad)
+         pad.fTickx = 2;
+      if (d.check('TICKY2') && pad)
+         pad.fTicky = 2;
+      if (d.check('TICKZ2') && pad)
+         pad.fTickz = 2;
       if (d.check('TICKXY') && pad)
          pad.fTickx = pad.fTicky = 1;
       if (d.check('TICKX') && pad)
@@ -93781,11 +93796,17 @@ class THistDrawOptions {
             res += '_GRIDX';
          if (pad.fGridy)
             res += '_GRIDY';
-         if (pad.fTickx)
+         if (pad.fTickx === 2)
+            res += '_TICKX2';
+         else if (pad.fTickx)
             res += '_TICKX';
-         if (pad.fTicky)
+         if (pad.fTicky === 2)
+            res += '_TICKY2';
+         else if (pad.fTicky)
             res += '_TICKY';
-         if (pad.fTickz)
+         if (pad.fTickz === 2)
+            res += '_TICKZ2';
+         else if (pad.fTickz)
             res += '_TICKZ';
       }
 
@@ -102270,7 +102291,8 @@ function getTF1Value(func, x, skip_eval = undefined) {
 }
 
 const PadDrawOptions = ['LOGXY', 'LOGX', 'LOGY', 'LOGZ', 'LOGV', 'LOG', 'LOG2X', 'LOG2Y', 'LOG2',
-                        'LNX', 'LNY', 'LN', 'GRIDXY', 'GRIDX', 'GRIDY', 'TICKXY', 'TICKX', 'TICKY', 'TICKZ', 'FB', 'GRAYSCALE'];
+                        'LNX', 'LNY', 'LN', 'GRIDXY', 'GRIDX', 'GRIDY',
+                        'TICKXY2', 'TICKX2', 'TICKY2', 'TICKXY', 'TICKX', 'TICKY', 'TICKZ', 'FB', 'GRAYSCALE'];
 
 /**
  * @summary Painter for TH1 classes
@@ -182660,6 +182682,12 @@ class RPadPainter extends RObjectPainter {
          pad.fGridy = 1;
       if (d.check('GRID'))
          pad.fGridx = pad.fGridy = 1;
+      if (d.check('TICKX2'))
+         pad.fTickx = 2;
+      if (d.check('TICKY2'))
+         pad.fTicky = 2;
+      if (d.check('TICK2'))
+         pad.fTickx = pad.fTicky = 2;
       if (d.check('TICKX'))
          pad.fTickx = 1;
       if (d.check('TICKY'))

changes.md

@@ -3,6 +3,7 @@
 
 ## Changes in dev
 1. Fix - proper paint axis labels on both sides when pad.fTickx/y = 2
+2. Fix - paint frame border mode/size from TCanvas
 
 
 ## Changes in 7.10.0

modules/core.mjs

@@ -6,7 +6,7 @@ const version_id = 'dev',
 
 /** @summary version date
   * @desc Release date in format day/month/year like '14/04/2022' */
-version_date = '28/10/2025',
+version_date = '3/11/2025',
 
 /** @summary version id and date
   * @desc Produced by concatenation of {@link version_id} and {@link version_date}