diff options
Diffstat (limited to 'frontends/cocoa/LocalHistoryController.m')
-rw-r--r-- | frontends/cocoa/LocalHistoryController.m | 143 |
1 files changed, 72 insertions, 71 deletions
diff --git a/frontends/cocoa/LocalHistoryController.m b/frontends/cocoa/LocalHistoryController.m index 97c592d43..805539669 100644 --- a/frontends/cocoa/LocalHistoryController.m +++ b/frontends/cocoa/LocalHistoryController.m @@ -27,93 +27,94 @@ @synthesize browser; @synthesize history; -- (instancetype)initWithBrowser: (BrowserView *) bw +- (instancetype)initWithBrowser:(BrowserView *)bw { - if ((self = [super initWithWindowNibName: @"LocalHistoryPanel"]) == nil) return nil; - - browser = bw; - - return self; + if ((self = [super initWithWindowNibName:@"LocalHistoryPanel"]) == nil) + return nil; + + browser = bw; + + return self; } -- (void) attachToView: (NSView *) view +- (void)attachToView:(NSView *)view { - NSDisableScreenUpdates(); - - ArrowWindow *box = (ArrowWindow *)[self window]; - - [box setContentSize: [history size]]; - [box setArrowPosition: 50]; - [history updateHistory]; - [box attachToView: view]; - - NSRect frame = [box frame]; - NSRect screenFrame = [[box screen] visibleFrame]; - - const CGFloat arrowSize = [box arrowSize]; - frame.origin.x += arrowSize; - frame.origin.y += arrowSize; - frame.size.width -= 2 * arrowSize; - frame.size.height -= 2 * arrowSize; - - if (NSMinY( frame ) < NSMinY( screenFrame )) { - const CGFloat delta = NSMinY( screenFrame ) - NSMinY( frame ); - frame.size.height -= delta; - frame.origin.y += delta; - } - - CGFloat arrowPositionChange = 50; - if (NSMaxX( frame ) > NSMaxX( screenFrame )) { - const CGFloat delta = NSMaxX( frame ) - NSMaxX( screenFrame ); - arrowPositionChange += delta; - frame.origin.x -= delta; - } - - if (NSMinX( frame ) < NSMinX( screenFrame )) { - const CGFloat delta = NSMinX( screenFrame ) - NSMinX( frame ); - arrowPositionChange -= delta; - frame.origin.x += delta; - frame.size.width -= delta; - } - - frame.origin.x -= arrowSize; - frame.origin.y -= arrowSize; - frame.size.width += 2 * arrowSize; - frame.size.height += 2 * arrowSize; - - [box setArrowPosition: arrowPositionChange]; - [box setFrame: frame display: YES]; - - NSEnableScreenUpdates(); + NSDisableScreenUpdates(); + + ArrowWindow *box = (ArrowWindow *)[self window]; + + [box setContentSize:[history size]]; + [box setArrowPosition:50]; + [history updateHistory]; + [box attachToView:view]; + + NSRect frame = [box frame]; + NSRect screenFrame = [[box screen] visibleFrame]; + + const CGFloat arrowSize = [box arrowSize]; + frame.origin.x += arrowSize; + frame.origin.y += arrowSize; + frame.size.width -= 2 * arrowSize; + frame.size.height -= 2 * arrowSize; + + if (NSMinY(frame) < NSMinY(screenFrame)) { + const CGFloat delta = NSMinY(screenFrame) - NSMinY(frame); + frame.size.height -= delta; + frame.origin.y += delta; + } + + CGFloat arrowPositionChange = 50; + if (NSMaxX(frame) > NSMaxX(screenFrame)) { + const CGFloat delta = NSMaxX(frame) - NSMaxX(screenFrame); + arrowPositionChange += delta; + frame.origin.x -= delta; + } + + if (NSMinX(frame) < NSMinX(screenFrame)) { + const CGFloat delta = NSMinX(screenFrame) - NSMinX(frame); + arrowPositionChange -= delta; + frame.origin.x += delta; + frame.size.width -= delta; + } + + frame.origin.x -= arrowSize; + frame.origin.y -= arrowSize; + frame.size.width += 2 * arrowSize; + frame.size.height += 2 * arrowSize; + + [box setArrowPosition:arrowPositionChange]; + [box setFrame:frame display:YES]; + + NSEnableScreenUpdates(); } -- (void) detach +- (void)detach { - [(ArrowWindow *)[self window] detach]; + [(ArrowWindow *)[self window] detach]; } -- (void) windowDidLoad +- (void)windowDidLoad { - [history setBrowser: browser]; + [history setBrowser:browser]; } -- (void) redraw +- (void)redraw { - [history setNeedsDisplay: YES]; + [history setNeedsDisplay:YES]; } -- (void) keyDown: (NSEvent *)theEvent +- (void)keyDown:(NSEvent *)theEvent { - unichar key = [[theEvent characters] characterAtIndex: 0]; - switch (key) { - case 27: - [browser setHistoryVisible: NO]; - break; - - default: - NSBeep(); - break; - }; + unichar key = [[theEvent characters] characterAtIndex:0]; + switch (key) { + case 27: + [browser setHistoryVisible:NO]; + break; + + default: + NSBeep(); + break; + }; } @end |