Remove draw method from TextBase class

I think this was the only DOM class that still had its own draw method. I have moved it to the respective draw module where it belongs.

Author: mike-spa

src/engraving/dom/textbase.cpp

@@ -24,7 +24,6 @@
 #include <stack>
 
 #include "draw/fontmetrics.h"
-#include "draw/painter.h"
 
 #include "iengravingfont.h"
 
@@ -855,18 +854,6 @@ bool TextFragment::operator ==(const TextFragment& f) const
     return format == f.format && text == f.text;
 }
 
-//---------------------------------------------------------
-//   draw
-//---------------------------------------------------------
-
-void TextFragment::draw(Painter* p, const TextBase* t) const
-{
-    Font f(font(t));
-    f.setPointSizeF(f.pointSizeF() * MScore::pixelRatio);
-    p->setFont(f);
-    p->drawText(pos, text);
-}
-
 //---------------------------------------------------------
 //   font
 //---------------------------------------------------------
@@ -988,19 +975,6 @@ Font TextFragment::font(const TextBase* t) const
     return font;
 }
 
-//---------------------------------------------------------
-//   draw
-//---------------------------------------------------------
-
-void TextBlock::draw(Painter* p, const TextBase* t) const
-{
-    p->translate(0.0, m_y);
-    for (const TextFragment& f : m_fragments) {
-        f.draw(p, t);
-    }
-    p->translate(0.0, -m_y);
-}
-
 //---------------------------------------------------------
 //   layout
 //---------------------------------------------------------

src/engraving/dom/textbase.h

@@ -231,7 +231,6 @@ class TextFragment
     bool operator ==(const TextFragment& f) const;
 
     TextFragment split(int column);
-    void draw(muse::draw::Painter*, const TextBase*) const;
     muse::draw::Font font(const TextBase*) const;
     int columns() const;
     void changeFormat(FormatId id, const FormatValue& data);
@@ -249,7 +248,7 @@ class TextBlock
 
     bool operator ==(const TextBlock& x) const { return m_fragments == x.m_fragments; }
     bool operator !=(const TextBlock& x) const { return m_fragments != x.m_fragments; }
-    void draw(muse::draw::Painter*, const TextBase*) const;
+
     void layout(const TextBase*);
     const std::list<TextFragment>& fragments() const { return m_fragments; }
     std::list<TextFragment>& fragments() { return m_fragments; }

src/engraving/rendering/editmode/editmoderenderer.cpp

