Adjust single drawObjectTitle function

Author: linev

modules/draw/TGraphPolarPainter.mjs

@@ -496,12 +496,13 @@ class TGraphPolarPainter extends ObjectPainter {
       return true;
    }
 
+   /** @summary Draw TGraphPolar title */
    async drawTitle(first_time) {
       return drawObjectTitle(this, first_time, this._draw_axis, !this.getObject()?.TestBit(kNoTitle));
    }
 
    /** @summary Redraw TGraphPolar */
-   redraw() {
+   async redraw() {
       return this.drawGraphPolar()
                   .then(() => this.drawTitle());
    }

modules/draw/TPiePainter.mjs

@@ -360,6 +360,7 @@ class TPiePainter extends ObjectPainter {
       });
    }
 
+   /** @summary Draw TPie title */
    async drawTitle(first_time) {
       return drawObjectTitle(this, first_time, !this.options.same, true);
    }

modules/hist/TPavePainter.mjs

@@ -1821,62 +1821,52 @@ class TPavePainter extends ObjectPainter {
 } // class TPavePainter
 
 
-/** @summary Only redraw object title
-  * @return {Promise} with painter */
-async function updateObjectTitle(painter, is_enabled, is_draw) {
-   // case when histogram drawn over other histogram (same option)
-   if (!is_enabled)
-      return painter;
-
-   const tpainter = painter.getPadPainter()?.findPainterFor(null, kTitle, clTPaveText),
-         pt = tpainter?.getObject();
-
-   if (!tpainter || !pt)
-      return painter;
-
-   const obj = painter.getObject(),
-         draw_title = is_draw && (gStyle.fOptTitle > 0);
-
-   pt.Clear();
-   if (draw_title)
-      pt.AddText(obj.fTitle);
-   return tpainter.redraw().then(() => painter);
-}
-
 /** @summary Draw object title
     * @return {Promise} with painter */
 async function drawObjectTitle(painter, first_time, is_enabled, is_draw) {
    if (!is_enabled)
       return painter;
 
-   if (!first_time)
-      return updateObjectTitle(painter, is_enabled, is_draw);
+   const st = gStyle,
+         obj = painter.getObject(),
+         pp = painter.getPadPainter(),
+         draw_title = is_draw && (st.fOptTitle > 0);
+
+   if (first_time) {
+      let pt = pp.findInPrimitives(kTitle, clTPaveText);
+      if (pt) {
+         pt.Clear();
+         if (draw_title)
+            pt.AddText(obj.fTitle);
+         return painter;
+      }
 
-   const obj = painter.getObject(), st = gStyle,
-         draw_title = is_draw && (st.fOptTitle > 0),
-         pp = painter.getPadPainter();
+      pt = create(clTPaveText);
+      Object.assign(pt, {
+         fName: kTitle, fOption: 'blNDC', fFillColor: st.fTitleColor, fFillStyle: st.fTitleStyle, fBorderSize: st.fTitleBorderSize,
+         fTextFont: st.fTitleFont, fTextSize: st.fTitleFontSize, fTextColor: st.fTitleTextColor, fTextAlign: 22
+      });
 
-   let pt = pp.findInPrimitives(kTitle, clTPaveText);
-   if (pt) {
-      pt.Clear();
       if (draw_title)
          pt.AddText(obj.fTitle);
-      return painter;
+
+      return TPavePainter.draw(pp, pt, kPosTitle).then(p => {
+         p?.setSecondaryId(painter, kTitle);
+         return painter;
+      });
    }
 
-   pt = create(clTPaveText);
-   Object.assign(pt, {
-      fName: kTitle, fOption: 'blNDC', fFillColor: st.fTitleColor, fFillStyle: st.fTitleStyle, fBorderSize: st.fTitleBorderSize,
-      fTextFont: st.fTitleFont, fTextSize: st.fTitleFontSize, fTextColor: st.fTitleTextColor, fTextAlign: 22
-   });
+   const tpainter = pp?.findPainterFor(null, kTitle, clTPaveText),
+         pt = tpainter?.getObject();
+
+   if (!tpainter || !pt)
+      return painter;
 
+   pt.Clear();
    if (draw_title)
       pt.AddText(obj.fTitle);
-
-   return TPavePainter.draw(pp, pt, kPosTitle).then(p => {
-      p?.setSecondaryId(painter, kTitle);
-      return painter;
-   });
+   return tpainter.redraw().then(() => painter);
 }
 
+
 export { TPavePainter, kPosTitle, drawObjectTitle };

modules/hist2d/THistPainter.mjs

@@ -1671,7 +1671,7 @@ class THistPainter extends ObjectPainter {
 
    /** @summary Only redraw histogram title
      * @return {Promise} with painter */
-   async updateHistTitle(first_time = false) {
+   async updateHistTitle(first_time) {
       const o = this.getOptions(),
             histo = this.getHisto();
       return drawObjectTitle(this, first_time, this.isMainPainter() && !o.Same && (o.Axis <= 0), !histo.TestBit(kNoTitle));