Skip to content

Introduce separate line width style for tab bends #20242

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

Merged
merged 1 commit into from
Dec 5, 2023
Merged

Introduce separate line width style for tab bends #20242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions src/engraving/dom/guitarbend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,9 @@ void GuitarBend::updateHoldLine()

double GuitarBend::lineWidth() const
{
return style().styleMM(Sid::guitarBendLineWidth);
return (staffType() && staffType()->isTabStaff())
? style().styleMM(Sid::guitarBendLineWidthTab)
: style().styleMM(Sid::guitarBendLineWidth);
}

/****************************************
Expand Down Expand Up @@ -670,7 +672,7 @@ Note* GuitarBendHold::endNote() const

double GuitarBendHold::lineWidth() const
{
return style().styleMM(Sid::guitarBendLineWidth);
return style().styleMM(Sid::guitarBendLineWidthTab);
}

/****************************************
Expand Down
3 changes: 2 additions & 1 deletion src/engraving/style/styledef.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1207,7 +1207,8 @@ const std::array<StyleDef::StyleValue, size_t(Sid::STYLES)> StyleDef::styleValue
{ Sid::bendLineWidth, "bendLineWidth", Spatium(0.15) },
{ Sid::bendArrowWidth, "bendArrowWidth", Spatium(.5) },

{ Sid::guitarBendLineWidth, "guitarBendLineWidth", Spatium(0.15) },
{ Sid::guitarBendLineWidth, "guitarBendLineWidth", Spatium(0.13) },
{ Sid::guitarBendLineWidthTab, "guitarBendLineWidthTab", Spatium(0.15) },
{ Sid::guitarBendHeightAboveTABStaff, "guitarBendHeightAboveTABStaff", 1.5 }, // in units of TAB lines dist
{ Sid::guitarBendPartialBendHeight, "guitarBendPartialBendHeight", Spatium(1.5) },
{ Sid::guitarBendUseFull, "guitarBendUseFull", false },
Expand Down
1 change: 1 addition & 0 deletions src/engraving/style/styledef.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1216,6 +1216,7 @@ enum class Sid {
bendArrowWidth,

guitarBendLineWidth,
guitarBendLineWidthTab,
guitarBendHeightAboveTABStaff,
guitarBendPartialBendHeight,
guitarBendUseFull,
Expand Down
1 change: 1 addition & 0 deletions src/notation/view/widgets/editstyle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,6 +590,7 @@ EditStyle::EditStyle(QWidget* parent)
{ StyleId::staffTextMinDistance, false, staffTextMinDistance, resetStaffTextMinDistance },

{ StyleId::guitarBendLineWidth, false, bendLineWidth, resetBendLineWidth },
{ StyleId::guitarBendLineWidthTab, false, bendLineWidthTab, resetBendLineWidthTab },
{ StyleId::guitarBendArrowWidth, false, bendArrowWidth, resetBendArrowWidth },
{ StyleId::guitarBendArrowHeight, false, bendArrowHeight, resetBendArrowHeight },
{ StyleId::useCueSizeFretForGraceBends, false, guitarBendCueSizedGraceFrets, 0 },
Expand Down
Loading