Merge pull request #31787 from RomanPudashkin/glissando_style_fix

Fix #30837: Glissandi default playback style setting does not work

Author: RomanPudashkin

share/instruments/instruments.xml

@@ -13373,6 +13373,7 @@
                   <aPitchRange>23-104</aPitchRange>
                   <pPitchRange>23-104</pPitchRange>
                   <singleNoteDynamics>0</singleNoteDynamics>
+                  <glissandoStyle>diatonic</glissandoStyle>
                   <Channel>
                         <!--MIDI: Bank 0, Prog 46; MS General: Harp-->
                         <program value="46"/> <!--Orchestral Harp-->

src/engraving/dom/note.cpp

@@ -1975,7 +1975,16 @@ EngravingItem* Note::drop(EditData& data)
                 gliss->setShowText(false);
             }
             gliss->setParent(this);
-            gliss->setGlissandoStyle(part()->instrument(gliss->tick())->glissandoStyle());
+
+            const Sid styleId = gliss->getPropertyStyle(Pid::GLISS_STYLE);
+            if (gliss->isStyled(Pid::GLISS_STYLE) && score()->style().isDefault(styleId)) {
+                const GlissandoStyle instrumentStyle = part()->instrument(gliss->tick())->glissandoStyle();
+                if (instrumentStyle != gliss->glissandoStyle()) {
+                    gliss->setGlissandoStyle(instrumentStyle);
+                    gliss->setPropertyFlags(Pid::GLISS_STYLE, PropertyFlags::UNSTYLED);
+                }
+            }
+
             score()->undoAddElement(e);
         } else {
             LOGD("no segment for second note of glissando found");

src/engraving/rw/read400/tread.cpp

@@ -895,8 +895,6 @@ bool TRead::readProperties(Instrument* item, XmlReader& e, ReadContext& ctx, Par
     } else if (tag == "transposingClef") {
         int idx = e.intAttribute("staff", 1) - 1;
         item->setClefType(idx, ClefTypeList(item->clefType(idx).concertClef, TConv::fromXml(e.readAsciiText(), ClefType::G)));
-    } else if (tag == "glissandoStyle") {
-        item->setGlissandoStyle(TConv::fromXml(e.readAsciiText(), GlissandoStyle::CHROMATIC));
     } else {
         return false;
     }

src/engraving/rw/read460/tread.cpp

@@ -1055,6 +1055,8 @@ bool TRead::readProperties(Instrument* item, XmlReader& e, ReadContext& ctx, Par
     } else if (tag == "transposingClef") {
         int idx = e.intAttribute("staff", 1) - 1;
         item->setClefType(idx, ClefTypeList(item->clefType(idx).concertClef, TConv::fromXml(e.readAsciiText(), ClefType::G)));
+    } else if (tag == "glissandoStyle") {
+        item->setGlissandoStyle(TConv::fromXml(e.readAsciiText(), GlissandoStyle::CHROMATIC));
     } else {
         return false;
     }