Build

Author: linev

build/jsroot.js

@@ -74659,46 +74659,42 @@ class TooltipFor3D {
 
    /** @summary Show tooltip */
    show(v /* , mouse_pos, status_func */) {
-      if (!v)
-         return this.hide();
+      let lines;
+      if (v && isObject(v) && (v.lines || v.line)) {
+         if (!v.only_status)
+            lines = v.line ? [v.line] : v.lines;
+      } else if (isStr(v))
+         lines = [v];
 
-      if (isObject(v) && (v.lines || v.line)) {
-         if (v.only_status)
-            return this.hide();
+      const doc = this.parent.ownerDocument;
 
-         if (v.line)
-            v = v.line;
-         else {
-            let res = v.lines[0];
-            for (let n = 1; n < v.lines.length; ++n)
-               res += '<br/>' + v.lines[n];
-            v = res;
-         }
-      }
+      if (!lines || !doc)
+         return this.hide();
 
-      if (this.tt === null) {
-         const doc = getDocument();
+      if (!this.tt) {
          this.tt = doc.createElement('div');
-         this.tt.setAttribute('style', 'opacity: 1; filter: alpha(opacity=1); position: absolute; display: block; overflow: hidden; z-index: 101;');
+         this.tt.setAttribute('style', 'opacity: 1; filter: alpha(opacity=1); position: absolute; display: block; width: auto; overflow: hidden; z-index: 101;');
          this.cont = doc.createElement('div');
          this.cont.setAttribute('style', 'display: block; padding: 5px; margin-left: 5px; font-size: 11px; line-height: 18px; background: #777; color: #fff;');
          this.tt.appendChild(this.cont);
          this.parent.appendChild(this.tt);
       }
 
-      if (this.lastlbl !== v) {
-         this.cont.innerHTML = this.lastlbl = v;
-         this.tt.style.width = 'auto'; // let it be automatically resizing...
-      }
+      this.cont.innerText = '';
+      lines.forEach(lbl => {
+         const p = doc.createElement('p');
+         p.innerText = lbl;
+         p.setAttribute('style', 'padding: 0px; margin: 1px;');
+         this.cont.appendChild(p);
+      });
    }
 
    /** @summary Hide tooltip */
    hide() {
       if (this.tt)
          this.parent.removeChild(this.tt);
 
-      this.tt = null;
-      this.lastlbl = '';
+      this.tt = this.cont = null;
    }
 
 } // class TooltipFor3D
@@ -74956,20 +74952,21 @@ function createOrbitControl(painter, camera, scene, renderer, lookat) {
 
    control.getInfoAtMousePosition = function(mouse_pos) {
       const intersects = this.getMouseIntersects(mouse_pos);
-      let tip = null, _painter = null;
+      let tip = null, p = null;
 
       for (let i = 0; i < intersects.length; ++i) {
-         if (intersects[i].object.tooltip) {
-            tip = intersects[i].object.tooltip(intersects[i]);
-            _painter = intersects[i].object.painter;
+         const obj3d = intersects[i].object;
+         if (isFunc(obj3d?.tooltip)) {
+            tip = obj3d.tooltip(intersects[i]);
+            p = obj3d.tip_painter || obj3d.painter || tip?.$painter;
             break;
          }
       }
 
-      if (tip && _painter) {
+      if (tip && p) {
          return {
-            obj: _painter.getObject(),
-            name: _painter.getObject().fName,
+            obj: p.getObject(),
+            name: p.getObject().fName,
             bin: tip.bin, cont: tip.value,
             binx: tip.ix, biny: tip.iy, binz: tip.iz,
             grx: (tip.x1 + tip.x2) / 2, gry: (tip.y1 + tip.y2) / 2, grz: (tip.z1 + tip.z2) / 2
@@ -79007,7 +79004,7 @@ class JSRootMenu {
             title = name;
          if (title)
             title += `, code ${id}`;
-         this.addchk((id === curr) || more, '<nobr>' + name + '</nobr>', id, set_func, title || name);
+         this.addchk((id === curr) || more, name, id, set_func, title || name);
       };
 
       this.sub('Palette', () => this.input('Enter palette code [1..113]', curr, 'int', 1, 113).then(set_func));
@@ -80142,10 +80139,7 @@ class StandaloneMenu extends JSRootMenu {
             }
 
             const sub = doc.createElement('span');
-            if (d.text.indexOf('<nobr>') === 0)
-               sub.textContent = d.text.slice(6, d.text.length - 7);
-            else
-               sub.textContent = d.text;
+            sub.textContent = d.text;
             text.appendChild(sub);
          }
 
@@ -87004,7 +86998,7 @@ class BrowserLayout {
       for (let n = 0; n < 4; ++n) {
          const lbl = this.status_layout.getGridFrame(n).querySelector('label');
          maxh = Math.max(maxh, lbl.clientHeight);
-         lbl.innerHTML = msgs[n] || '';
+         lbl.innerText = msgs[n] || '';
       }
 
       if (!this.status_layout.first_check) {
@@ -101700,7 +101694,7 @@ function _lineErrToolTip(intersect) {
    const pos = Math.floor(intersect.index / 6);
    if ((pos < 0) || (pos >= this.intersect_index.length))
       return null;
-   const p = this.painter,
+   const p = this.tip_painter,
          histo = p.getHisto(),
          fp = p.getFramePainter(),
          tip = p.get3DToolTip(this.intersect_index[pos]),
@@ -101805,7 +101799,7 @@ function drawBinsError3D(painter, is_v7 = false) {
          material = new THREE.LineBasicMaterial(getMaterialArgs(lcolor, { linewidth: is_v7 ? painter.v7EvalAttr('line_width', 1) : histo.fLineWidth })),
          line = createLineSegments(lpos, material);
 
-   line.painter = painter;
+   line.tip_painter = painter;
    line.intersect_index = binindx;
    line.zmin = zmin;
    line.zmax = zmax;
@@ -104458,15 +104452,15 @@ class TH3Painter extends THistPainter {
          fp.add3DMesh(mesh);
 
          mesh.bins = bins;
-         mesh.painter = this;
+         mesh.tip_painter = this;
          mesh.tip_color = histo.fMarkerColor === 3 ? 0xFF0000 : 0x00FF00;
 
          mesh.tooltip = function(intersect) {
             const indx = Math.floor(intersect.index / this.nvertex);
             if ((indx < 0) || (indx >= this.bins.length))
                return null;
 
-            const p = this.painter,
+            const p = this.tip_painter,
                   thisto = p.getHisto(),
                   tip = p.get3DToolTip(this.bins[indx]);
 
@@ -104649,7 +104643,7 @@ class TH3Painter extends THistPainter {
          }
       }
 
-      function getBinTooltip(intersect) {
+      function _getBinTooltip(intersect) {
          let binid = this.binid;
 
          if (binid === undefined) {
@@ -104658,7 +104652,7 @@ class TH3Painter extends THistPainter {
             binid = this.bins[intersect.instanceId];
          }
 
-         const p = this.painter,
+         const p = this.tip_painter,
                thisto = p.getHisto(),
                tip = p.get3DToolTip(binid),
                grx1 = fp.grx(thisto.fXaxis.GetBinCoord(tip.ix - 1)),
@@ -104691,12 +104685,12 @@ class TH3Painter extends THistPainter {
 
             bin_mesh.applyMatrix4(bins_matrixes[n]);
 
-            bin_mesh.painter = this;
+            bin_mesh.tip_painter = this;
             bin_mesh.binid = bins_ids[n];
             bin_mesh.tipscale = tipscale;
             bin_mesh.tip_color = (histo.fFillColor === 3) ? 0xFF0000 : 0x00FF00;
             bin_mesh.get_weight = get_bin_weight;
-            bin_mesh.tooltip = getBinTooltip;
+            bin_mesh.tooltip = _getBinTooltip;
 
             fp.add3DMesh(bin_mesh);
          }
@@ -104714,12 +104708,12 @@ class TH3Painter extends THistPainter {
                all_bins_mesh.setColorAt(n, new THREE.Color(bins_colors[n]));
          }
 
-         all_bins_mesh.painter = this;
+         all_bins_mesh.tip_painter = this;
          all_bins_mesh.bins = bins_ids;
          all_bins_mesh.tipscale = tipscale;
          all_bins_mesh.tip_color = (histo.fFillColor === 3) ? 0xFF0000 : 0x00FF00;
          all_bins_mesh.get_weight = get_bin_weight;
-         all_bins_mesh.tooltip = getBinTooltip;
+         all_bins_mesh.tooltip = _getBinTooltip;
 
          fp.add3DMesh(all_bins_mesh);
       }
@@ -119123,7 +119117,7 @@ class TGeoPainter extends ObjectPainter {
             info.setAttribute('style', 'position: absolute; text-align: center; vertical-align: middle; top: 45%; left: 40%; color: red; font-size: 150%;');
             main.append(info);
          }
-         info.innerHTML = `${msg}, ${spent.toFixed(1)}s`;
+         info.innerText = `${msg}, ${spent.toFixed(1)}s`;
       }
    }
 
@@ -171465,7 +171459,7 @@ class TGraphDelaunay {
 } // class TGraphDelaunay
 
 /** @summary Function handles tooltips in the mesh */
-function graph2DTooltip(intersect) {
+function _graph2DTooltip(intersect) {
    let indx = Math.floor(intersect.index / this.nvertex);
    if ((indx < 0) || (indx >= this.index.length))
       return null;
@@ -171972,8 +171966,7 @@ class TGraph2DPainter extends ObjectPainter {
             linemesh.tip_color = (graph.fMarkerColor === 3) ? 0xFF0000 : 0x00FF00;
             linemesh.nvertex = 2;
             linemesh.check_next = true;
-
-            linemesh.tooltip = graph2DTooltip;
+            linemesh.tooltip = _graph2DTooltip;
          }
 
          if (err) {
@@ -171989,8 +171982,7 @@ class TGraph2DPainter extends ObjectPainter {
             errmesh.tip_name = this.getObjectHint();
             errmesh.tip_color = (graph.fMarkerColor === 3) ? 0xFF0000 : 0x00FF00;
             errmesh.nvertex = 6;
-
-            errmesh.tooltip = graph2DTooltip;
+            errmesh.tooltip = _graph2DTooltip;
          }
 
          if (pnts) {
@@ -172005,9 +171997,8 @@ class TGraph2DPainter extends ObjectPainter {
                mesh.tip_color = (graph.fMarkerColor === 3) ? 0xFF0000 : 0x00FF00;
                mesh.scale0 = 0.3 * scale;
                mesh.index = index;
-
                mesh.tip_name = this.getObjectHint();
-               mesh.tooltip = graph2DTooltip;
+               mesh.tooltip = _graph2DTooltip;
                fp.add3DMesh(mesh, this);
             });