Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Undo commit from muelleki/17906-chords that conflicts with watery/17906-... #182

Merged
merged 1 commit into from
Jan 31, 2013
+2 −10
Merged

Undo commit from muelleki/17906-chords that conflicts with watery/17906-... #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions libmscore/cmd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,12 +385,9 @@ qDebug("add pitch %d %d", pitch, addFlag);
Note* n = addNote(chord, pitch);
setLayoutAll(false);
setLayout(chord->measure());
moveToNextInputPos();
return n;
}
if (_is.moveBeforeAdding())
moveToNextInputPos();
else
_is.setMoveBeforeAdding(true);
expandVoice();

// insert note
Expand Down Expand Up @@ -448,6 +445,7 @@ qDebug("add pitch %d %d", pitch, addFlag);
qDebug("addPitch: cannot find slur note");
setLayoutAll(true);
}
moveToNextInputPos();
return note;
}

Expand Down
1 change: 0 additions & 1 deletion libmscore/input.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ InputState::InputState() :
_segment(0),
_string(VISUAL_STRING_NONE),
_repitchMode(false),
_moveBeforeAdding(false),
rest(false),
pitch(72),
noteType(NOTE_NORMAL),
Expand Down
4 changes: 0 additions & 4 deletions libmscore/input.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ class InputState {
Segment* _segment; // current segment
int _string; // visual string selected for input (TAB staves only)
bool _repitchMode;
bool _moveBeforeAdding;

public:
bool rest; // rest mode
Expand Down Expand Up @@ -71,9 +70,6 @@ class InputState {
bool repitchMode() const { return _repitchMode; }
void setRepitchMode(bool val) { _repitchMode = val; }

bool moveBeforeAdding() const { return _moveBeforeAdding; }
void setMoveBeforeAdding(bool val) { _moveBeforeAdding = val; }

StaffGroup staffGroup() const;
};

Expand Down
1 change: 0 additions & 1 deletion libmscore/score.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2707,7 +2707,6 @@ void Score::setInputState(Element* e)
e = static_cast<Chord*>(e)->upNote();

_is.setDrumNote(-1);
_is.setMoveBeforeAdding(false);
// _is.setDrumset(0);
if (e->type() == Element::NOTE) {
Note* note = static_cast<Note*>(e);
Expand Down