Code review fixes - more corrections

musescore · Sep 25, 2023 · 15737ad · 15737ad
1 parent 8c12948
commit 15737ad
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 23 deletions.
diff --git a/src/engraving/dom/box.h b/src/engraving/dom/box.h
@@ -85,6 +85,7 @@ class Box : public MeasureBase
     Grip defaultGrip() const override { return Grip::START; }
     std::vector<mu::PointF> gripsPositions(const EditData&) const override { return { mu::PointF() }; }   // overridden in descendants
 
+    bool canBeExcludedFromOtherParts() const override { return true; }
     void manageExclusionFromParts(bool exclude) override;
 
 private:

diff --git a/src/engraving/dom/clef.h b/src/engraving/dom/clef.h
@@ -145,6 +145,7 @@ class Clef final : public EngravingItem
     bool isHeader() const { return m_isHeader; }
     void setIsHeader(bool val) { m_isHeader = val; }
 
+    bool canBeExcludedFromOtherParts() const override { return true; }
     void manageExclusionFromParts(bool exclude) override;
 
     struct LayoutData : public EngravingItem::LayoutData {

diff --git a/src/engraving/dom/edit.cpp b/src/engraving/dom/edit.cpp
@@ -4039,8 +4039,6 @@ MeasureBase* Score::insertMeasure(ElementType type, MeasureBase* beforeMeasure,
 
         if (score == this) {
             result = newMeasureBase;
-        } else if (!result && score == scores.back()) {
-            result = newMeasureBase;
         }
 
         if (actualBeforeMeasure) {

diff --git a/src/engraving/dom/engravingitem.cpp b/src/engraving/dom/engravingitem.cpp
@@ -1302,35 +1302,19 @@ PropertyPropagation EngravingItem::propertyPropagation(EngravingItem* destinatio
         return PropertyPropagation::PROPAGATE;
     }
 
-    if (sourceScore != destinationScore && !sourceScore->isMaster()) {
+    if (!sourceScore->isMaster()) {
         // Properties are only propagated when being edited from master. If this is being edited
         // from a part score, we mark it as unlinked so it becomes independent in the part.
         return PropertyPropagation::UNLINK;
     }
 
-    if (destinationItem->isPropertyLinkedToMaster(propertyId) || sourceScore == destinationScore) {
+    if (destinationItem->isPropertyLinkedToMaster(propertyId)) {
         return PropertyPropagation::PROPAGATE;
     }
 
     return PropertyPropagation::NONE;
 }
 
-bool EngravingItem::canBeExcludedFromOtherParts() const
-{
-    static const std::set<ElementType> TYPE_EXCLUDIBLE_FROM_PARTS {
-        ElementType::STAFF_TEXT,
-        ElementType::SYSTEM_TEXT,
-        ElementType::CLEF,
-        ElementType::OTTAVA_SEGMENT,
-        ElementType::HBOX,
-        ElementType::VBOX,
-        ElementType::TBOX,
-        ElementType::FBOX,
-    };
-
-    return mu::contains(TYPE_EXCLUDIBLE_FROM_PARTS, type());
-}
-
 //---------------------------------------------------------
 //   undoChangeProperty
 //---------------------------------------------------------

diff --git a/src/engraving/dom/engravingitem.h b/src/engraving/dom/engravingitem.h
@@ -569,7 +569,7 @@ class EngravingItem : public EngravingObject
     void unlinkPropertyFromMaster(Pid id);
     void relinkPropertiesToMaster(PropertyGroup propGroup);
     PropertyPropagation propertyPropagation(EngravingItem* destinationItem, Pid propertyId);
-    bool canBeExcludedFromOtherParts() const;
+    virtual bool canBeExcludedFromOtherParts() const { return false; }
     virtual void manageExclusionFromParts(bool exclude);
 
     //! --- Old Interface ---

diff --git a/src/engraving/dom/ottava.h b/src/engraving/dom/ottava.h
@@ -91,6 +91,8 @@ class OttavaSegment final : public TextLineBaseSegment
     Ottava* ottava() const { return (Ottava*)spanner(); }
 
     EngravingItem* propertyDelegate(Pid) override;
+
+    bool canBeExcludedFromOtherParts() const override { return true; }
 };
 
 //---------------------------------------------------------

diff --git a/src/engraving/dom/stafftext.h b/src/engraving/dom/stafftext.h
@@ -40,6 +40,8 @@ class StaffText final : public StaffTextBase
 
     StaffText* clone() const override { return new StaffText(*this); }
 
+    bool canBeExcludedFromOtherParts() const override { return true; }
+
 private:
     PropertyValue propertyDefault(Pid id) const override;
 };

diff --git a/src/engraving/dom/systemtext.h b/src/engraving/dom/systemtext.h
@@ -41,6 +41,8 @@ class SystemText : public StaffTextBase
     SystemText* clone() const override { return new SystemText(*this); }
     Segment* segment() const { return (Segment*)explicitParent(); }
 
+    bool canBeExcludedFromOtherParts() const override { return true; }
+
 protected:
     PropertyValue propertyDefault(Pid id) const override;
 };

diff --git a/src/engraving/dom/textbase.cpp b/src/engraving/dom/textbase.cpp
@@ -3393,8 +3393,7 @@ void TextBase::undoChangeProperty(Pid id, const PropertyValue& v, PropertyFlags
         }
     }
 
-    bool isTextSpecificProperty = id == Pid::FONT_STYLE || id == Pid::FONT_FACE || id == Pid::FONT_SIZE || id == Pid::TEXT_SCRIPT_ALIGN;
-    if (!isTextSpecificProperty) {
+    if (propertyGroup(id) != PropertyGroup::TEXT) {
         EngravingItem::undoChangeProperty(id, v, ps);
         return;
     }