Skip to content

Commit 2c76fd8

Browse files
committed
7.10.2
1 parent 687651d commit 2c76fd8

File tree

5 files changed

+23
-14
lines changed

5 files changed

+23
-14
lines changed

build/jsroot.js

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// https://root.cern/js/ v7.10.1
1+
// https://root.cern/js/ v7.10.2
22
(function (global, factory) {
33
typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
44
typeof define === 'function' && define.amd ? define(['exports'], factory) :
@@ -10,11 +10,11 @@ var _documentCurrentScript = typeof document !== 'undefined' ? document.currentS
1010

1111
/** @summary version id
1212
* @desc For the JSROOT release the string in format 'major.minor.patch' like '7.0.0' */
13-
const version_id = '7.10.x',
13+
const version_id = '7.10.2',
1414

1515
/** @summary version date
1616
* @desc Release date in format day/month/year like '14/04/2022' */
17-
version_date = '30/01/2026',
17+
version_date = '11/02/2026',
1818

1919
/** @summary version id and date
2020
* @desc Produced by concatenation of {@link version_id} and {@link version_date}
@@ -91888,7 +91888,7 @@ class TPavePainter extends ObjectPainter {
9188891888
nlines = legend.fPrimitives.arr.length,
9188991889
ncols = Math.max(1, legend.fNColumns);
9189091890
let nrows = Math.round(nlines / ncols),
91891-
any_text = false,
91891+
any_text = false, has_header = false,
9189291892
custom_textg = false; // each text entry has own attributes
9189391893

9189491894
if (nrows * ncols < nlines)
@@ -91898,6 +91898,8 @@ class TPavePainter extends ObjectPainter {
9189891898

9189991899
for (let ii = 0; ii < nlines; ++ii) {
9190091900
const entry = legend.fPrimitives.arr[ii];
91901+
if ((ii === 0) && (entry.fOption === 'h'))
91902+
has_header = true;
9190191903
if (isEmpty(entry)) {
9190291904
if (ncols === 1)
9190391905
nrows--;
@@ -91909,6 +91911,9 @@ class TPavePainter extends ObjectPainter {
9190991911
}
9191091912
}
9191191913

91914+
if (has_header && (ncols > 1) && ((nrows - 1) * ncols < nlines - 1))
91915+
nrows++;
91916+
9191291917
if (nrows < 1)
9191391918
nrows = 1;
9191491919

@@ -91971,8 +91976,10 @@ class TPavePainter extends ObjectPainter {
9197191976

9197291977
if (ncols === 1)
9197391978
++i;
91974-
else
91979+
else if (!has_header || ii === 0)
9197591980
i = ii;
91981+
else
91982+
i = ii - 1 + ncols;
9197691983

9197791984
const lopt = entry.fOption.toLowerCase(),
9197891985
icol = i % ncols, irow = (i - icol) / ncols,
@@ -92077,17 +92084,19 @@ class TPavePainter extends ObjectPainter {
9207792084
.call(painter.lineatt.func);
9207892085
}
9207992086

92080-
let pos_x = tpos_x;
92087+
let pos_x = tpos_x, arg_width = Math.round(column_pos[icol + 1] - pos_x);
9208192088
if (isStr(lopt) && (lopt.toLowerCase() !== 'h'))
9208292089
any_opt = true;
92083-
else if (!any_opt)
92084-
pos_x = x0;
92090+
else if (!any_opt) {
92091+
pos_x = padding_x;
92092+
arg_width = w - 2 * padding_x;
92093+
}
9208592094

9208692095
if (entry.fLabel) {
9208792096
const textatt = this.createAttText({ attr: entry, std: false, attr_alt: legend }),
9208892097
arg = {
9208992098
draw_g: this.getG(), align: textatt.align,
92090-
x: pos_x, width: Math.round(column_pos[icol + 1] - pos_x),
92099+
x: pos_x, width: arg_width,
9209192100
y: y0, height: Math.round(row_height),
9209292101
scale: (custom_textg && !entry.fTextSize) || !legend.fTextSize,
9209392102
text: entry.fLabel, color: textatt.color

changes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# JSROOT changelog
22

3-
## Changes in 7.10.x
3+
## Changes in 7.10.2
44
1. Fix - correctly process `TLeafB` arrays in tree draw #384
55
2. Fix - better detect default ranges in `TGraph` histogram
66
3. Fix - convert BigInt before `RNtuple` drawing

demo/node/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jsroot-demos",
3-
"version": "7.10.1",
3+
"version": "7.10.2",
44
"engines": {
55
"node": ">=0.18"
66
},

modules/core.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
/** @summary version id
44
* @desc For the JSROOT release the string in format 'major.minor.patch' like '7.0.0' */
5-
const version_id = '7.10.x',
5+
const version_id = '7.10.2',
66

77
/** @summary version date
88
* @desc Release date in format day/month/year like '14/04/2022' */
9-
version_date = '30/01/2026',
9+
version_date = '11/02/2026',
1010

1111
/** @summary version id and date
1212
* @desc Produced by concatenation of {@link version_id} and {@link version_date}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jsroot",
3-
"version": "7.10.1",
3+
"version": "7.10.2",
44
"engines": {
55
"node": ">= 0.18.0"
66
},

0 commit comments

Comments
 (0)