Merge pull request #29284 from cbjeukendrup/textstylepopup/when

Author: cbjeukendrup

src/notation/qml/MuseScore/NotationScene/NotationView.qml

@@ -159,11 +159,14 @@ FocusScope {
                     }
 
                     onShowElementPopupRequested: function (popupType, elementRect) {
-                        Qt.callLater(popUpLoader.show, popupType, elementRect)
+                        popUpLoader.openProperties = {
+                            popupType: popupType,
+                            elementRect: elementRect
+                        };
                     }
 
                     onHideElementPopupRequested: {
-                        Qt.callLater(popUpLoader.close)
+                        popUpLoader.openProperties = null;
                     }
 
                     onViewportChanged: {
@@ -187,6 +190,26 @@ FocusScope {
                         notationViewNavigationSection: navSec
                         navigationOrderStart: notationView.navigationPanel.order + 1
 
+                        property var openProperties: null
+                        property bool updateShowScheduled: false
+
+                        onOpenPropertiesChanged: {
+                            if (!updateShowScheduled) {
+                                Qt.callLater(updateShow)
+                                updateShowScheduled = true;
+                            }
+                        }
+
+                        function updateShow() {
+                            if (openProperties) {
+                                show(openProperties.popupType, openProperties.elementRect);
+                            } else {
+                                close();
+                            }
+
+                            popUpLoader.updateShowScheduled = false;
+                        }
+
                         onOpened: function(popupType) {
                             paintView.onElementPopupIsOpenChanged(popupType)
                         }

src/notation/view/abstractnotationpaintview.cpp

@@ -574,6 +574,7 @@ void AbstractNotationPaintView::showElementPopup(const ElementType& elementType,
         return;
     }
 
+    m_currentElementPopupType = modelType;
     emit showElementPopupRequested(modelType, fromLogical(elementRect).toQRectF());
 }
 
@@ -589,6 +590,7 @@ void AbstractNotationPaintView::hideElementPopup(const ElementType& elementType)
     const PopupModelType modelType = AbstractElementPopupModel::modelTypeFromElement(elementType);
     // Hide the popup if the model type matches the currently open model type, or if no element type was specified...
     if (modelType == m_currentElementPopupType || elementType == ElementType::INVALID) {
+        m_currentElementPopupType = PopupModelType::TYPE_UNDEFINED;
         emit hideElementPopupRequested();
     }
 }

src/notation/view/notationviewinputcontroller.cpp

@@ -152,22 +152,39 @@ void NotationViewInputController::onNotationChanged()
         }
     });
 
-    currNotation->interaction()->textEditingChanged().onNotify(this, [this]() {
+    currNotation->interaction()->textEditingStarted().onNotify(this, [this] {
         const INotationPtr notation = currentNotation();
         if (!notation) {
             return;
         }
 
-        if (notation->interaction()->isTextEditingStarted()) {
-            const TextBase* item = notation->interaction()->editedText();
-            if (AbstractElementPopupModel::hasTextStylePopup(item)
-                && item->cursor()->hasSelection()) {
-                m_view->showElementPopup(item->type(), item->canvasBoundingRect());
-                return;
-            }
+        m_view->hideContextMenu();
+        m_view->hideElementPopup();
+
+        const TextBase* item = notation->interaction()->editedText();
+        if (AbstractElementPopupModel::hasTextStylePopup(item)
+            && (!item->isLyrics() || !item->empty())) {
+            m_view->showElementPopup(item->type(), item->canvasBoundingRect());
         }
+    });
 
-        m_view->hideContextMenu();
+    currNotation->interaction()->textEditingChanged().onNotify(this, [this] {
+        const INotationPtr notation = currentNotation();
+        if (!notation) {
+            return;
+        }
+
+        if (!notation->interaction()->isTextEditingStarted()) {
+            return;
+        }
+
+        const TextBase* item = notation->interaction()->editedText();
+        if (AbstractElementPopupModel::hasTextStylePopup(item) && item->cursor()->hasSelection()) {
+            m_view->showElementPopup(item->type(), item->canvasBoundingRect());
+        }
+    });
+
+    currNotation->interaction()->textEditingEnded().onReceive(this, [this](const TextBase*) {
         m_view->hideElementPopup();
     });
 }
@@ -933,6 +950,13 @@ void NotationViewInputController::updateTextCursorPosition()
 {
     if (viewInteraction()->isTextEditingStarted()) {
         viewInteraction()->changeTextCursorPosition(m_mouseDownInfo.logicalBeginPoint);
+
+        // Show text style popup
+        const TextBase* item = viewInteraction()->editedText();
+        if (AbstractElementPopupModel::hasTextStylePopup(item)
+            && (!item->isLyrics() || !item->empty())) {
+            m_view->showElementPopup(item->type(), item->canvasBoundingRect());
+        }
     }
 }
 

src/palette/view/widgets/palettewidget.cpp

@@ -457,6 +457,7 @@ void PaletteWidget::applyElementAtIndex(int index, Qt::KeyboardModifiers modifie
     }
 
     notation->interaction()->applyPaletteElement(cell->element.get(), modifiers);
+    mainWindow()->qWindow()->requestActivate();
 }
 
 // ====================================================

src/palette/view/widgets/palettewidget.h

@@ -33,6 +33,7 @@
 
 #include "modularity/ioc.h"
 #include "../../ipaletteconfiguration.h"
+#include "ui/imainwindow.h"
 #include "ui/iuiactionsregister.h"
 #include "ui/iuiconfiguration.h"
 #include "context/iglobalcontext.h"
@@ -75,6 +76,7 @@ class PaletteWidget : public QWidget, public muse::async::Asyncable
     INJECT_STATIC(engraving::rendering::ISingleRenderer, engravingRender)
     INJECT(muse::IInteractive, interactive)
     INJECT(muse::ui::IUiConfiguration, uiConfiguration)
+    muse::Inject<muse::ui::IMainWindow> mainWindow;
 
 public:
     PaletteWidget(QWidget* parent = nullptr);