Build with better title position

root-project · Nov 15, 2024 · 9431256 · 9431256
1 parent a602b8a
commit 9431256
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/build/jsroot.js b/build/jsroot.js
@@ -73669,18 +73669,20 @@ class TPavePainter extends ObjectPainter {
             } else if ((opt === 'postitle') || painter.isDummyPos(pave)) {
                const st = gStyle, fp = painter.getFramePainter();
                if (st && fp) {
-                  const midx = st.fTitleX, y2 = st.fTitleY, fsz = st.fTitleFontSize;
-                  let w = st.fTitleW, h = st.fTitleH;
-
-                  if (!h) h = Math.max((y2 - fp.fY2NDC) * 0.7, (fsz < 1) ? 1.1 * fsz : 1.1 * fsz / fp.getFrameWidth());
-                  if (!w) w = fp.fX2NDC - fp.fX1NDC;
+                  const midx = st.fTitleX, y2 = st.fTitleY,
+                        valign = st.fTitleAlign % 10, halign = (st.fTitleAlign - valign) / 10,
+                        title = pave.fLines?.arr[0]?.fTitle;
+                  let w = st.fTitleW, h = st.fTitleH, fsz = st.fTitleFontSize;
+                  if (fsz > 1) fsz = fsz / fp.getFrameWidth();
+                  if (!h) h = Math.max((y2 - fp.fY2NDC) * 0.7, 1.1 * fsz);
+                  if (!w) w = (halign !== 2 && title) ? title.length * fsz * 0.2 : fp.fX2NDC - fp.fX1NDC;
                   if (!Number.isFinite(h) || (h <= 0)) h = 0.06;
                   if (!Number.isFinite(w) || (w <= 0)) w = 0.44;
 
-                  pave.fX1NDC = midx - w/2;
-                  pave.fY1NDC = y2 - h;
-                  pave.fX2NDC = midx + w/2;
-                  pave.fY2NDC = y2;
+                  pave.fX1NDC = halign < 2 ? midx : (halign > 2 ? midx - w : midx - w/2);
+                  pave.fY1NDC = valign === 3 ? y2 - h : (valign === 2 ? y2 - h / 2 : y2);
+                  pave.fX2NDC = pave.fX1NDC + w;
+                  pave.fY2NDC = pave.fY1NDC + h;
                   pave.fInit = 1;
                }
             }
@@ -151727,8 +151729,10 @@ class TGraph2DPainter extends ObjectPainter {
          return this.Markers || this.Error || this.Circles || this.Line || this.Triangles || res.Contour;
       };
 
-      if (res.isAny()) {
-         res.Axis = res.Contour ? 'axis' : 'lego2';
+      if (res.Contour)
+         res.Axis = '';
+      else if (res.isAny()) {
+         res.Axis = 'lego2';
          if (res.Zscale) res.Axis += 'z';
       } else
          res.Axis = opt;

diff --git a/changes.md b/changes.md
@@ -2,6 +2,7 @@
 
 ## Changes in dev
 1. Implement cont5 draw option for TGraph2D using Delaunay algorithm
+1. Fix - correctly position title according to gStyle->GetTitleAlign()
 
 
 ## Changes in 7.8.0

diff --git a/modules/hist/TPavePainter.mjs b/modules/hist/TPavePainter.mjs
@@ -1403,7 +1403,7 @@ class TPavePainter extends ObjectPainter {
                const st = gStyle, fp = painter.getFramePainter();
                if (st && fp) {
                   const midx = st.fTitleX, y2 = st.fTitleY,
-                        valign = st.fTitleAlign % 10, halign = (st.fTitleAlign  - valign) / 10,
+                        valign = st.fTitleAlign % 10, halign = (st.fTitleAlign - valign) / 10,
                         title = pave.fLines?.arr[0]?.fTitle;
                   let w = st.fTitleW, h = st.fTitleH, fsz = st.fTitleFontSize;
                   if (fsz > 1) fsz = fsz / fp.getFrameWidth();
@@ -1412,7 +1412,7 @@ class TPavePainter extends ObjectPainter {
                   if (!Number.isFinite(h) || (h <= 0)) h = 0.06;
                   if (!Number.isFinite(w) || (w <= 0)) w = 0.44;
 
-                  pave.fX1NDC = halign < 2 ? midx : (halign > 2 ? midx - w :  midx - w/2);
+                  pave.fX1NDC = halign < 2 ? midx : (halign > 2 ? midx - w : midx - w/2);
                   pave.fY1NDC = valign === 3 ? y2 - h : (valign === 2 ? y2 - h / 2 : y2);
                   pave.fX2NDC = pave.fX1NDC + w;
                   pave.fY2NDC = pave.fY1NDC + h;