backport another post-release bugfix
authormirabilos <tg@debian.org>
Wed, 10 Jul 2019 16:58:39 +0000 (18:58 +0200)
committermirabilos <mirabilos@evolvis.org>
Sun, 29 Sep 2019 17:06:24 +0000 (19:06 +0200)
(cherry picked from commit 032801e0757b82cc78cc5835df390796bd7a9a43)

debian/patches/series
debian/patches/upstream/undoable-spacer-drag-length.diff [new file with mode: 0644]

index a601f1e..4efa08d 100644 (file)
@@ -7,6 +7,7 @@ debian-specific/fixup-AppData.diff
 upstream/untranslatable-error-msg.diff
 upstream/fix-cli-audio.diff
 upstream/fix-pluginless-build.diff
+upstream/undoable-spacer-drag-length.diff
 experiments/statusline-concert-transposing-pitch.diff
 experiments/element-barbeat.diff
 #experiments/revert-restriking-patch.diff
diff --git a/debian/patches/upstream/undoable-spacer-drag-length.diff b/debian/patches/upstream/undoable-spacer-drag-length.diff
new file mode 100644 (file)
index 0000000..6b8fcf3
--- /dev/null
@@ -0,0 +1,34 @@
+Description: fix #291941: Changing spacer length with a mouse is not undoable
+Author: Matt McClinch <mattmcclinch@gmail.com>
+Origin: vendor, commit:1ba9e83aa1959e8aa8e895bec616174b8615a832
+Applied-Upstream: master, commit:822c7e6be
+
+--- a/libmscore/spacer.cpp
++++ b/libmscore/spacer.cpp
+@@ -128,6 +128,16 @@ void Spacer::startEdit(EditData& ed)
+       }
+ //---------------------------------------------------------
++//   startEditDrag
++//---------------------------------------------------------
++
++void Spacer::startEditDrag(EditData& ed)
++      {
++      ElementEditData* eed = ed.getData(this);
++      eed->pushProperty(Pid::SPACE);
++      }
++
++//---------------------------------------------------------
+ //   editDrag
+ //---------------------------------------------------------
+--- a/libmscore/spacer.h
++++ b/libmscore/spacer.h
+@@ -51,6 +51,7 @@ class Spacer final : public Element {
+       virtual void draw(QPainter*) const;
+       virtual bool isEditable() const { return true; }
+       virtual void startEdit(EditData&) override;
++      virtual void startEditDrag(EditData&) override;
+       virtual void editDrag(EditData&) override;
+       virtual void updateGrips(EditData&) const override;
+       virtual void spatiumChanged(qreal, qreal);