Merge pull request #29558 from mathesoncalum/460_porting_3

Porting 2 PRs to 4.6.0

Author: RomanPudashkin

src/appshell/internal/startupscenario.cpp

@@ -25,6 +25,7 @@
 #include <QCoreApplication>
 
 #include "async/async.h"
+#include "network/networkerrors.h"
 #include "translation.h"
 #include "log.h"
 
@@ -94,50 +95,45 @@ muse::async::Promise<muse::Ret> StartupScenario::runOnSplashScreen()
         registerAudioPlugins();
 
         if (multiInstancesProvider()->instances().size() != 1) {
-            const Ret ret = muse::make_ret(Ret::Code::Cancel);
+            const Ret ret = muse::make_ret(Ret::Code::Ok);
             return resolve(ret);
         }
 
         // Calculate the total number of expected update checks (TODO: check the
         // connection before trying any of this)...
-        static size_t totalChecksExpected = 0;
 
         const bool canCheckAppUpdate = appUpdateScenario() && appUpdateScenario()->needCheckForUpdate();
-        if (canCheckAppUpdate) {
-            ++totalChecksExpected;
-        }
-
         const bool canCheckMuseSoundsUpdate = museSoundsUpdateScenario() && museSoundsUpdateScenario()->needCheckForUpdate();
-        if (canCheckMuseSoundsUpdate) {
-            ++totalChecksExpected;
-        }
-
         //! NOTE: A MuseSampler update check also exists but we run it later (see onStartupPageOpened)...
+        m_totalChecksExpected = size_t(canCheckAppUpdate) + size_t(canCheckMuseSoundsUpdate);
 