@@ -240,7 +240,7 @@ void EditModeRenderer::drawTextBase(const TextBase* item, muse::draw::Painter* p
         TextBase::sort(r1, c1, r2, c2);
         size_t row = 0;
         for (const TextBlock& t : ldata->blocks) {
-            t.draw(painter, item);
+            draw(t, item, painter);
             if (row >= r1 && row <= r2) {
                 RectF br;
                 if (row == r1 && r1 == r2) {
@@ -278,3 +278,20 @@ void EditModeRenderer::drawTextBase(const TextBase* item, muse::draw::Painter* p
     painter->drawRect(r);
     pen = Pen(item->configuration()->defaultColor(), 0.0);
 }
+
+void EditModeRenderer::draw(const TextBlock& textBlock, const TextBase* item, muse::draw::Painter* painter)
+{
+    painter->translate(0.0, textBlock.y());
+    for (const TextFragment& f : textBlock.fragments()) {
+        draw(f, item, painter);
+    }
+    painter->translate(0.0, -textBlock.y());
+}
+
+void EditModeRenderer::draw(const TextFragment& textFragment, const TextBase* item, muse::draw::Painter* painter)
+{
+    Font f(textFragment.font(item));
+    f.setPointSizeF(f.pointSizeF() * MScore::pixelRatio);
+    painter->setFont(f);
+    painter->drawText(textFragment.pos, textFragment.text);
+}

src/engraving/rendering/editmode/editmoderenderer.h

@@ -38,6 +38,8 @@ class BarLine;
 class Dynamic;
 class SlurTieSegment;
 class TextBase;
+class TextBlock;
+class TextFragment;
 }
 
 namespace mu::engraving::rendering::editmode {
@@ -59,7 +61,10 @@ class EditModeRenderer : public IEditModeRenderer
                             const PaintOptions& opt);
     static void drawSlurTieSegment(const SlurTieSegment* item, muse::draw::Painter* painter, const EditData& ed, double currentViewScaling,
                                    const PaintOptions& opt);
+
     static void drawTextBase(const TextBase* item, muse::draw::Painter* painter, const EditData& ed, double currentViewScaling,
                              const PaintOptions& opt);
+    static void draw(const TextBlock& textBlock, const TextBase* item, muse::draw::Painter* painter);
+    static void draw(const TextFragment& textFragment, const TextBase* item, muse::draw::Painter* painter);
 };
 }

src/engraving/rendering/score/tdraw.cpp

@@ -1646,10 +1646,27 @@ void TDraw::drawTextBase(const TextBase* item, Painter* painter, const PaintOpti
     painter->setBrush(BrushStyle::NoBrush);
     painter->setPen(item->textColor(opt));
     for (const TextBlock& t : ldata->blocks) {
-        t.draw(painter, item);
+        draw(t, item, painter);
     }
 }
 
+void TDraw::draw(const TextBlock& textBlock, const TextBase* item, Painter* painter)
+{
+    painter->translate(0.0, textBlock.y());
+    for (const TextFragment& f : textBlock.fragments()) {
+        draw(f, item, painter);
+    }
+    painter->translate(0.0, -textBlock.y());
+}
+
+void TDraw::draw(const TextFragment& textFragment, const TextBase* item, muse::draw::Painter* painter)
+{
+    Font f(textFragment.font(item));
+    f.setPointSizeF(f.pointSizeF() * MScore::pixelRatio);
+    painter->setFont(f);
+    painter->drawText(textFragment.pos, textFragment.text);
+}
+
 void TDraw::drawTextLineBaseSegment(const TextLineBaseSegment* item, Painter* painter, const PaintOptions& opt)
 {
     const TextLineBase* tl = item->textLineBase();

src/engraving/rendering/score/tdraw.h

@@ -150,6 +150,8 @@ class TabDurationSymbol;
 class Tapping;
 class TempoText;
 class TextBase;
+class TextBlock;
+class TextFragment;
 class Text;
 class TextLine;
 class TextLineSegment;
@@ -316,6 +318,8 @@ class TDraw
     static void draw(const WhammyBarSegment* item, muse::draw::Painter* painter, const PaintOptions& opt);
 
     static void drawTextBase(const TextBase* item, muse::draw::Painter* painter, const PaintOptions& opt);
+    static void draw(const TextBlock& textBlock, const TextBase* item, muse::draw::Painter* painter);
+    static void draw(const TextFragment& textFragment, const TextBase* item, muse::draw::Painter* painter);
     static void drawTextLineBaseSegment(const TextLineBaseSegment* item, muse::draw::Painter* painter, const PaintOptions& opt);
 
     static void setMask(const EngravingItem* item, muse::draw::Painter* painter);

src/engraving/rendering/single/singledraw.cpp

@@ -1535,10 +1535,27 @@ void SingleDraw::drawTextBase(const TextBase* item, Painter* painter, const Pain
     painter->setBrush(BrushStyle::NoBrush);
     painter->setPen(item->textColor(opt));
     for (const TextBlock& t : ldata->blocks) {
-        t.draw(painter, item);
+        draw(t, item, painter);
     }
 }
 
+void SingleDraw::draw(const TextBlock& textBlock, const TextBase* item, muse::draw::Painter* painter)
+{
+    painter->translate(0.0, textBlock.y());
+    for (const TextFragment& f : textBlock.fragments()) {
+        draw(f, item, painter);
+    }
+    painter->translate(0.0, -textBlock.y());
+}
+
+void SingleDraw::draw(const TextFragment& textFragment, const TextBase* item, muse::draw::Painter* painter)
+{
+    Font f(textFragment.font(item));
+    f.setPointSizeF(f.pointSizeF() * MScore::pixelRatio);
+    painter->setFont(f);
+    painter->drawText(textFragment.pos, textFragment.text);
+}
+
 void SingleDraw::drawTextLineBaseSegment(const TextLineBaseSegment* item, Painter* painter, const PaintOptions& opt)
 {
     const TextLineBase* tl = item->textLineBase();

src/engraving/rendering/single/singledraw.h

@@ -142,6 +142,8 @@ class Tapping;
 class TempoText;
 class Text;
 class TextBase;
+class TextBlock;
+class TextFragment;
 class TextLine;
 class TextLineSegment;
 class TextLineBaseSegment;
@@ -281,6 +283,8 @@ class SingleDraw
     static void draw(const WhammyBarSegment* item, muse::draw::Painter* painter, const PaintOptions& opt);
 
     static void drawTextBase(const TextBase* item, muse::draw::Painter* painter, const PaintOptions& opt);
+    static void draw(const TextBlock& textBlock, const TextBase* item, muse::draw::Painter* painter);
+    static void draw(const TextFragment& textFragment, const TextBase* item, muse::draw::Painter* painter);
     static void drawTextLineBaseSegment(const TextLineBaseSegment* item, muse::draw::Painter* painter, const PaintOptions& opt);
 };
 }