Merge pull request #30331 from cbjeukendrup/port/4.6.1

cbjeukendrup · web-flow · commit 32ec33df65b9 · 2025-10-07T13:19:01.000+02:00
diff --git a/buildscripts/packaging/Linux+BSD/org.musescore.MuseScore.appdata.xml.in b/buildscripts/packaging/Linux+BSD/org.musescore.MuseScore.appdata.xml.in
@@ -116,7 +116,7 @@
     </kudos>
     <!-- Only <releases> below this point please! -->
     <releases>
-        <release date="2025-10-06" version="4.6.1">
+        <release date="2025-10-07" version="4.6.1">
             <url>https://musescore.org/en/4.6.1</url>
         </release>
         <release date="2025-09-30" version="4.6">
diff --git a/src/engraving/dom/dynamic.cpp b/src/engraving/dom/dynamic.cpp
@@ -21,19 +21,17 @@
  */
 #include "dynamic.h"
 
-#include "types/translatablestring.h"
 #include "types/typesconv.h"
 
-#include "anchors.h"
 #include "dynamichairpingroup.h"
 #include "expression.h"
 #include "hairpin.h"
 #include "measure.h"
-#include "mscore.h"
 #include "score.h"
 #include "segment.h"
 #include "system.h"
 #include "tempo.h"
+#include "textedit.h"
 #include "undo.h"
 
 #include "log.h"
