Fix #317319: Remove unneeded skyline extension for time- and key signatures

Backport of musescore#7498 resp. duplicate of musescore#7464, Expected vtest failures.

Author: Jojo-Schmitz

libmscore/keysig.cpp

@@ -280,26 +280,6 @@ void KeySig::layout()
             }
       }
 
-//---------------------------------------------------------
-//   shape
-//---------------------------------------------------------
-
-Shape KeySig::shape() const
-      {
-      QRectF box(bbox());
-      const Staff* st = staff();
-      if (st && addToSkyline()) {
-            // Extend key signature shape up and down to
-            // the first ledger line height to ensure that
-            // no notes will be too close to the keysig.
-            const qreal sp = spatium();
-            const qreal y = pos().y();
-            box.setTop(std::min(-sp - y, box.top()));
-            box.setBottom(std::max(st->height() - y + sp, box.bottom()));
-            }
-      return Shape(box);
-      }
-
 //---------------------------------------------------------
 //   set
 //---------------------------------------------------------

libmscore/keysig.h

@@ -44,7 +44,6 @@ class KeySig final : public Element {
       bool acceptDrop(EditData&) const override;
       Element* drop(EditData&) override;
       void layout() override;
-      Shape shape() const override;
       qreal mag() const override;
 
       //@ sets the key of the key signature

libmscore/timesig.cpp

@@ -378,26 +378,6 @@ void TimeSig::layout()
             }
       }
 
-//---------------------------------------------------------
-//   shape
-//---------------------------------------------------------
-
-Shape TimeSig::shape() const
-      {
-      QRectF box(bbox());
-      const Staff* st = staff();
-      if (st && addToSkyline()) {
-            // Extend time signature shape up and down to
-            // the first ledger line height to ensure that
-            // no notes will be too close to the timesig.
-            const qreal sp = spatium();
-            const qreal y = pos().y();
-            box.setTop(std::min(-sp - y, box.top()));
-            box.setBottom(std::max(st->height() - y + sp, box.bottom()));
-            }
-      return Shape(box);
-      }
-
 //---------------------------------------------------------
 //   draw
 //---------------------------------------------------------

libmscore/timesig.h

@@ -79,7 +79,6 @@ class TimeSig final : public Element {
       void write(XmlWriter& xml) const override;
       void read(XmlReader&) override;
       void layout() override;
-      Shape shape() const override;
 
       Fraction sig() const               { return _sig; }
       void setSig(const Fraction& f, TimeSigType st = TimeSigType::NORMAL);