fix #315363 : Workaround for bad on-screen rendering of emboldened fo…

…nt for harmony elements
musescore · Jan 11, 2021 · 27cc075 · 27cc075
1 parent c086567
commit 27cc075
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/libmscore/harmony.cpp b/libmscore/harmony.cpp
@@ -1501,8 +1501,12 @@ void Harmony::draw(QPainter* painter) const
       for (const TextSegment* ts : textList) {
             QFont 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
             }
       }
 

diff --git a/libmscore/textbase.cpp b/libmscore/textbase.cpp
@@ -751,6 +751,19 @@ void TextFragment::draw(QPainter* p, const TextBase* t) const
       QFont 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(QPainter* p, QFont& f, const QPointF pos, const QString text)
+      {
       qreal mm = p->worldTransform().m11();
       if (!(MScore::pdfPrinting) && (mm < 1.0) && f.bold() && !(f.underline())) {
             // workaround for https://musescore.org/en/node/284218
@@ -819,10 +832,6 @@ void TextFragment::draw(QPainter* p, const TextBase* t) const
             p->setFont(f);
             p->drawText(pos, text);
             }
-#else
-      p->setFont(f);
-      p->drawText(pos, text);
-#endif
       }
 
 //---------------------------------------------------------

diff --git a/libmscore/textbase.h b/libmscore/textbase.h
@@ -282,6 +282,7 @@ class TextBase : public Element {
 
       virtual void draw(QPainter*) const override;
       virtual void drawEditMode(QPainter* p, EditData& ed) override;
+      static void drawTextWorkaround(QPainter* p, QFont& f, const QPointF pos, const QString text);
 
       static QString plainToXmlText(const QString& s) { return s.toHtmlEscaped(); }
       void setPlainText(const QString& t) { setXmlText(plainToXmlText(t)); }