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

Fix tracking / responder chain issues

Browse Source
This commit is contained in:
Matthias Neeracher 2008-01-29 03:02:25 +00:00
parent 4b3ba05f3a
commit 96587871bb
5 changed files with 1270 additions and 1243 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2481
English.lproj/VLDocument.xib
View File

File diff suppressed because it is too large Load Diff

2
Sources/VLSheetView.h
View File

@ -5,7 +5,7 @@
// //
// (MN) Matthias Neeracher // (MN) Matthias Neeracher
// //
// Copyright © 2005-2007 Matthias Neeracher // Copyright © 2005-2008 Matthias Neeracher
// //
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>

11
Sources/VLSheetView.mm
View File

@ -5,7 +5,7 @@
// //
// (MN) Matthias Neeracher // (MN) Matthias Neeracher
// //
// Copyright © 2005-2007 Matthias Neeracher // Copyright © 2005-2008 Matthias Neeracher
// //
#import "VLSheetView.h" #import "VLSheetView.h"
@ -217,7 +217,7 @@ VLMusicElement sSemi2Accidental[12][12] = {
- (void) setTrackingRect - (void) setTrackingRect
{ {
NSRect r = [self bounds]; NSRect r = [self visibleRect];
NSPoint mouse = NSPoint mouse =
[self convertPoint:[[self window] mouseLocationOutsideOfEventStream] [self convertPoint:[[self window] mouseLocationOutsideOfEventStream]
fromView: nil]; fromView: nil];
@ -226,8 +226,6 @@ VLMusicElement sSemi2Accidental[12][12] = {
fCursorTracking = [self addTrackingRect:r owner:self fCursorTracking = [self addTrackingRect:r owner:self
userData:nil assumeInside:within]; userData:nil assumeInside:within];
[[self window] setAcceptsMouseMovedEvents:within]; [[self window] setAcceptsMouseMovedEvents:within];
if (within && ![self editTarget])
[[self window] makeFirstResponder:self];
} }
- (void) clearTrackingRect - (void) clearTrackingRect
@ -244,7 +242,8 @@ VLMusicElement sSemi2Accidental[12][12] = {
-(void)viewWillMoveToWindow:(NSWindow *)win -(void)viewWillMoveToWindow:(NSWindow *)win
{ {
if (!win && [self window]) [self clearTrackingRect]; if (!win && [self window])
[self clearTrackingRect];
} }
-(void)viewDidMoveToWindow -(void)viewDidMoveToWindow
@ -872,8 +871,8 @@ static int8_t sSharpAcc[] = {
- (void) mouseExited:(NSEvent *)event - (void) mouseExited:(NSEvent *)event
{ {
[[self window] setAcceptsMouseMovedEvents:NO];
[self mouseMoved:event]; [self mouseMoved:event];
[[self window] setAcceptsMouseMovedEvents:NO];
} }
- (void) mouseDown:(NSEvent *)event - (void) mouseDown:(NSEvent *)event

2
Sources/VLSheetWindow.h
View File

@ -35,6 +35,8 @@
IBOutlet id progressToolItem; IBOutlet id progressToolItem;
IBOutlet id displayToolItem; IBOutlet id displayToolItem;
IBOutlet id sheetView;
int editNumTopLedgers; int editNumTopLedgers;
int editNumBotLedgers; int editNumBotLedgers;
int editNumStanzas; int editNumStanzas;

17
Sources/VLSheetWindow.mm
View File

@ -5,7 +5,7 @@
// //
// (MN) Matthias Neeracher // (MN) Matthias Neeracher
// //
// Copyright © 2005-2007 Matthias Neeracher // Copyright © 2005-2008 Matthias Neeracher
// //
#import "VLSheetWindow.h" #import "VLSheetWindow.h"
@ -164,4 +164,19 @@ static NSString* sDisplayToolbarItemIdentifier = @"Display Toolbar Item Identifi
[progressToolItem stopAnimation:self]; [progressToolItem stopAnimation:self];
} }
- (IBAction) zoomIn: (id) sender
{
[sheetView zoomIn:sender];
}
- (IBAction) zoomOut: (id) sender
{
[sheetView zoomOut:sender];
}
- (void) mouseMoved:(NSEvent *)event
{
[sheetView mouseMoved:event];
}
@end @end