Skip to content

Commit 4e1b3b5

Browse files
committed
fix #31396
1 parent bf98fd3 commit 4e1b3b5

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

libmscore/text.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -993,7 +993,7 @@ void Text::insert(TextCursor* cursor, QChar c)
993993
_layout[cursor->line()].setEol(true);
994994
cursor->setLine(cursor->line() + 1);
995995
cursor->setColumn(0);
996-
if (_layout.size() < cursor->line())
996+
if (_layout.size() <= cursor->line())
997997
_layout.append(TextBlock());
998998
}
999999
else {
@@ -1545,11 +1545,13 @@ bool Text::edit(MuseScoreView*, int, int key, Qt::KeyboardModifiers modifiers, c
15451545
{
15461546
if (_cursor.hasSelection())
15471547
deleteSelectedText();
1548+
int line = _cursor.line();
15481549

15491550
CharFormat* charFmt = _cursor.format(); // take current format
1550-
_layout.insert(_cursor.line() + 1, curLine().split(_cursor.column()));
1551-
_layout[_cursor.line()].setEol(true);
1552-
_cursor.setLine(_cursor.line() + 1);
1551+
_layout.insert(line + 1, curLine().split(_cursor.column()));
1552+
_layout[line].setEol(true);
1553+
1554+
_cursor.setLine(line+1);
15531555
_cursor.setColumn(0);
15541556
_cursor.setFormat(*charFmt); // restore orig. format at new line
15551557
s.clear();

libmscore/text.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,6 @@ class Text : public Element {
220220

221221
virtual void draw(QPainter*) const override;
222222

223-
bool editMode() const { return _editMode; }
224-
void setEditMode(bool val) { _editMode = val; }
225-
226223
virtual void setTextStyle(const TextStyle& st);
227224
const TextStyle& textStyle() const { return _textStyle; }
228225
TextStyle& textStyle() { return _textStyle; }
@@ -236,6 +233,9 @@ class Text : public Element {
236233
QString plainText(bool noSym = false) const;
237234
void insertText(const QString&);
238235

236+
void setEditMode(bool val) { _editMode = val; }
237+
bool editMode() const { return _editMode; }
238+
239239
virtual void layout() override;
240240
virtual void layout1();
241241
void sameLayout();

0 commit comments

Comments
 (0)