Skip to content

Commit eb52c43

Browse files
committed
More palette improvements
1 parent 1386b61 commit eb52c43

File tree

2 files changed

+19
-7
lines changed

2 files changed

+19
-7
lines changed

src/engraving/rendering/single/singledraw.cpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ void SingleDraw::drawItem(const EngravingItem* item, Painter* painter, const Pai
161161
break;
162162
case ElementType::ARPEGGIO: draw(item_cast<const Arpeggio*>(item), painter, opt);
163163
break;
164-
case ElementType::CHORD_BRACKET: draw(static_cast<const Arpeggio*>(item), painter, opt);
164+
case ElementType::CHORD_BRACKET: draw(item_cast<const ChordBracket*>(item), painter, opt);
165165
break;
166166
case ElementType::ARTICULATION: draw(item_cast<const Articulation*>(item), painter, opt);
167167
break;
@@ -470,8 +470,12 @@ void SingleDraw::draw(const ChordBracket* item, muse::draw::Painter* painter, co
470470
const double y2 = ldata->bbox().bottom() - halfLineWidth;
471471

472472
double w = item->hookLength().toMM(item->spatium());
473-
painter->drawLine(LineF(0.0, y1, w, y1));
474-
painter->drawLine(LineF(0.0, y2, w, y2));
473+
if (item->hookPos() != DirectionV::DOWN) {
474+
painter->drawLine(LineF(0.0, y1, w, y1));
475+
}
476+
if (item->hookPos() != DirectionV::UP) {
477+
painter->drawLine(LineF(0.0, y2, w, y2));
478+
}
475479

476480
const double x = halfLineWidth;
477481
painter->drawLine(LineF(x, y1, x, y2));

src/palette/internal/palettecreator.cpp

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1321,8 +1321,12 @@ PalettePtr PaletteCreator::newLinesPalette(bool defaultPalette)
13211321
auto pm = makeElement<PalmMute>(gpaletteScore);
13221322
sp->appendElement(pm, QT_TRANSLATE_NOOP("palette", "Palm mute"));
13231323

1324-
auto c = Factory::makeChordBracket(gpaletteScore->dummy()->chord());
1325-
sp->appendElement(c, QT_TRANSLATE_NOOP("palette", "Chord bracket"));
1324+
for (int i = 0; i < 3; ++i) {
1325+
DirectionV hookPos = DirectionV(i);
1326+
auto c = Factory::makeChordBracket(gpaletteScore->dummy()->chord());
1327+
c->setProperty(Pid::BRACKET_HOOK_POS, hookPos);
1328+
sp->appendElement(c, QT_TRANSLATE_NOOP("palette", "Chord bracket"));
1329+
}
13261330

13271331
return sp;
13281332
}
@@ -1897,8 +1901,12 @@ PalettePtr PaletteCreator::newKeyboardPalette()
18971901
pedal->setEndText(pedal->propertyDefault(Pid::END_TEXT).value<String>());
18981902
sp->appendElement(pedal, QT_TRANSLATE_NOOP("palette", "Pedal (angled start hook)"));
18991903

1900-
auto c = Factory::makeChordBracket(gpaletteScore->dummy()->chord());
1901-
sp->appendElement(c, QT_TRANSLATE_NOOP("palette", "Chord bracket"));
1904+
for (int i = 0; i < 3; ++i) {
1905+
DirectionV hookPos = DirectionV(i);
1906+
auto c = Factory::makeChordBracket(gpaletteScore->dummy()->chord());
1907+
c->setProperty(Pid::BRACKET_HOOK_POS, hookPos);
1908+
sp->appendElement(c, QT_TRANSLATE_NOOP("palette", "Chord bracket"));
1909+
}
19021910

19031911
return sp;
19041912
}

0 commit comments

Comments
 (0)