github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-01-19 19:58:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use new focus ring API (10.7)

Browse Source
This commit is contained in:
Allan Odgaard
2013-04-17 18:00:47 +07:00
parent 97c9a20f6e
commit 8fc7567e2e
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Frameworks/OakAppKit/src/OakKeyEquivalentView.mm
View File

@@ -124,18 +124,13 @@ static NSString* const kRecordingPlaceholderString = @"…";
- (void)setKeyState:(NSUInteger)newState
{
NSUInteger oldState = self.keyState;
[super setKeyState:newState];
BOOL didHaveFocus = (oldState & (OakViewViewIsFirstResponderMask|OakViewWindowIsKeyMask|OakViewApplicationIsActiveMask)) == (OakViewViewIsFirstResponderMask|OakViewWindowIsKeyMask|OakViewApplicationIsActiveMask);
BOOL doesHaveFocus = (newState & (OakViewViewIsFirstResponderMask|OakViewWindowIsKeyMask|OakViewApplicationIsActiveMask)) == (OakViewViewIsFirstResponderMask|OakViewWindowIsKeyMask|OakViewApplicationIsActiveMask);
if(didHaveFocus != doesHaveFocus)
[self setKeyboardFocusRingNeedsDisplayInRect:[self bounds]];
BOOL doesHaveResponder = (newState & (OakViewViewIsFirstResponderMask)) == (OakViewViewIsFirstResponderMask);
if(!doesHaveResponder)
self.recording = NO;
BOOL doesHaveFocus = (newState & (OakViewViewIsFirstResponderMask|OakViewWindowIsKeyMask|OakViewApplicationIsActiveMask)) == (OakViewViewIsFirstResponderMask|OakViewWindowIsKeyMask|OakViewApplicationIsActiveMask);
if(!doesHaveFocus && self.recording)
self.displayString = kRecordingPlaceholderString; // reset potential display string from flagsChanged:
}
@@ -282,15 +277,16 @@ static NSString* const kRecordingPlaceholderString = @"…";
NSImage* image = self.mouseInClearButton ? (_mouseDown ? imgDown : imgHover) : imgNormal;
[image drawAdjustedInRect:_clearButtonRect fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:1.0];
}
}
BOOL doesHaveFocus = (self.keyState & (OakViewViewIsFirstResponderMask|OakViewWindowIsKeyMask|OakViewApplicationIsActiveMask)) == (OakViewViewIsFirstResponderMask|OakViewWindowIsKeyMask|OakViewApplicationIsActiveMask);
if(doesHaveFocus)
{
[NSGraphicsContext saveGraphicsState];
NSSetFocusRingStyle(NSFocusRingOnly);
NSRectFill(frame);
[NSGraphicsContext restoreGraphicsState];
}
- (void)drawFocusRingMask
{
NSRectFill([self bounds]);
}
- (NSRect)focusRingMaskBounds
{
return [self bounds];
}
// ============