Skip to content

Commit 8378f2a

Browse files
committed
Updates
1 parent 0e3bf5b commit 8378f2a

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

src/engraving/dom/guitarbend.cpp

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -408,12 +408,17 @@ PropertyValue GuitarBend::propertyDefault(Pid id) const
408408
case Pid::BEND_SHOW_HOLD_LINE:
409409
return static_cast<int>(GuitarBendShowHoldLine::AUTO);
410410
case Pid::BEND_START_TIME_FACTOR:
411+
if (m_bendType == GuitarBendType::DIP) {
412+
return DIP_DEFAULT_START_TIME_FACTOR;
413+
}
411414
return 0.f;
412415
case Pid::BEND_END_TIME_FACTOR:
413416
if (m_bendType == GuitarBendType::GRACE_NOTE_BEND) {
414417
return GRACE_NOTE_BEND_DEFAULT_END_TIME_FACTOR;
415418
}
416-
419+
if (m_bendType == GuitarBendType::DIP) {
420+
return DIP_DEFAULT_END_TIME_FACTOR;
421+
}
417422
return 1.f;
418423
case Pid::GUITAR_DIVE_TAB_POS:
419424
return DirectionV::AUTO;
@@ -960,9 +965,10 @@ GuitarBendType GuitarBend::bendTypeFromActionIcon(ActionIconType actionIconType)
960965
void GuitarBend::setBendType(GuitarBendType t)
961966
{
962967
m_bendType = t;
963-
if (m_bendType == GuitarBendType::DIP) {
964-
resetProperty(Pid::GUITAR_BEND_AMOUNT);
965-
}
968+
969+
resetProperty(Pid::GUITAR_BEND_AMOUNT);
970+
resetProperty(Pid::BEND_START_TIME_FACTOR);
971+
resetProperty(Pid::BEND_END_TIME_FACTOR);
966972
}
967973

968974
/****************************************

src/engraving/dom/guitarbend.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ class GuitarBend final : public SLine
6666

6767
public:
6868
static constexpr float GRACE_NOTE_BEND_DEFAULT_END_TIME_FACTOR = 0.25f;
69+
static constexpr float DIP_DEFAULT_START_TIME_FACTOR = 0.25;
70+
static constexpr float DIP_DEFAULT_END_TIME_FACTOR = 0.5;
6971

7072
GuitarBend(EngravingItem* parent);
7173
GuitarBend(const GuitarBend&);

src/engraving/editing/cmd.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,14 +1006,6 @@ GuitarBend* Score::addGuitarBend(GuitarBendType type, Note* note, Note* endNote)
10061006
}
10071007
}
10081008

1009-
if (bend->bendType() == GuitarBendType::GRACE_NOTE_BEND) {
1010-
bend->setEndTimeFactor(GuitarBend::GRACE_NOTE_BEND_DEFAULT_END_TIME_FACTOR);
1011-
}
1012-
1013-
if (bend->bendType() == GuitarBendType::DIP || bend->bendType() == GuitarBendType::SCOOP) {
1014-
bend->setBendAmountInQuarterTones(-2);
1015-
}
1016-
10171009
Chord* startChord = bend->startNote()->chord();
10181010
if (startChord->isGrace()) {
10191011
for (EngravingObject* item : startChord->linkList()) {

0 commit comments

Comments
 (0)