fixed endText was invisible (musescore#16368)

codecruisedor · Jul 5, 2023 · 48c75f4 · 48c75f4
1 parent 317b708
commit 48c75f4
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 41 deletions.
diff --git a/src/inspector/models/notation/lines/hairpinsettingsmodel.cpp b/src/inspector/models/notation/lines/hairpinsettingsmodel.cpp
@@ -111,11 +111,6 @@ void HairpinSettingsModel::onNotationChanged(const PropertyIdSet& changedPropert
     loadProperties(changedPropertyIdSet);
 }
 
-bool HairpinSettingsModel::isTextVisible(TextType) const
-{
-    return true;
-}
-
 void HairpinSettingsModel::loadProperties(const PropertyIdSet& propertyIdSet)
 {
     if (mu::contains(propertyIdSet, Pid::HAIRPIN_CIRCLEDTIP)) {

diff --git a/src/inspector/models/notation/lines/hairpinsettingsmodel.h b/src/inspector/models/notation/lines/hairpinsettingsmodel.h
@@ -49,7 +49,6 @@ class HairpinSettingsModel : public TextLineSettingsModel
     void requestElements() override;
     void onNotationChanged(const mu::engraving::PropertyIdSet& changedPropertyIdSet,
                            const mu::engraving::StyleIdSet& changedStyleIdSet) override;
-    bool isTextVisible(TextType type) const override;
 
     void loadProperties(const mu::engraving::PropertyIdSet& propertyIdSet);
 

diff --git a/src/inspector/models/notation/lines/ottavasettingsmodel.cpp b/src/inspector/models/notation/lines/ottavasettingsmodel.cpp
@@ -111,8 +111,3 @@ void OttavaSettingsModel::resetProperties()
     m_ottavaType->resetToDefault();
     m_showNumbersOnly->resetToDefault();
 }
-
-bool OttavaSettingsModel::isTextVisible(TextType) const
-{
-    return true;
-}
diff --git a/src/inspector/models/notation/lines/ottavasettingsmodel.h b/src/inspector/models/notation/lines/ottavasettingsmodel.h
@@ -45,8 +45,6 @@ class OttavaSettingsModel : public TextLineSettingsModel
     void loadProperties() override;
     void resetProperties() override;
 
-    bool isTextVisible(TextType) const override;
-
     PropertyItem* m_ottavaType = nullptr;
     PropertyItem* m_showNumbersOnly = nullptr;
 };

diff --git a/src/inspector/models/notation/lines/pedalsettingsmodel.cpp b/src/inspector/models/notation/lines/pedalsettingsmodel.cpp
@@ -129,8 +129,3 @@ void PedalSettingsModel::setLineType(int newType)
 
     m_lineType->setValue(newType);
 }
-
-bool PedalSettingsModel::isTextVisible(TextType) const
-{
-    return true;
-}
diff --git a/src/inspector/models/notation/lines/pedalsettingsmodel.h b/src/inspector/models/notation/lines/pedalsettingsmodel.h
@@ -52,7 +52,6 @@ public slots:
 
     void createProperties() override;
     void loadProperties() override;
-    bool isTextVisible(TextType type) const override;
 
     void setLineType(int newType);
 

diff --git a/src/inspector/models/notation/lines/textlinesettingsmodel.cpp b/src/inspector/models/notation/lines/textlinesettingsmodel.cpp
@@ -91,20 +91,14 @@ void TextLineSettingsModel::createProperties()
     m_placement = buildPropertyItem(Pid::PLACEMENT);
     m_placement->setIsVisible(false);
 
-    if (isTextVisible(BeginningText)) {
-        m_beginningText = buildPropertyItem(Pid::BEGIN_TEXT);
-        m_beginningTextOffset = buildPointFPropertyItem(Pid::BEGIN_TEXT_OFFSET);
-    }
+    m_beginningText = buildPropertyItem(Pid::BEGIN_TEXT);
+    m_beginningTextOffset = buildPointFPropertyItem(Pid::BEGIN_TEXT_OFFSET);
 
-    if (isTextVisible(ContinuousText)) {
-        m_continuousText = buildPropertyItem(Pid::CONTINUE_TEXT);
-        m_continuousTextOffset = buildPointFPropertyItem(Pid::CONTINUE_TEXT_OFFSET);
-    }
+    m_continuousText = buildPropertyItem(Pid::CONTINUE_TEXT);
+    m_continuousTextOffset = buildPointFPropertyItem(Pid::CONTINUE_TEXT_OFFSET);
 
-    if (isTextVisible(EndText)) {
-        m_endText = buildPropertyItem(Pid::END_TEXT);
-        m_endTextOffset = buildPointFPropertyItem(Pid::END_TEXT_OFFSET);
-    }
+    m_endText = buildPropertyItem(Pid::END_TEXT);
+    m_endTextOffset = buildPointFPropertyItem(Pid::END_TEXT_OFFSET);
 }
 
 void TextLineSettingsModel::loadProperties()
@@ -305,12 +299,6 @@ void TextLineSettingsModel::onUpdateLinePropertiesAvailability()
     m_dashGapLength->setIsEnabled(isLineAvailable && areDashPropertiesAvailable);
 }
 
-bool TextLineSettingsModel::isTextVisible(TextType type) const
-{
-    //! NOTE: the end text is hidden for most lines by default
-    return type != TextType::EndText;
-}
-
 void TextLineSettingsModel::setPossibleStartHookTypes(const QList<HookTypeInfo>& types)
 {
     m_possibleStartHookTypes = hookTypesToObjList(types);

diff --git a/src/inspector/models/notation/lines/textlinesettingsmodel.h b/src/inspector/models/notation/lines/textlinesettingsmodel.h
@@ -120,7 +120,6 @@ class TextLineSettingsModel : public AbstractInspectorModel
                            const mu::engraving::StyleIdSet& changedStyleIdSet) override;
 
     virtual void onUpdateLinePropertiesAvailability();
-    virtual bool isTextVisible(TextType type) const;
 
     void setPossibleStartHookTypes(const QList<HookTypeInfo>& types);
     void setPossibleEndHookTypes(const QList<HookTypeInfo>& types);

diff --git a/src/inspector/view/qml/MuseScore/Inspector/notation/lines/internal/LineTextSettingsTab.qml b/src/inspector/view/qml/MuseScore/Inspector/notation/lines/internal/LineTextSettingsTab.qml
@@ -90,7 +90,7 @@ FocusableItem {
 
         TextSection {
             id: continuousTextSection
-            titleText:  qsTrc("inspector", "Text when continuing to a new system")
+            titleText: qsTrc("inspector", "Text when continuing to a new system")
             propertyItem: root.model ? root.model.continuousText : null
 
             navigationPanel: root.navigationPanel
@@ -106,11 +106,11 @@ FocusableItem {
             navigationRowStart: continuousTextSection.navigationRowEnd + 1
         }
 
-        SeparatorLine { anchors.margins: -12; visible: endTextSection.visible }
+        SeparatorLine { anchors.margins: -12 }
 
         TextSection {
             id: endTextSection
-            titleText:  qsTrc("inspector", "End text")
+            titleText: qsTrc("inspector", "End text")
             propertyItem: root.model ? root.model.endText : null
 
             navigationPanel: root.navigationPanel