Skip to content

Allow framed text to not demand width greater than height #963

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: 3.x
Choose a base branch
from
Open

Allow framed text to not demand width greater than height #963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee989ae
Rename square to rectangle
Jojo-Schmitz Jun 18, 2025
4713a2f
Allow text borders to be higher than wide
Jojo-Schmitz Jun 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion importexport/guitarpro/importgtp-gp6.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2411,7 +2411,7 @@ void GuitarPro6::readMasterBars(GPPartInfo* partInfo)
Segment* s = measure->getSegment(SegmentType::ChordRest, measure->tick());
if (bars[measureCounter].section[0].length()) {
RehearsalMark* t = new RehearsalMark(score);
t->setFrameType(FrameType::SQUARE);
t->setFrameType(FrameType::RECTANGLE);
t->setPlainText(bars[measureCounter].section[0]);
t->setTrack(0);
s->add(t);
Expand Down
4 changes: 2 additions & 2 deletions importexport/guitarpro/importptb.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,7 +825,7 @@ void PowerTab::addToScore(ptSection& sec)
if (!sec.partName.empty() && lastPart != sec.partMarker) {
lastPart = sec.partMarker;
RehearsalMark* t = new RehearsalMark(score);
t->setFrameType(FrameType::SQUARE);
t->setFrameType(FrameType::RECTANGLE);
t->setPlainText(QString(sec.partMarker));
t->setTrack(0);
auto seg = measure->getSegment(SegmentType::ChordRest, measure->tick());
Expand Down Expand Up @@ -1265,7 +1265,7 @@ Score::FileError PowerTab::read()

// static const char* tune[] = { "C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B" };
int id = 0;
for (Part* part : score->parts()) {
for (Part*& part : score->parts()) {
QMultiMap<int, int> tracks;
Score* pscore = new Score(score);

Expand Down
2 changes: 1 addition & 1 deletion importexport/musicxml/exportxml.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,7 @@ static QString frame2xml(const TextBase* el)
switch (el->frameType()) {
case FrameType::CIRCLE:
return " enclosure=\"circle\"";
case FrameType::SQUARE:
case FrameType::RECTANGLE:
return " enclosure=\"rectangle\"";
default:
return QString();
Expand Down
4 changes: 2 additions & 2 deletions importexport/musicxml/importmxmlpass2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3481,7 +3481,7 @@ void MusicXMLParserDirection::direction(const QString& partId,
t->setFrameType(FrameType::NO_FRAME);
}
else if (_enclosure == "rectangle") {
t->setFrameType(FrameType::SQUARE);
t->setFrameType(FrameType::RECTANGLE);
t->setFrameRound(0);
}

Expand Down Expand Up @@ -3569,7 +3569,7 @@ void MusicXMLParserDirection::direction(const QString& partId,
else if (_enclosure == "none")
dynamic->setFrameType(FrameType::NO_FRAME);
else if (_enclosure == "rectangle") {
dynamic->setFrameType(FrameType::SQUARE);
dynamic->setFrameType(FrameType::RECTANGLE);
dynamic->setFrameRound(0);
}

Expand Down
6 changes: 3 additions & 3 deletions libmscore/read114.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ static bool readTextProperties(XmlReader& e, TextBase* t, Element*)
else if (tag == "foregroundColor") // same as "color" ?
e.skipCurrentElement();
else if (tag == "frame") {
t->setFrameType(e.readBool() ? FrameType::SQUARE : FrameType::NO_FRAME);
t->setFrameType(e.readBool() ? FrameType::RECTANGLE : FrameType::NO_FRAME);
t->setPropertyFlags(Pid::FRAME_TYPE, PropertyFlags::UNSTYLED);
}
else if (tag == "halign") {
Expand Down Expand Up @@ -583,7 +583,7 @@ static void readFingering114(XmlReader& e, Fingering* fing)
if (isStringNumber) //default value is circle for stringnumber, square is set in tag circle
fing->setFrameType(FrameType::CIRCLE);
else //default value is square for stringnumber, circle is set in tag circle
fing->setFrameType(FrameType::SQUARE);
fing->setFrameType(FrameType::RECTANGLE);
else
fing->setFrameType(FrameType::NO_FRAME);
}
Expand All @@ -592,7 +592,7 @@ static void readFingering114(XmlReader& e, Fingering* fing)
if (circle)
fing->setFrameType(FrameType::CIRCLE);
else
fing->setFrameType(FrameType::SQUARE);
fing->setFrameType(FrameType::RECTANGLE);
}
else {
e.skipCurrentElement();
Expand Down
10 changes: 5 additions & 5 deletions libmscore/read206.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,15 +252,15 @@ void readTextStyle206(MStyle* style, XmlReader& e, std::map<QString, std::map<Si
else if (tag == "sizeIsSpatiumDependent" || tag == "spatiumSizeDependent")
sizeIsSpatiumDependent = e.readInt();
else if (tag == "frameWidth") { // obsolete
frameType = FrameType::SQUARE;
frameType = FrameType::RECTANGLE;
/*frameWidthMM =*/ e.readDouble();
}
else if (tag == "frameWidthS") {
frameType = FrameType::SQUARE;
frameType = FrameType::RECTANGLE;
frameWidth = Spatium(e.readDouble());
}
else if (tag == "frame")
frameType = e.readInt() ? FrameType::SQUARE : FrameType::NO_FRAME;
frameType = e.readInt() ? FrameType::RECTANGLE : FrameType::NO_FRAME;
else if (tag == "paddingWidth") // obsolete
/*paddingWidthMM =*/ e.readDouble();
else if (tag == "paddingWidthS")
Expand Down Expand Up @@ -1321,7 +1321,7 @@ static bool readTextProperties206(XmlReader& e, TextBase* t)
else if (tag == "foregroundColor") // same as "color" ?
e.skipCurrentElement();
else if (tag == "frame") {
t->setFrameType(e.readBool() ? FrameType::SQUARE : FrameType::NO_FRAME);
t->setFrameType(e.readBool() ? FrameType::RECTANGLE : FrameType::NO_FRAME);
t->setPropertyFlags(Pid::FRAME_TYPE, PropertyFlags::UNSTYLED);
}
else if (tag == "frameRound")
Expand All @@ -1331,7 +1331,7 @@ static bool readTextProperties206(XmlReader& e, TextBase* t)
t->setFrameType(FrameType::CIRCLE);
else {
if (t->circle())
t->setFrameType(FrameType::SQUARE);
t->setFrameType(FrameType::RECTANGLE);
}
t->setPropertyFlags(Pid::FRAME_TYPE, PropertyFlags::UNSTYLED);
}
Expand Down
2 changes: 1 addition & 1 deletion libmscore/scorefile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ void Score::writeMovement(XmlWriter& xml, bool selectionOnly)
xml.setCurTrack(-1);
if (isMaster()) {
if (!selectionOnly) {
for (const Excerpt* excerpt : excerpts()) {
for (Excerpt*& excerpt : excerpts()) {
if (excerpt->partScore() != this)
excerpt->partScore()->write(xml, false); // recursion
}
Expand Down
2 changes: 1 addition & 1 deletion libmscore/style.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -994,7 +994,7 @@ static const StyleType styleTypes[] {
{ Sid::rehearsalMarkFontStyle, "rehearsalMarkFontStyle", int(FontStyle::Bold) },
{ Sid::rehearsalMarkColor, "rehearsalMarkColor", QColor(0, 0, 0, 255) },
{ Sid::rehearsalMarkAlign, "rehearsalMarkAlign", QVariant::fromValue(Align::HCENTER | Align::BASELINE) },
{ Sid::rehearsalMarkFrameType, "rehearsalMarkFrameType", int(FrameType::SQUARE) },
{ Sid::rehearsalMarkFrameType, "rehearsalMarkFrameType", int(FrameType::RECTANGLE) },
{ Sid::rehearsalMarkFramePadding, "rehearsalMarkFramePadding", 0.5 },
{ Sid::rehearsalMarkFrameWidth, "rehearsalMarkFrameWidth", 0.16 },
{ Sid::rehearsalMarkFrameRound, "rehearsalMarkFrameRound", 0 },
Expand Down
6 changes: 3 additions & 3 deletions libmscore/textbase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1896,7 +1896,7 @@ void TextBase::layoutFrame()
else
frame = bbox();

if (square()) {
if (rectangle()) {
#if 0
// "real" square
if (frame.width() > frame.height()) {
Expand All @@ -1908,8 +1908,8 @@ void TextBase::layoutFrame()
frame.adjust(-w * .5, 0.0, w * .5, 0.0);
}
#else
// make sure width >= height
if (frame.height() > frame.width()) {
// make sure width >= height and only a single line (so basically square for single characters)
if (frame.height() > frame.width() && rows() == 1) {
qreal w = frame.height() - frame.width();
frame.adjust(-w * .5, 0.0, w * .5, 0.0);
}
Expand Down
4 changes: 2 additions & 2 deletions libmscore/textbase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class ChangeText;
//---------------------------------------------------------

enum class FrameType : char {
NO_FRAME, SQUARE, CIRCLE
NO_FRAME, RECTANGLE, CIRCLE
};

//---------------------------------------------------------
Expand Down Expand Up @@ -389,7 +389,7 @@ class TextBase : public Element {
// helper functions
bool hasFrame() const { return _frameType != FrameType::NO_FRAME; }
bool circle() const { return _frameType == FrameType::CIRCLE; }
bool square() const { return _frameType == FrameType::SQUARE; }
bool rectangle() const { return _frameType == FrameType::RECTANGLE; }

Tid tid() const { return _tid; }
void setTid(Tid id) { _tid = id; }
Expand Down
2 changes: 1 addition & 1 deletion mscore/editstyle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@ EditStyle::EditStyle(Score* s, QWidget* parent)

textStyleFrameType->clear();
textStyleFrameType->addItem(tr("None", "no frame for text"), int(FrameType::NO_FRAME));
textStyleFrameType->addItem(tr("Rectangle"), int(FrameType::SQUARE));
textStyleFrameType->addItem(tr("Rectangle"), int(FrameType::RECTANGLE));
textStyleFrameType->addItem(tr("Circle"), int(FrameType::CIRCLE));

resetTextStyleName->setIcon(*icons[int(Icons::reset_ICON)]);
Expand Down
6 changes: 3 additions & 3 deletions mscore/file.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,7 +746,7 @@ MasterScore* MuseScore::getNewFile()
if (i == 0)
tick = Fraction(0,1);
QList<Rest*> puRests;
for (Score* _score : score->scoreList()) {
for (Score*& _score : score->scoreList()) {
Rest* rest = 0;
Measure* measure = new Measure(_score);
measure->setTimesig(timesig);
Expand Down Expand Up @@ -2412,7 +2412,7 @@ Score::FileError readScore(MasterScore* score, QString name, bool ignoreVersionE
}
score->rebuildMidiMapping();
score->setSoloMute();
for (Score* s : score->scoreList()) {
for (Score*& s : score->scoreList()) {
s->setPlaylistDirty();
s->addLayoutFlags(LayoutFlag::FIX_PITCH_VELO);
s->setLayoutAll();
Expand Down Expand Up @@ -3060,7 +3060,7 @@ bool MuseScore::saveSvg(Score* score, QIODevice* device, int pageNumber, bool dr

int lastNoteIndex = -1;
for (int i = 0; i < pageNumber; ++i) {
for (const Element* element : score->pages()[i]->elements()) {
for (Element*& element : score->pages()[i]->elements()) {
if (element->type() == ElementType::NOTE) {
lastNoteIndex++;
}
Expand Down
6 changes: 3 additions & 3 deletions mscore/inspector/inspectorTextBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@

#include "inspector.h"
#include "inspectorTextBase.h"
#include "libmscore/text.h"

#include "libmscore/score.h"
#include "icons.h"
#include "libmscore/textbase.h"

namespace Ms {

Expand Down Expand Up @@ -52,7 +52,7 @@ InspectorTextBase::InspectorTextBase(QWidget* parent)
QComboBox* b = t.frameType;
b->clear();
b->addItem(b->QObject::tr("None", "no frame for text"), int(FrameType::NO_FRAME));
b->addItem(b->QObject::tr("Rectangle"), int(FrameType::SQUARE));
b->addItem(b->QObject::tr("Rectangle"), int(FrameType::RECTANGLE));
b->addItem(b->QObject::tr("Circle"), int(FrameType::CIRCLE));

connect(t.resetToStyle, SIGNAL(clicked()), SLOT(resetToStyle()));
Expand Down