Remove drawTextWorkaround

No idea about the exact history of this. It seems to have been introduced as a Mac-specific hack ages ago to solve some Qt-related problem. Pretty sure it's not necessary anymore (also produces no difference in vtests).

Author: mike-spa

src/engraving/dom/textbase.cpp

@@ -863,27 +863,8 @@ void TextFragment::draw(Painter* p, const TextBase* t) const
 {
     Font f(font(t));
     f.setPointSizeF(f.pointSizeF() * MScore::pixelRatio);
-#ifndef Q_OS_MACOS
-    TextBase::drawTextWorkaround(p, f, pos, text);
-#else
     p->setFont(f);
     p->drawText(pos, text);
-#endif
-}
-
-//---------------------------------------------------------
-//   drawTextWorkaround
-//---------------------------------------------------------
-
-void TextBase::drawTextWorkaround(Painter* p, Font& f, const PointF& pos, const String& text)
-{
-    double mm = p->worldTransform().m11();
-    if (!(MScore::pdfPrinting) && (mm < 1.0) && f.bold() && !(f.underline() || f.strike())) {
-        p->drawTextWorkaround(f, pos, text);
-    } else {
-        p->setFont(f);
-        p->drawText(pos, text);
-    }
 }
 
 //---------------------------------------------------------

src/engraving/dom/textbase.h

@@ -310,8 +310,6 @@ class TextBase : public EngravingItem
     AlignH position() const { return m_position; }
     void setPosition(AlignH val) { m_position = val; }
 
-    static void drawTextWorkaround(muse::draw::Painter* p, muse::draw::Font& f, const PointF& pos, const String& text);
-
     static String plainToXmlText(const String& s) { return s.toXmlEscaped(); }
     void setPlainText(const String& t) { setXmlText(plainToXmlText(t)); }
     virtual void setXmlText(const String&);

src/engraving/rendering/score/paintdebugger.cpp

@@ -186,11 +186,6 @@ void PaintDebugger::drawText(const RectF& rect, int flags, const String& text)
     m_real->drawText(rect, flags, text);
 }
 