@@ -597,8 +595,8 @@ String Dynamic::screenReaderInfo() const
 
 bool Dynamic::isEditAllowed(EditData& ed) const
 {
-    if (ed.key == Key_Tab) {
-        return false;
+    if (!dynamic_cast<TextEditData*>(ed.getData(this).get())) {
+        return EngravingItem::isEditAllowed(ed);
     }
 
     return TextBase::isEditAllowed(ed);
diff --git a/src/engraving/dom/property.cpp b/src/engraving/dom/property.cpp
@@ -222,7 +222,7 @@ static constexpr PropertyMetaData propertyList[] = {
     { Pid::GLISS_SHIFT,             false, "glissandoShift",        P_TYPE::BOOL,               PropertyGroup::APPEARANCE,      QT_TRANSLATE_NOOP("engraving/propertyName", "glissando shift") },
     { Pid::GLISS_EASEIN,            false, "easeInSpin",            P_TYPE::INT,                PropertyGroup::APPEARANCE,      QT_TRANSLATE_NOOP("engraving/propertyName", "ease in") },
     { Pid::GLISS_EASEOUT,           false, "easeOutSpin",           P_TYPE::INT,                PropertyGroup::APPEARANCE,      QT_TRANSLATE_NOOP("engraving/propertyName", "ease out") },
-    { Pid::DIAGONAL,                false, "",                      P_TYPE::BOOL,               PropertyGroup::APPEARANCE,      QT_TRANSLATE_NOOP("engraving/propertyName", "diagonal") },
+    { Pid::DIAGONAL,                false, "diagonal",              P_TYPE::BOOL,               PropertyGroup::APPEARANCE,      QT_TRANSLATE_NOOP("engraving/propertyName", "diagonal") },
     { Pid::GROUP_NODES,             false, "",                      P_TYPE::GROUPS,             PropertyGroup::NONE,            QT_TRANSLATE_NOOP("engraving/propertyName", "groups") },
     { Pid::LINE_STYLE,              true,  "lineStyle",             P_TYPE::LINE_TYPE,          PropertyGroup::APPEARANCE,      QT_TRANSLATE_NOOP("engraving/propertyName", "line style") },
     { Pid::LINE_WIDTH,              false, "lineWidth",             P_TYPE::SPATIUM,            PropertyGroup::APPEARANCE,      QT_TRANSLATE_NOOP("engraving/propertyName", "line width") },
diff --git a/src/engraving/playback/metaparsers/notearticulationsparser.cpp b/src/engraving/playback/metaparsers/notearticulationsparser.cpp
@@ -133,7 +133,9 @@ ArticulationType NoteArticulationsParser::articulationTypeByNoteheadGroup(const
 
 void NoteArticulationsParser::parsePlayingTechnique(const RenderingContext& ctx, mpe::ArticulationMap& result)
 {
-    const std::pair<timestamp_t, PlayingTechniqueType> tech = ctx.playbackCtx->playingTechnique(ctx.score, ctx.nominalPositionStartTick);
+    int chordPosTickWithOffset = ctx.nominalPositionStartTick + ctx.positionTickOffset;
+
+    const std::pair<timestamp_t, PlayingTechniqueType> tech = ctx.playbackCtx->playingTechnique(ctx.score, chordPosTickWithOffset);
     const mpe::ArticulationType articulationType = articulationFromPlayTechType(tech.second);
     if (articulationType == ArticulationType::Standard || articulationType == ArticulationType::Undefined) {
         return;
@@ -149,7 +151,7 @@ void NoteArticulationsParser::parsePlayingTechnique(const RenderingContext& ctx,
 
     if (tech.second == PlayingTechniqueType::HandbellsLV) {
         const timestamp_t dampTime = ctx.playbackCtx->findPlayingTechniqueTimestamp(ctx.score, PlayingTechniqueType::HandbellsDamp,
-                                                                                    ctx.nominalPositionStartTick);
+                                                                                    chordPosTickWithOffset);
         timestamp = tech.first;
         duration = dampTime > 0 ? dampTime - timestamp : mpe::INFINITE_DURATION;
     }
diff --git a/src/engraving/rw/read400/tread.cpp b/src/engraving/rw/read400/tread.cpp
@@ -3572,20 +3572,13 @@ bool TRead::readProperties(SLine* l, XmlReader& e, ReadContext& ctx)
         ls->setVisible(l->visible());
     } else if (tag == "length") {
         l->setLen(e.readDouble());
-    } else if (tag == "diagonal") {
-        l->setDiagonal(e.readInt());
-    } else if (tag == "anchor") {
-        l->setAnchor(SLine::Anchor(e.readInt()));
-    } else if (tag == "lineWidth") {
-        l->setLineWidth(Spatium(e.readDouble()));
+    } else if (TRead::readProperty(l, tag, e, ctx, Pid::DIAGONAL)) {
+    } else if (TRead::readProperty(l, tag, e, ctx, Pid::ANCHOR)) {
+    } else if (TRead::readProperty(l, tag, e, ctx, Pid::LINE_WIDTH)) {
     } else if (TRead::readProperty(l, tag, e, ctx, Pid::LINE_STYLE)) {
-    } else if (tag == "dashLineLength") {
-        l->setDashLineLen(e.readDouble());
-    } else if (tag == "dashGapLength") {
-        l->setDashGapLen(e.readDouble());
-    } else if (tag == "lineColor") {
-        l->setLineColor(e.readColor());
-    } else if (tag == "color") {
+    } else if (TRead::readProperty(l, tag, e, ctx, Pid::DASH_LINE_LEN)) {
+    } else if (TRead::readProperty(l, tag, e, ctx, Pid::DASH_GAP_LEN)) {
+    } else if (tag == "lineColor" || tag == "color") {
         l->setLineColor(e.readColor());
     } else if (!readProperties(static_cast<Spanner*>(l), e, ctx)) {
         return false;
diff --git a/src/engraving/rw/read410/tread.cpp b/src/engraving/rw/read410/tread.cpp
@@ -3766,20 +3766,13 @@ bool TRead::readProperties(SLine* l, XmlReader& e, ReadContext& ctx)
         ls->setVisible(l->visible());
     } else if (tag == "length") {
         l->setLen(e.readDouble());
-    } else if (tag == "diagonal") {
-        l->setDiagonal(e.readInt());
-    } else if (tag == "anchor") {
-        l->setAnchor(SLine::Anchor(e.readInt()));
-    } else if (tag == "lineWidth") {
-        l->setLineWidth(Spatium(e.readDouble()));
+    } else if (TRead::readProperty(l, tag, e, ctx, Pid::DIAGONAL)) {
+    } else if (TRead::readProperty(l, tag, e, ctx, Pid::ANCHOR)) {
+    } else if (TRead::readProperty(l, tag, e, ctx, Pid::LINE_WIDTH)) {
     } else if (TRead::readProperty(l, tag, e, ctx, Pid::LINE_STYLE)) {
-    } else if (tag == "dashLineLength") {
-        l->setDashLineLen(e.readDouble());
-    } else if (tag == "dashGapLength") {
-        l->setDashGapLen(e.readDouble());
-    } else if (tag == "lineColor") {
-        l->setLineColor(e.readColor());
-    } else if (tag == "color") {
+    } else if (TRead::readProperty(l, tag, e, ctx, Pid::DASH_LINE_LEN)) {
+    } else if (TRead::readProperty(l, tag, e, ctx, Pid::DASH_GAP_LEN)) {
+    } else if (tag == "lineColor" || tag == "color") {
         l->setLineColor(e.readColor());
     } else if (!readProperties(static_cast<Spanner*>(l), e, ctx)) {
         return false;
diff --git a/src/engraving/rw/read460/tread.cpp b/src/engraving/rw/read460/tread.cpp
@@ -3636,20 +3636,13 @@ bool TRead::readProperties(SLine* l, XmlReader& e, ReadContext& ctx)
         ls->setVisible(l->visible());
     } else if (tag == "length") {
         l->setLen(e.readDouble());
-    } else if (tag == "diagonal") {
-        l->setDiagonal(e.readInt());
-    } else if (tag == "anchor") {
-        l->setAnchor(SLine::Anchor(e.readInt()));
-    } else if (tag == "lineWidth") {
-        l->setLineWidth(Spatium(e.readDouble()));
+    } else if (TRead::readProperty(l, tag, e, ctx, Pid::DIAGONAL)) {
+    } else if (TRead::readProperty(l, tag, e, ctx, Pid::ANCHOR)) {
+    } else if (TRead::readProperty(l, tag, e, ctx, Pid::LINE_WIDTH)) {
     } else if (TRead::readProperty(l, tag, e, ctx, Pid::LINE_STYLE)) {
-    } else if (tag == "dashLineLength") {
-        l->setDashLineLen(e.readDouble());
-    } else if (tag == "dashGapLength") {
-        l->setDashGapLen(e.readDouble());
-    } else if (tag == "lineColor") {
-        l->setLineColor(e.readColor());
-    } else if (tag == "color") {
+    } else if (TRead::readProperty(l, tag, e, ctx, Pid::DASH_LINE_LEN)) {
+    } else if (TRead::readProperty(l, tag, e, ctx, Pid::DASH_GAP_LEN)) {
+    } else if (tag == "lineColor" || tag == "color") {
         l->setLineColor(e.readColor());
     } else if (!readProperties(static_cast<Spanner*>(l), e, ctx)) {
         return false;
diff --git a/src/framework/uicomponents/qml/Muse/UiComponents/IncrementalPropertyControl.qml b/src/framework/uicomponents/qml/Muse/UiComponents/IncrementalPropertyControl.qml
@@ -34,6 +34,7 @@ Item {
 
     property alias isIndeterminate: textInputField.isIndeterminate
     property real currentValue: 0.0
+    property alias currentText: textInputField.currentText
 
     property real step: 0.5
     property int decimals: 2
diff --git a/src/notation/qml/MuseScore/NotationScene/internal/StringTuningsPopup.qml b/src/notation/qml/MuseScore/NotationScene/internal/StringTuningsPopup.qml
@@ -214,7 +214,8 @@ AbstractElementPopup {
                             Layout.preferredHeight: parent.height - ui.theme.borderWidth * 2
                             Layout.preferredWidth: 64
 
-                            currentValue: modelData["valueStr"]
+                            currentValue: modelData["value"]
+                            currentText: modelData["valueStr"]
 
                             minValue: 0
                             maxValue: 127
@@ -223,12 +224,10 @@ AbstractElementPopup {
                             navigation.row: index
                             navigation.column: 3
 
-                            canIncrease: modelData["value"] < maxValue
                             onIncrement: function() {
                                 return stringTuningsModel.increaseStringValue(currentValue)
                             }
 
-                            canDecrease: modelData["value"] > minValue
                             onDecrement: function() {
                                 return stringTuningsModel.decreaseStringValue(currentValue)
                             }
@@ -237,8 +236,8 @@ AbstractElementPopup {
                                 var ok = stringTuningsModel.setStringValue(index, newValue)
                                 if (!ok) {
                                     //! NOTE: reset the text entered by the user
-                                    currentValue = modelData["valueStr"]
-                                    currentValue = Qt.binding( function() { return modelData["valueStr"] } )
+                                    currentText = modelData["valueStr"]
+                                    currentText = Qt.binding( function() { return modelData["valueStr"] } )
                                 }
                             }
                         }
diff --git a/src/notation/view/abstractnotationpaintview.cpp b/src/notation/view/abstractnotationpaintview.cpp
@@ -1271,10 +1271,15 @@ bool AbstractNotationPaintView::event(QEvent* event)
 
     if (isContextMenuEvent) {
         QContextMenuEvent* contextMenuEvent = dynamic_cast<QContextMenuEvent*>(event);
+        if (contextMenuEvent && contextMenuEvent->reason() == QContextMenuEvent::Mouse
+            && m_inputController->ignoreNextMouseContextMenuEvent()) {
+            return true;
+        }
         QPointF pos = contextMenuEvent && !contextMenuEvent->pos().isNull()
                       ? mapFromGlobal(contextMenuEvent->globalPos())
                       : fromLogical(m_inputController->selectionElementPos()).toQPointF();
         showContextMenu(m_inputController->selectionType(), pos);
+        return true;
     } else if (eventType == QEvent::Type::ShortcutOverride) {
         bool shouldOverrideShortcut = shortcutOverride(keyEvent);
 
diff --git a/src/notation/view/internal/stringtuningssettingsmodel.cpp b/src/notation/view/internal/stringtuningssettingsmodel.cpp
@@ -149,16 +149,14 @@ bool StringTuningsSettingsModel::setStringValue(int stringIndex, const QString&
     return true;
 }
 
-QString StringTuningsSettingsModel::increaseStringValue(const QString& stringValue)
+QString StringTuningsSettingsModel::increaseStringValue(int currentPitch)
 {
-    String value = engraving::convertPitchStringFlatsAndSharpsToUnicode(stringValue);
-    return engraving::pitch2string(engraving::string2pitch(value) + 1, false /* useFlats */);
+    return engraving::pitch2string(currentPitch + 1, false /* useFlats */);
 }
 
-QString StringTuningsSettingsModel::decreaseStringValue(const QString& stringValue)
+QString StringTuningsSettingsModel::decreaseStringValue(int currentPitch)
 {
-    String value = engraving::convertPitchStringFlatsAndSharpsToUnicode(stringValue);
-    return engraving::pitch2string(engraving::string2pitch(value) - 1, true /* useFlats */);
+    return engraving::pitch2string(currentPitch - 1, true /* useFlats */);
 }
 
 QVariantList StringTuningsSettingsModel::presets(bool withCustom) const
diff --git a/src/notation/view/internal/stringtuningssettingsmodel.h b/src/notation/view/internal/stringtuningssettingsmodel.h
@@ -59,8 +59,8 @@ class StringTuningsSettingsModel : public AbstractElementPopupModel
     Q_INVOKABLE void toggleString(int stringIndex);
     Q_INVOKABLE bool setStringValue(int stringIndex, const QString& stringValue);
 
-    Q_INVOKABLE QString increaseStringValue(const QString& stringValue);
-    Q_INVOKABLE QString decreaseStringValue(const QString& stringValue);
+    Q_INVOKABLE QString increaseStringValue(int currentPitch);
+    Q_INVOKABLE QString decreaseStringValue(int currentPitch);
 
     QVariantList presets(bool withCustom = true) const;
 
diff --git a/src/notation/view/notationnavigator.cpp b/src/notation/view/notationnavigator.cpp
@@ -67,6 +67,8 @@ void NotationNavigator::load()
     });
 
     AbstractNotationPaintView::load();
+
+    rescale();
 }
 
 bool NotationNavigator::isVerticalOrientation() const
@@ -76,25 +78,22 @@ bool NotationNavigator::isVerticalOrientation() const
 
 const PageList& NotationNavigator::pages() const
 {
-    static const PageList dummyPages;
-
-    auto notation = globalContext()->currentNotation();
-    if (!notation) {
-        return dummyPages;
-    }
-
-    auto elements = notation->elements();
-    if (!elements) {
+    if (!notation()) {
+        static const PageList dummyPages;
         return dummyPages;
     }
 
-    return elements->pages();
+    return notation()->elements()->pages();
 }
 
 void NotationNavigator::rescale()
 {
     TRACEFUNC;
 
+    if (!isVisible() || size().isEmpty()) {
+        return;
+    }
+
     const PageList& pages = this->pages();
     if (pages.empty()) {
         return;
@@ -209,7 +208,6 @@ void NotationNavigator::setCursorRect(const QRectF& rect)
     bool moved = moveCanvasToRect(newCursorRect);
     m_cursorRect = newCursorRect;
 
-    rescale();
     m_cursorRectView->setSize(this->size());
     m_cursorRectView->setRect(fromLogical(newCursorRect));
 
@@ -224,11 +222,6 @@ int NotationNavigator::orientation() const
     return static_cast<int>(configuration()->canvasOrientation().val);
 }
 
-INotationPtr NotationNavigator::currentNotation() const
-{
-    return globalContext()->currentNotation();
-}
-
 void NotationNavigator::initOrientation()
 {
     ValCh<muse::Orientation> orientation = configuration()->canvasOrientation();
@@ -243,18 +236,19 @@ void NotationNavigator::initOrientation()
 void NotationNavigator::initVisible()
 {
     connect(this, &NotationNavigator::visibleChanged, [this]() {
-        update();
+        if (isVisible()) {
+            rescale();
+        }
     });
 }
 
 ViewMode NotationNavigator::notationViewMode() const
 {
-    auto notation = currentNotation();
-    if (!notation) {
+    if (!notation()) {
         return ViewMode::PAGE;
     }
 
-    return notation->viewMode();
+    return notation()->viewMode();
 }
 
 void NotationNavigator::paint(QPainter* painter)
@@ -272,6 +266,11 @@ void NotationNavigator::paint(QPainter* painter)
 
 void NotationNavigator::onViewSizeChanged()
 {
+    if (!isVisible()) {
+        return;
+    }
+
+    rescale();
 }
 
 void NotationNavigator::paintPageNumbers(QPainter* painter)
diff --git a/src/notation/view/notationnavigator.h b/src/notation/view/notationnavigator.h
@@ -77,8 +77,6 @@ class NotationNavigator : public AbstractNotationPaintView
     void orientationChanged();
 
 private:
-    INotationPtr currentNotation() const;
-
     void initOrientation();
     void initVisible();
 
diff --git a/src/notation/view/notationviewinputcontroller.cpp b/src/notation/view/notationviewinputcontroller.cpp
@@ -660,6 +660,7 @@ void NotationViewInputController::mousePressEvent(QMouseEvent* event)
     };
 
     m_shouldStartEditOnLeftClickRelease = false;
+    m_ignoreNextMouseContextMenuEvent = false;
 
     // When using MiddleButton, just start moving the canvas
     if (button == Qt::MiddleButton) {
@@ -756,6 +757,7 @@ void NotationViewInputController::handleClickInNoteInputMode(QMouseEvent* event)
     const PointF logicPos = m_view->toLogical(event->pos());
 
     if (event->button() == Qt::RightButton) {
+        m_ignoreNextMouseContextMenuEvent = true;
         dispatcher()->dispatch("remove-note", ActionData::make_arg1<PointF>(logicPos));
         return;
     }
diff --git a/src/notation/view/notationviewinputcontroller.h b/src/notation/view/notationviewinputcontroller.h
@@ -134,6 +134,8 @@ class NotationViewInputController : public muse::actions::Actionable, public mus
     bool canHandleInputMethodQuery(Qt::InputMethodQuery query) const;
     QVariant inputMethodQuery(Qt::InputMethodQuery query) const;
 
+    bool ignoreNextMouseContextMenuEvent() const { return m_ignoreNextMouseContextMenuEvent; }
+
     void dragEnterEvent(QDragEnterEvent* event);
     void dragLeaveEvent(QDragLeaveEvent* event);
     void dragMoveEvent(QDragMoveEvent* event);
@@ -245,5 +247,6 @@ class NotationViewInputController : public muse::actions::Actionable, public mus
     bool m_hitElementWasAlreadySingleSelected = false;
     bool m_shouldSelectOnLeftClickRelease = false;
     bool m_shouldStartEditOnLeftClickRelease = false;
+    bool m_ignoreNextMouseContextMenuEvent = false;
 };
 }
diff --git a/src/palette/view/widgets/masterpalette.cpp b/src/palette/view/widgets/masterpalette.cpp

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,8 @@ AbstractElementPopup {`
`214`	`214`	`Layout.preferredHeight: parent.height - ui.theme.borderWidth * 2`
`215`	`215`	`Layout.preferredWidth: 64`
`216`	`216`
`217`		`- currentValue: modelData["valueStr"]`
	`217`	`+ currentValue: modelData["value"]`
	`218`	`+ currentText: modelData["valueStr"]`
`218`	`219`
`219`	`220`	`minValue: 0`
`220`	`221`	`maxValue: 127`
`@@ -223,12 +224,10 @@ AbstractElementPopup {`
`223`	`224`	`navigation.row: index`
`224`	`225`	`navigation.column: 3`
`225`	`226`
`226`		`- canIncrease: modelData["value"] < maxValue`
`227`	`227`	`onIncrement: function() {`
`228`	`228`	`return stringTuningsModel.increaseStringValue(currentValue)`
`229`	`229`	`}`
`230`	`230`
`231`		`- canDecrease: modelData["value"] > minValue`
`232`	`231`	`onDecrement: function() {`
`233`	`232`	`return stringTuningsModel.decreaseStringValue(currentValue)`
`234`	`233`	`}`
`@@ -237,8 +236,8 @@ AbstractElementPopup {`
`237`	`236`	`var ok = stringTuningsModel.setStringValue(index, newValue)`
`238`	`237`	`if (!ok) {`
`239`	`238`	`//! NOTE: reset the text entered by the user`
`240`		`- currentValue = modelData["valueStr"]`
`241`		`- currentValue = Qt.binding( function() { return modelData["valueStr"] } )`
	`239`	`+ currentText = modelData["valueStr"]`
	`240`	`+ currentText = Qt.binding( function() { return modelData["valueStr"] } )`
`242`	`241`	`}`
`243`	`242`	`}`
`244`	`243`	`}`