Merge pull request #25283 from RomanPudashkin/443_port_fixes

443_port_fixes
musescore · Oct 23, 2024 · cbf146e · cbf146e
2 parents 4221e1d + 458bdb7
commit cbf146e
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 10 deletions.
diff --git a/src/appshell/qml/FirstLaunchSetup/PlaybackPage.qml b/src/appshell/qml/FirstLaunchSetup/PlaybackPage.qml
@@ -36,7 +36,7 @@ Page {
     extraButtonTitle: qsTrc("appshell/gettingstarted", "Watch video")
 
     onExtraButtonClicked: {
-        Qt.openUrlExternally("https://youtu.be/n7UgN69e2Y8")
+        Qt.openUrlExternally("https://youtu.be/L8OdWHOjL8c")
     }
 
     Image {

diff --git a/src/appshell/qml/FirstLaunchSetup/resources/MuseSounds.png b/src/appshell/qml/FirstLaunchSetup/resources/MuseSounds.png
diff --git a/src/engraving/dom/excerpt.cpp b/src/engraving/dom/excerpt.cpp
@@ -1660,7 +1660,7 @@ void Excerpt::cloneStaff2(Staff* srcStaff, Staff* dstStaff, const Fraction& star
         for (Segment& seg : nm->segments()) {
             seg.checkEmpty();
             if (seg.empty()) {
-                score->removeElement(&seg);
+                score->doUndoRemoveElement(&seg);
             }
         }
         if (!nm->hasVoices(dstStaffIdx, nm->tick(), nm->ticks())) {

diff --git a/src/engraving/dom/joinMeasure.cpp b/src/engraving/dom/joinMeasure.cpp
@@ -115,11 +115,9 @@ void MasterScore::joinMeasure(const Fraction& tick1, const Fraction& tick2)
     }
 
     MeasureBase* next = m2->next();
-    for (Score* s : scoreList()) {
-        Measure* sM1 = s->tick2measure(startTick);
-        Measure* sM2 = s->tick2measure(m2->tick());
-        s->deleteMeasures(sM1, sM2, true);
-    }
+    Measure* deleteStart = tick2measure(startTick);
+    Measure* deleteEnd = tick2measure(m2->tick());
+    deleteMeasures(deleteStart, deleteEnd, true);
     InsertMeasureOptions options;
     options.createEmptyMeasures = true;
     options.moveSignaturesClef = false;

diff --git a/src/engraving/dom/measure.cpp b/src/engraving/dom/measure.cpp
@@ -763,7 +763,6 @@ void Measure::add(EngravingItem* e)
         while (s && s->rtick() == t) {
             if (!seg->isChordRestType() && (seg->segmentType() == s->segmentType())) {
                 LOGD("there is already a <%s> segment", seg->subTypeName());
-                return;
             }
             if (seg->goesBefore(s)) {
                 break;

diff --git a/src/notation/tests/notationviewinputcontroller_tests.cpp b/src/notation/tests/notationviewinputcontroller_tests.cpp
@@ -337,7 +337,7 @@ TEST_F(NotationViewInputControllerTests, Mouse_Press_Range_Start_Drag_From_Selec
  * @details User pressed left mouse button on already selected text element
  *          We should change text cursor position
  */
-TEST_F(NotationViewInputControllerTests, Mouse_Press_On_Selected_Text_Element)
+TEST_F(NotationViewInputControllerTests, DISABLED_Mouse_Press_On_Selected_Text_Element)
 {
     //! [GIVEN] There is a test score
     engraving::MasterScore* score = engraving::ScoreRW::readScore(TEST_SCORE_PATH);

diff --git a/src/notation/view/notationviewinputcontroller.cpp b/src/notation/view/notationviewinputcontroller.cpp
@@ -723,7 +723,7 @@ void NotationViewInputController::handleLeftClick(const ClickContext& ctx)
     INotationSelectionPtr selection = viewInteraction()->selection();
 
     if (!selection->isRange()) {
-        if (ctx.hitElement && ctx.hitElement->needStartEditingAfterSelecting() && !ctx.hitElement->isTextBase()) {
+        if (ctx.hitElement && ctx.hitElement->needStartEditingAfterSelecting()) {
             if (ctx.hitElement->hasGrips() && !ctx.hitElement->isImage() && selection->elements().size() == 1) {
                 viewInteraction()->startEditGrip(ctx.hitElement, ctx.hitElement->gripsCount() > 4 ? Grip::DRAG : Grip::MIDDLE);
             } else {