-void PaintDebugger::drawTextWorkaround(const Font& f, const PointF& pos, const String& text)
-{
-    m_real->drawTextWorkaround(f, pos, text);
-}
-
 void PaintDebugger::drawSymbol(const PointF& point, char32_t ucs4Code)
 {
     m_real->drawSymbol(point, ucs4Code);

src/engraving/rendering/score/paintdebugger.h

@@ -68,7 +68,6 @@ class PaintDebugger : public muse::draw::IPaintProvider
 
     void drawText(const muse::PointF& point, const muse::String& text) override;
     void drawText(const muse::RectF& rect, int flags, const muse::String& text) override;
-    void drawTextWorkaround(const muse::draw::Font& f, const muse::PointF& pos, const muse::String& text) override;
 
     void drawSymbol(const muse::PointF& point, char32_t ucs4Code) override;
 

src/engraving/rendering/score/tdraw.cpp

@@ -1844,12 +1844,8 @@ void TDraw::draw(const Harmony* item, Painter* painter, const PaintOptions& opt)
         if (const TextSegment* ts = dynamic_cast<const TextSegment*>(renderItem)) {
             Font f(ts->font());
             f.setPointSizeF(f.pointSizeF() * MScore::pixelRatio);
-#ifndef Q_OS_MACOS
-            TextBase::drawTextWorkaround(painter, f, ts->pos(), ts->text());
-#else
             painter->setFont(f);
             painter->drawText(ts->pos(), ts->text());
-#endif
         } else if (const ChordSymbolParen* parenItem = dynamic_cast<const ChordSymbolParen*>(renderItem)) {
             Parenthesis* p = parenItem->parenItem;
             painter->translate(parenItem->pos());

src/engraving/rendering/single/singledraw.cpp

@@ -1753,12 +1753,8 @@ void SingleDraw::draw(const Harmony* item, Painter* painter, const PaintOptions&
         if (const TextSegment* ts = dynamic_cast<const TextSegment*>(renderItem)) {
             Font f(ts->font());
             f.setPointSizeF(f.pointSizeF() * MScore::pixelRatio);
-#ifndef Q_OS_MACOS
-            TextBase::drawTextWorkaround(painter, f, ts->pos(), ts->text());
-#else
             painter->setFont(f);
             painter->drawText(ts->pos(), ts->text());
-#endif
         }
     }
 }

src/framework/draw/bufferedpaintprovider.cpp

@@ -300,12 +300,6 @@ void BufferedPaintProvider::drawText(const RectF& rect, int flags, const String&
     editableData().texts.push_back(DrawText { DrawText::Rect, rect, flags, text });
 }
 
-void BufferedPaintProvider::drawTextWorkaround(const Font& f, const PointF& pos, const String& text)
-{
-    setFont(f);
-    drawText(pos, text);
-}
-
 void BufferedPaintProvider::drawSymbol(const PointF& point, char32_t ucs4Code)
 {
     drawText(point, String::fromUcs4(&ucs4Code, 1));

src/framework/draw/bufferedpaintprovider.h

@@ -70,7 +70,6 @@ class BufferedPaintProvider : public IPaintProvider
 
     void drawText(const PointF& point, const String& text) override;
     void drawText(const RectF& rect, int flags, const String& text) override;
-    void drawTextWorkaround(const Font& f, const PointF& pos, const String& text) override;
 
     void drawSymbol(const PointF& point, char32_t ucs4Code) override;
 

src/framework/draw/internal/qpainterprovider.cpp

@@ -242,67 +242,6 @@ void QPainterProvider::drawText(const RectF& rect, int flags, const String& text
     m_painter->drawText(rect.toQRectF(), flags, text);
 }
 
-void QPainterProvider::drawTextWorkaround(const Font& f, const PointF& pos, const String& text)
-{
-    m_painter->save();
-    double mm = m_painter->worldTransform().m11();
-    double dx = m_painter->worldTransform().dx();
-    double dy = m_painter->worldTransform().dy();
-    // diagonal elements will now be changed to 1.0
-    m_painter->setWorldTransform(QTransform(1.0, 0.0, 0.0, 1.0, dx, dy));
-
-    // correction factor for bold text drawing, due to the change of the diagonal elements
-    double factor = 1.0 / mm;
-    QFont fnew(f.toQFont(), m_painter->device());
-    fnew.setPointSizeF(f.pointSizeF() / factor);
-    QRawFont fRaw = QRawFont::fromFont(fnew);
-    QTextLayout textLayout(text, f.toQFont(), m_painter->device());
-    textLayout.beginLayout();
-    while (true) {
-        QTextLine line = textLayout.createLine();
-        if (!line.isValid()) {
-            break;
-        }
-    }
-    textLayout.endLayout();
-    // glyphruns with correct positions, but potentially wrong glyphs
-    // (see bug https://musescore.org/en/node/117191 regarding positions and DPI)
-    QList<QGlyphRun> glyphruns = textLayout.glyphRuns();
-    double offset = 0;
-    // glyphrun drawing has an offset equal to the max ascent of the text fragment
-    for (int i = 0; i < glyphruns.length(); i++) {
-        double value = glyphruns.at(i).rawFont().ascent() / factor;
-        if (value > offset) {
-            offset = value;
-        }
-    }
-    for (int i = 0; i < glyphruns.length(); i++) {
-        QVector<QPointF> positions1 = glyphruns.at(i).positions();
-        QVector<QPointF> positions2;
-        // calculate the new positions for the scaled geometry
-        for (int j = 0; j < positions1.length(); j++) {
-            QPointF newPoint = positions1.at(j) / factor;
-            positions2.append(newPoint);
-        }
-        QGlyphRun glyphrun2 = glyphruns.at(i);
-        glyphrun2.setPositions(positions2);
-        // change the glyphs with the correct glyphs
-        // and account for glyph substitution
-        if (glyphrun2.rawFont().familyName() != fnew.family()) {
-            QFont f2(fnew);
-            f2.setFamily(glyphrun2.rawFont().familyName());
-            glyphrun2.setRawFont(QRawFont::fromFont(f2));
-        } else {
-            glyphrun2.setRawFont(fRaw);
-        }
-        m_painter->drawGlyphRun(QPointF(pos.x() / factor, pos.y() / factor - offset), glyphrun2);
-        positions2.clear();
-    }
-    // Restore the QPainter to its former state
-    m_painter->setWorldTransform(QTransform(mm, 0.0, 0.0, mm, dx, dy));
-    m_painter->restore();
-}
-
 void QPainterProvider::drawSymbol(const PointF& point, char32_t ucs4Code)
 {
     static QHash<char32_t, QString> cache;

src/framework/draw/internal/qpainterprovider.h

@@ -74,7 +74,6 @@ class QPainterProvider : public IPaintProvider
 
     void drawText(const PointF& point, const String& text) override;
     void drawText(const RectF& rect, int flags, const String& text) override;
-    void drawTextWorkaround(const Font& f, const PointF& pos, const String& text) override;
 
     void drawSymbol(const PointF& point, char32_t ucs4Code) override;