-        if (totalChecksExpected == 0) {
+        if (m_totalChecksExpected == 0) {
             const Ret ret = muse::make_ret(Ret::Code::Ok);
             return resolve(ret);
         }
 
+        m_totalChecksReceived = 0;
+
         // Resolve once all checks are completed...
         const auto onUpdateCheckCompleted = [this, resolve](){
-            static size_t totalChecksReceived = 0;
-            IF_ASSERT_FAILED(m_updateCheckInProgress && totalChecksReceived < totalChecksExpected) {
-                m_updateCheckInProgress = false;
-                return;
+            if (!m_updateChecksInProgress) {
+                return; // Already resolved or timed out...
             }
 
-            ++totalChecksReceived;
+            ++m_totalChecksReceived;
 
-            if (totalChecksReceived == totalChecksExpected) {
-                m_updateCheckInProgress = false;
-                const Ret ret = muse::make_ret(Ret::Code::Ok);
-                (void)resolve(ret);
+            if (m_totalChecksReceived < m_totalChecksExpected) {
+                return; // Not ready to resolve yet...
             }
+
+            m_updateChecksInProgress = false;
+
+            const Ret ret = muse::make_ret(Ret::Code::Ok);
+            (void)resolve(ret);
         };
 
         // Asynchronously start the checks once we know the total number of expected checks...
-        m_updateCheckInProgress = true;
+        m_updateChecksInProgress = true;
         async::Async::call(this, [this, onUpdateCheckCompleted, canCheckAppUpdate, canCheckMuseSoundsUpdate]() {
             if (canCheckAppUpdate) {
                 muse::async::Promise<Ret> promise = appUpdateScenario()->checkForUpdate(/*manual*/ false);
@@ -155,11 +151,15 @@ muse::async::Promise<muse::Ret> StartupScenario::runOnSplashScreen()
 
         // Timeout if the checks take too long...
         QTimer::singleShot(CHECK_FOR_UPDATES_TIMEOUT, [this, resolve]() {
-            if (m_updateCheckInProgress) {
-                LOGE() << "Update checks timed out...";
-                const Ret ret = muse::make_ret(Ret::Code::Cancel);
-                (void)resolve(ret);
+            if (!m_updateChecksInProgress) {
+                return;
             }
+
+            m_updateChecksInProgress = false;
+
+            LOGE() << "Update checks timed out...";
+            const Ret ret = network::make_ret(network::Err::Timeout);
+            (void)resolve(ret);
         });
 
         return muse::async::Promise<Ret>::dummy_result();

src/appshell/internal/startupscenario.h

@@ -91,7 +91,9 @@ class StartupScenario : public IStartupScenario, public muse::Injectable, public
     project::ProjectFile m_startupScoreFile;
     bool m_startupCompleted = false;
 
-    bool m_updateCheckInProgress = false;
+    bool m_updateChecksInProgress = false;
+    size_t m_totalChecksExpected = 0;
+    size_t m_totalChecksReceived = 0;
 };
 }
 

src/notation/internal/notationnoteinput.cpp

@@ -441,6 +441,8 @@ void NotationNoteInput::addNote(const NoteInputParams& params, NoteAddingMode ad
 {
     TRACEFUNC;
 
+    m_interaction->hideShadowNote();
+
     bool addToUpOnCurrentChord = addingMode == NoteAddingMode::CurrentChord;
     bool insertNewChord = addingMode == NoteAddingMode::InsertChord;
 
@@ -471,6 +473,8 @@ void NotationNoteInput::padNote(const Pad& pad)
 {
     TRACEFUNC;
 
+    m_interaction->hideShadowNote();
+
     startEdit(TranslatableString("undoableAction", "Pad note"));
     score()->padToggle(pad);
     apply();

src/notation/view/abstractnotationpaintview.cpp

@@ -25,7 +25,7 @@
 #include <QMimeData>
 
 #include "actions/actiontypes.h"
-
+#include "engraving/dom/shadownote.h"
 #include "log.h"
 
 using namespace mu;
@@ -242,10 +242,7 @@ void AbstractNotationPaintView::onLoadNotation(INotationPtr)
     }
 
     m_notation->notationChanged().onNotify(this, [this]() {
-        if (INotationInteractionPtr interaction = notationInteraction()) {
-            interaction->hideShadowNote();
-        }
-        m_shadowNoteRect = RectF();
+        updateShadowNoteVisibility();
         scheduleRedraw();
     });
 
@@ -431,6 +428,27 @@ void AbstractNotationPaintView::updateLoopMarkers()
     scheduleRedraw();
 }
 
+void AbstractNotationPaintView::updateShadowNoteVisibility()
+{
+    INotationInteractionPtr interaction = notationInteraction();
+    const engraving::ShadowNote* shadowNote = interaction ? interaction->shadowNote() : nullptr;
+    if (!shadowNote || !shadowNote->visible()) {
+        m_shadowNoteRect = RectF();
+        return;
+    }
+
+    if (isNoteEnterMode()) {
+        //! NOTE: The following may actually hide the shadow note
+        //! if cursorPos is no longer valid...
+        const QPointF cursorPos = mapFromGlobal(QCursor::pos());
+        showShadowNote(toLogical(cursorPos));
+    } else {
+        interaction->hideShadowNote();
+        m_shadowNoteRect = RectF();
+        return;
+    }
+}
+
 NotationViewInputController* AbstractNotationPaintView::inputController() const
 {
     return m_inputController.get();
@@ -481,12 +499,8 @@ void AbstractNotationPaintView::onNoteInputStateChanged()
     TRACEFUNC;
 
     setAcceptHoverEvents(isNoteEnterMode());
-
-    if (INotationInteractionPtr interaction = notationInteraction()) {
-        interaction->hideShadowNote();
-        m_shadowNoteRect = RectF();
-        scheduleRedraw();
-    }
+    updateShadowNoteVisibility();
+    scheduleRedraw();
 }
 
 void AbstractNotationPaintView::onShowItemRequested(const INotationInteraction::ShowItemRequest& request)
@@ -522,7 +536,12 @@ void AbstractNotationPaintView::showShadowNote(const PointF& pos)
 {
     TRACEFUNC;
 
-    bool visible = notationInteraction()->showShadowNote(pos);
+    INotationInteractionPtr interaction = notationInteraction();
+    if (!interaction) {
+        return;
+    }
+
+    const bool visible = interaction->showShadowNote(pos);
 
     if (m_shadowNoteRect.isValid()) {
         scheduleRedraw(m_shadowNoteRect);
@@ -533,7 +552,7 @@ void AbstractNotationPaintView::showShadowNote(const PointF& pos)
         }
     }
 
-    RectF shadowNoteRect = fromLogical(notationInteraction()->shadowNoteRect());
+    RectF shadowNoteRect = fromLogical(interaction->shadowNoteRect());
 
     if (shadowNoteRect.isValid()) {
         compensateFloatPart(shadowNoteRect);

src/notation/view/abstractnotationpaintview.h

@@ -258,6 +258,7 @@ protected slots:
     void onPlaybackCursorRectChanged();
 
     void updateLoopMarkers();
+    void updateShadowNoteVisibility();
 
     const Page* pageByPoint(const muse::PointF& point) const;
     muse::PointF alignToCurrentPageBorder(const muse::RectF& showRect, const muse::PointF& pos) const;

src/notation/view/notationviewinputcontroller.cpp

@@ -1352,6 +1352,7 @@ void NotationViewInputController::keyPressEvent(QKeyEvent* event)
     } else if (key == Qt::Key_Shift) {
         viewInteraction()->updateTimeTickAnchors(event);
         updateShadowNotePopupVisibility();
+        return;
     } else if (isAnchorEditingEvent(event)) {
         viewInteraction()->moveElementAnchors(event);
     }