mirror of
https://github.com/microtherion/VocalEasel.git
synced 2024-12-22 11:14:00 +00:00
Fix selection behavior
This commit is contained in:
parent
46b56bbf4a
commit
0ddfe26ffb
|
@ -88,6 +88,7 @@ enum VLCursorVisual {
|
|||
size_t fCursorStanza;
|
||||
int fSelStart;
|
||||
int fSelEnd;
|
||||
int fSelAnchor;
|
||||
int fNumTopLedgers;
|
||||
int fNumBotLedgers;
|
||||
int fNumStanzas;
|
||||
|
|
|
@ -111,19 +111,18 @@ VLSequenceCallback(
|
|||
|
||||
- (void)editSelection
|
||||
{
|
||||
fSelStart = fSelEnd = fCursorMeasure;
|
||||
fSelStart = fSelEnd = fSelAnchor = fCursorMeasure;
|
||||
[self updateMenus];
|
||||
[self setNeedsDisplay:YES];
|
||||
}
|
||||
|
||||
- (void)adjustSelection:(NSEvent *)event
|
||||
{
|
||||
int prevMeasure = fCursorMeasure;
|
||||
switch ([self findRegionForEvent:event]) {
|
||||
case kRegionNote:
|
||||
case kRegionChord:
|
||||
case kRegionLyrics:
|
||||
if (fCursorAt.fNum)
|
||||
if (fCursorAt.fNum > 0 && fCursorMeasure >= fSelAnchor)
|
||||
++fCursorMeasure;
|
||||
//
|
||||
// Fall through
|
||||
|
@ -131,26 +130,19 @@ VLSequenceCallback(
|
|||
case kRegionMeasure:
|
||||
fCursorMeasure =
|
||||
std::max(0, std::min<int>(fCursorMeasure, [self song]->CountMeasures()));
|
||||
if (fCursorMeasure > fSelEnd) {
|
||||
if (fCursorMeasure >= fSelAnchor) {
|
||||
fSelStart = fSelAnchor;
|
||||
fSelEnd = fCursorMeasure;
|
||||
[self updateMenus];
|
||||
[self setNeedsDisplay:YES];
|
||||
} else if (fCursorMeasure < fSelStart) {
|
||||
fSelStart = fCursorMeasure;
|
||||
[self updateMenus];
|
||||
[self setNeedsDisplay:YES];
|
||||
} else if (prevMeasure == fSelEnd && fCursorMeasure<prevMeasure) {
|
||||
fSelEnd = fCursorMeasure;
|
||||
[self updateMenus];
|
||||
[self setNeedsDisplay:YES];
|
||||
} else if (prevMeasure == fSelStart && fCursorMeasure>prevMeasure) {
|
||||
} else {
|
||||
fSelStart = fCursorMeasure;
|
||||
fSelEnd = fSelAnchor;
|
||||
[self updateMenus];
|
||||
[self setNeedsDisplay:YES];
|
||||
}
|
||||
break;
|
||||
default:
|
||||
fCursorMeasure = prevMeasure;
|
||||
break;
|
||||
}
|
||||
fCursorRegion = kRegionMeasure;
|
||||
|
|
Loading…
Reference in New Issue
Block a user