fix #24499: chord symbol edit mode layout issues

musescore · Apr 25, 2014 · c68019f · c68019f
1 parent cf0bf8c
commit c68019f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/libmscore/harmony.cpp b/libmscore/harmony.cpp
@@ -573,6 +573,7 @@ void Harmony::startEdit(MuseScoreView* view, const QPointF& p)
             Text::createLayout(); // create TextBlocks from text
             }
       Text::startEdit(view, p);
+      layout();
       }
 
 //---------------------------------------------------------

diff --git a/libmscore/text.cpp b/libmscore/text.cpp
@@ -1997,6 +1997,19 @@ void Text::textStyleChanged()
       score()->setLayoutAll(true);
       }
 
+//---------------------------------------------------------
+//   setTextStyle
+//---------------------------------------------------------
+
+void Text::setTextStyle(const TextStyle& st)
+      {
+      _textStyle = st;
+      if (editMode()) {
+            setText(plainText());
+            createLayout();
+            }
+      }
+
 //---------------------------------------------------------
 //   setTextStyleType
 //---------------------------------------------------------

diff --git a/libmscore/text.h b/libmscore/text.h
@@ -222,7 +222,7 @@ class Text : public Element {
       bool editMode() const                   { return _editMode; }
       void setEditMode(bool val)              { _editMode = val;  }
 
-      virtual void setTextStyle(const TextStyle& st)  { _textStyle = st; }
+      virtual void setTextStyle(const TextStyle& st);
       const TextStyle& textStyle() const      { return _textStyle; }
       TextStyle& textStyle()                  { return _textStyle; }
       int textStyleType() const               { return _styleIndex; }