microtherion/VocalEasel
1
0
Fork 0
mirror of https://github.com/microtherion/VocalEasel.git synced 2024-12-22 11:14:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://vocaleasel.git.sourceforge.net/gitroot/vocaleasel/vocaleasel

Browse Source
This commit is contained in:
Matthias Neeracher 2011-09-07 16:05:04 +02:00
commit d073aed5fa
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/VLSheetView.mm
View File

@ -901,7 +901,7 @@ const float kSemiFloor = -1.0f*kLineH;
NSResponder * hasResponder = [win firstResponder]; NSResponder * hasResponder = [win firstResponder];
if ([self editTarget]) if ([self editTarget])
if (hasResponder != [win fieldEditor:NO forObject:nil] if (hasResponder != [win fieldEditor:NO forObject:nil]
|| [hasResponder delegate] != fFieldEditor || [(id)hasResponder delegate] != fFieldEditor
) )
[win makeFirstResponder:fFieldEditor]; [win makeFirstResponder:fFieldEditor];
} }

3
Sources/VLSheetViewNotes.mm
View File

@ -385,6 +385,7 @@
tupletStartX = pos.x-kNoteW*0.5f; tupletStartX = pos.x-kNoteW*0.5f;
tuplet = newTuplet; tuplet = newTuplet;
tupletDur = 0; tupletDur = 0;
inTuplet = 0;
} }
++inTuplet; ++inTuplet;
tupletDur += note->fDuration / VLNote::TupletDenom(tuplet); tupletDur += note->fDuration / VLNote::TupletDenom(tuplet);
@ -397,7 +398,7 @@
[self drawTuplet:tuplet bracketFrom:tupletStartX to:tupletEndX atY:tupletY]; [self drawTuplet:tuplet bracketFrom:tupletStartX to:tupletEndX atY:tupletY];
inTuplet = 0; inTuplet = 0;
} }
} else if (++inTuplet) { } else if (inTuplet) {
[self drawTuplet:tuplet bracketFrom:tupletStartX to:tupletEndX atY:tupletY]; [self drawTuplet:tuplet bracketFrom:tupletStartX to:tupletEndX atY:tupletY];
inTuplet = 0; inTuplet = 0;
} }