diff options
| author | Florian Jung <flo@windfisch.org> | 2011-08-18 16:45:06 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2011-08-18 16:45:06 +0000 |
| commit | 0002e57359fb002a70cc9559308619ff611718c9 (patch) | |
| tree | 4d430468df5c1a38895ae9f56a61127240e5ea2b /muse2/muse/functions.cpp | |
| parent | 3513555193d44fe99bc30dd3bf04701278a797a1 (diff) | |
| parent | 35c95c10cca9938210818c0b809b1ff4f9c4ad3d (diff) | |
merged with trunk, except:
- not applied the "masteredit saves toolbar state" change, as this
is done by TopWin here in experimental
- fixed some indentation error in scoreedit.cpp
Diffstat (limited to 'muse2/muse/functions.cpp')
| -rw-r--r-- | muse2/muse/functions.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/muse2/muse/functions.cpp b/muse2/muse/functions.cpp index 7d5eecc0..5861ca9e 100644 --- a/muse2/muse/functions.cpp +++ b/muse2/muse/functions.cpp @@ -319,7 +319,7 @@ bool modify_notelen(const set<Part*>& parts, int range, int rate, int offset) if (len <= 0) len = 1; - if ((event.tick()+len > part->lenTick()) && (!part->hasHiddenNotes())) + if ((event.tick()+len > part->lenTick()) && (!part->hasHiddenEvents())) partlen[part]=event.tick()+len; // schedule auto-expanding if (event.lenTick() != len) @@ -522,7 +522,7 @@ bool move_notes(const set<Part*>& parts, int range, signed int ticks) if (newEvent.endTick() > part->lenTick()) //if exceeding the part's end: { - if (part->hasHiddenNotes()) // auto-expanding is forbidden, clip + if (part->hasHiddenEvents()) // auto-expanding is forbidden, clip { if (part->lenTick() > newEvent.tick()) newEvent.setLenTick(part->lenTick() - newEvent.tick()); @@ -776,7 +776,7 @@ void paste_at(Part* dest_part, const QString& pt, int pos) if (e.endTick() > dest_part->lenTick()) // event exceeds part? { - if (dest_part->hasHiddenNotes()) // auto-expanding is forbidden? + if (dest_part->hasHiddenEvents()) // auto-expanding is forbidden? { if (e.tick() < dest_part->lenTick()) e.setLenTick(dest_part->lenTick() - e.tick()); // clip |