Fix musescore#20146 - issues with home key on slurs/ties

wizofaus · Jun 5, 2024 · 8b148cd · 8b148cd
1 parent 8173087
commit 8b148cd
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 44 deletions.
diff --git a/src/engraving/dom/slur.cpp b/src/engraving/dom/slur.cpp
@@ -83,7 +83,7 @@ static ChordRest* searchCR(Segment* segment, track_idx_t startTrack, track_idx_t
 
 bool SlurSegment::isEditAllowed(EditData& ed) const
 {
- if (ed.key == Key_Home && !ed.modifiers) {
+ if (SlurTieSegment::isEditAllowed(ed)) {
  return true;
  }
 
@@ -116,17 +116,12 @@ bool SlurSegment::edit(EditData& ed)
  return false;
  }
 
- Slur* sl = slur();
-
- if (ed.key == Key_Home && !ed.modifiers) {
- if (ed.hasCurrentGrip()) {
- ups(ed.curGrip).off = PointF();
- renderer()->layoutItem(sl);
- triggerLayout();
- }
+ if (SlurTieSegment::edit(ed)) {
  return true;
  }
 
+ Slur* sl = slur();
+
  ChordRest* cr = 0;
  ChordRest* e;
  ChordRest* e1;

diff --git a/src/engraving/dom/slurtie.cpp b/src/engraving/dom/slurtie.cpp
@@ -57,6 +57,43 @@ SlurTieSegment::SlurTieSegment(const SlurTieSegment& b)
  mutldata()->path.set_value(b.ldata()->path());
 }
 
+bool SlurTieSegment::isEditAllowed(EditData& ed) const
+{
+ if (ed.key == Key_Home && !ed.modifiers && ed.hasCurrentGrip()) {
+ return true;
+ }
+
+ return false;
+}
+
+//---------------------------------------------------------
+// edit
+// return true if event is accepted
+//---------------------------------------------------------
+
+bool SlurTieSegment::edit(EditData& ed)
+{
+ if (!isEditAllowed(ed)) {
+ return false;
+ }
+
+ if (ed.key == Key_Home && !ed.modifiers) {
+ if (ed.hasCurrentGrip()) {
+ startEditDrag(ed);
+ if (ed.curGrip == Grip::SHOULDER) {
+ ups(Grip::BEZIER1).off = PointF();
+ ups(Grip::BEZIER2).off = PointF();
+ } else {
+ ups(ed.curGrip).off = PointF();
+ }
+ renderer()->layoutItem(spanner());
+ endEditDrag(ed);
+ }
+ return true;
+ }
+ return false;
+}
+
 //---------------------------------------------------------
 // gripAnchorLines
 //---------------------------------------------------------

diff --git a/src/engraving/dom/slurtie.h b/src/engraving/dom/slurtie.h
@@ -97,6 +97,9 @@ class SlurTieSegment : public SpannerSegment
  virtual void spatiumChanged(double, double) override;
  SlurTie* slurTie() const { return (SlurTie*)spanner(); }
 
+ bool isEditAllowed(EditData&) const override;
+ bool edit(EditData&) override;
+
  void startEditDrag(EditData& ed) override;
  void endEditDrag(EditData& ed) override;
 

diff --git a/src/engraving/dom/tie.cpp b/src/engraving/dom/tie.cpp
@@ -58,39 +58,6 @@ TieSegment::TieSegment(const TieSegment& s)
 {
 }
 
-bool TieSegment::isEditAllowed(EditData& ed) const
-{
- if (ed.key == Key_Home && !ed.modifiers) {
- return true;
- }
-
- return false;
-}
-
-//---------------------------------------------------------
-// edit
-// return true if event is accepted
-//---------------------------------------------------------
-
-bool TieSegment::edit(EditData& ed)
-{
- if (!isEditAllowed(ed)) {
- return false;
- }
-
- SlurTie* sl = tie();
-
- if (ed.key == Key_Home && !ed.modifiers) {
- if (ed.hasCurrentGrip()) {
- ups(ed.curGrip).off = PointF();
- renderer()->layoutItem(sl);
- triggerLayout();
- }
- return true;
- }
- return false;
-}
-
 //---------------------------------------------------------
 // changeAnchor
 //---------------------------------------------------------

diff --git a/src/engraving/dom/tie.h b/src/engraving/dom/tie.h
@@ -51,8 +51,6 @@ class TieSegment final : public SlurTieSegment
 
  bool isEdited() const;
  void editDrag(EditData&) override;
- bool isEditAllowed(EditData&) const override;
- bool edit(EditData&) override;
 
  Tie* tie() const { return (Tie*)spanner(); }