LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix 16651: Title Text is anchored to the first measure if not entered in CReate Score dialogue

Browse source
This commit is contained in:
Werner Schweer 2012-06-04 10:42:35 +02:00
parent a410bcbd3f
commit 0e79b15cfb
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libmscore/score.h
View file

@ -651,9 +651,6 @@ class Score {
QList<Excerpt*>& excerpts() { return _excerpts; }
const QList<Excerpt*>& excerpts() const { return _excerpts; }
MeasureBaseList* measures() { return &_measures; }
bool checkHasMeasures() const;
void setLayout(Measure* m);
@ -728,6 +725,8 @@ class Score {
const QList<Page*>& pages() const { return _pages; }
QList<System*>* systems() { return &_systems; }
MeasureBaseList* measures() { return &_measures; }
bool checkHasMeasures() const;
MeasureBase* first() const;
MeasureBase* last() const;
Measure* firstMeasure() const;

11
mscore/scoreview.cpp
View file

@ -4878,9 +4878,6 @@ void ScoreView::cmdAddText(int type)
{
if (!_score->checkHasMeasures())
return;
Page* page = _score->pages().front();
const QList<System*>* sl = page->systems();
const QList<MeasureBase*>& ml = sl->front()->measures();
Text* s = 0;
_score->startCmd();
switch(type) {
@ -4889,11 +4886,9 @@ void ScoreView::cmdAddText(int type)
case TEXT_COMPOSER:
case TEXT_POET:
{
MeasureBase* measure = ml.front();
if (measure->type() != VBOX) {
_score->insertMeasure(VBOX, measure);
measure = ml.front();
}
MeasureBase* measure = _score->first();
if (measure->type() != VBOX)
measure = _score->insertMeasure(VBOX, measure);
s = new Text(_score);
switch(type) {
case TEXT_TITLE: s->setTextStyle(_score->textStyle(TEXT_STYLE_TITLE)); break;