one more… still more needed…
authormirabilos <tg@debian.org>
Sun, 19 Jul 2020 21:08:28 +0000 (23:08 +0200)
committermirabilos <mirabilos@evolvis.org>
Sun, 19 Jul 2020 21:08:28 +0000 (23:08 +0200)
debian/patches/series
debian/patches/upstream/boldfonts-3.diff [new file with mode: 0644]

index be94001..59ccfe1 100644 (file)
@@ -16,6 +16,7 @@ upstream/workspace-warning.diff
 upstream/qt514-1.diff
 upstream/boldfonts-1.diff
 upstream/boldfonts-2.diff
+upstream/boldfonts-3.diff
 experiments/statusline-concert-transposing-pitch.diff
 experiments/element-barbeat.diff
 #experiments/revert-restriking-patch.diff
diff --git a/debian/patches/upstream/boldfonts-3.diff b/debian/patches/upstream/boldfonts-3.diff
new file mode 100644 (file)
index 0000000..0699821
--- /dev/null
@@ -0,0 +1,24 @@
+Origin: vendor, commit:4276fb5a1d0a9f0b5f85149ca03441922b6cc00e
+Author: AntonioBL <antonio.lotti@alice.it>
+Description: fix #307075 : Bold and underlined text is not displayed properly
+
+--- a/libmscore/textbase.cpp
++++ b/libmscore/textbase.cpp
+@@ -752,13 +752,15 @@ void TextFragment::draw(QPainter* p, const TextBase* t) const
+       f.setPointSizeF(f.pointSizeF() * MScore::pixelRatio);
+ #ifndef Q_OS_MACOS
+       qreal mm = p->worldTransform().m11();
+-      if (!(MScore::pdfPrinting) && (mm < 1.0) && f.bold()) {
++      if (!(MScore::pdfPrinting) && (mm < 1.0) && f.bold() && !(f.underline())) {
+             // workaround for https://musescore.org/en/node/284218
+             // and https://musescore.org/en/node/281601
+             // only needed for certain artificially emboldened fonts
+             // see https://musescore.org/en/node/281601#comment-900261
+             // in Qt 5.12.x this workaround should be no more necessary if
+-            // env variable QT_MAX_CACHED_GLYPH_SIZE is set to 1
++            // env variable QT_MAX_CACHED_GLYPH_SIZE is set to 1.
++            // The workaround works badly if the text is at the same time
++            // bold and underlined.
+             p->save();
+             qreal dx = p->worldTransform().dx();
+             qreal dy = p->worldTransform().dy();