LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #11465 from HemantAntony/11382-11383-palette_rearrangement

Browse source 
Fix #11382: Inconsistent text sizes
This commit is contained in:
RomanPudashkin 2022-05-02 12:10:34 +02:00 committed by GitHub
commit 5cc7617665
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/engraving/libmscore/textbase.cpp
View file

@ -787,11 +787,11 @@ mu::draw::Font TextFragment::font(const TextBase* t) const
QString family;
if (format.fontFamily() == "ScoreText") {
if (t->explicitParent() && t->isDynamic()) {
if (t->isDynamic()) {
family = t->score()->scoreFont()->fontByName(t->score()->styleSt(Sid::MusicalSymbolFont))->family();
// to keep desired size ratio (based on 20pt symbol size to 10pt text size)
m *= 2;
} else if (t->explicitParent() && t->isTempoText()) {
} else if (t->isTempoText()) {
family = t->score()->styleSt(Sid::MusicalTextFont);
// to keep desired size ratio (based on 20pt symbol size to 12pt text size)
m *= 5.0 / 3.0;

10
src/palette/internal/palettecreator.cpp
View file

@ -1345,14 +1345,16 @@ PalettePtr PaletteCreator::newTempoPalette(bool defaultPalette)
auto item = makeElement<TempoChangeRanged>(gpaletteScore);
item->setTempoChangeType(pair.first);
item->setBeginText(pair.second);
sp->appendElement(item, pair.second);
sp->appendElement(item, pair.second, 1.3)->yoffset = 0.4;
}
auto stxt = makeElement<SystemText>(gpaletteScore);
stxt->setTextStyleType(TextStyleType::TEMPO);
stxt->setXmlText(QT_TRANSLATE_NOOP("palette", "Swing"));
stxt->setSwing(true);
sp->appendElement(stxt, QT_TRANSLATE_NOOP("palette", "Swing"))->setElementTranslated(true);
PaletteCellPtr cell = sp->appendElement(stxt, QT_TRANSLATE_NOOP("palette", "Swing"), 1.3);
cell->yoffset = 0.4;
cell->setElementTranslated(true);
stxt = makeElement<SystemText>(gpaletteScore);
stxt->setTextStyleType(TextStyleType::TEMPO);
@ -1363,7 +1365,9 @@ PalettePtr PaletteCreator::newTempoPalette(bool defaultPalette)
// 0 (swingUnit) turns of swing; swingRatio is set to default
stxt->setSwingParameters(0, stxt->score()->styleI(Sid::swingRatio));
/*: System text to switch from swing rhythm back to straight rhythm */
sp->appendElement(stxt, QT_TRANSLATE_NOOP("palette", "Straight"))->setElementTranslated(true);
cell = sp->appendElement(stxt, QT_TRANSLATE_NOOP("palette", "Straight"), 1.3);
cell->yoffset = 0.4;
cell->setElementTranslated(true);
return sp;
}