Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 src/engraving/dom/accidental.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ SymId Accidental::symId() const

bool Accidental::parentNoteHasParentheses() const
{
return explicitParent() && parentItem()->isNote() ? toNote(parentItem())->bothParentheses() : false;
return explicitParent() && parentItem()->isNote() && toNote(parentItem())->parenthesisInfo();
}

//---------------------------------------------------------
Expand Down
1 change: 0 additions & 1 deletion src/engraving/dom/engravingitem.h
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,6 @@ class EngravingItem : public EngravingObject

virtual void setParenthesesMode(const ParenthesesMode& v, bool addToLinked = true, bool generated = false);
ParenthesesMode parenthesesMode() const;
inline bool bothParentheses() const { return m_leftParenthesis && m_rightParenthesis; }
inline Parenthesis* paren(const DirectionH& dir) const { return dir == DirectionH::LEFT ? m_leftParenthesis : m_rightParenthesis; }
Parenthesis* leftParen() const { return m_leftParenthesis; }
Parenthesis* rightParen() const { return m_rightParenthesis; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ void NoteArticulationsParser::parsePlayingTechnique(const RenderingContext& ctx,

void NoteArticulationsParser::parseGhostNote(const Note* note, const RenderingContext& ctx, mpe::ArticulationMap& result)
{
if (!note->ghost() && !note->bothParentheses()) {
if (!note->ghost() && !note->parenthesisInfo()) {
return;
}

Expand Down
2 changes: 1 addition & 1 deletion src/engraving/rendering/score/guitarbendlayout.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ void GuitarBendLayout::layoutAngularBend(GuitarBendSegment* item, LayoutContext&
}

if ((bend->bendType() == GuitarBendType::PRE_BEND || bend->bendType() == GuitarBendType::PRE_DIVE)
&& !startNote->bothParentheses()) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we remove bothParentheses() now?

&& !startNote->parenthesisInfo()) {
startNote->setGhost(true);
startNote->mutldata()->reset();
TLayout::layoutChord(startNote->chord(), ctx);
Expand Down
Loading