summaryrefslogtreecommitdiff
path: root/cocoa/HistoryView.m
diff options
context:
space:
mode:
Diffstat (limited to 'cocoa/HistoryView.m')
-rw-r--r--cocoa/HistoryView.m56
1 files changed, 3 insertions, 53 deletions
diff --git a/cocoa/HistoryView.m b/cocoa/HistoryView.m
index 3315d252d..d18f1eb50 100644
--- a/cocoa/HistoryView.m
+++ b/cocoa/HistoryView.m
@@ -29,76 +29,27 @@ static NSRect cocoa_history_rect( struct browser_window *bw )
{
int width, height;
history_size( bw->history, &width, &height );
- return cocoa_rect( 0, 0, width + 10, height + 10 );
+ return cocoa_rect( 0, 0, width, height );
}
@implementation HistoryView
@synthesize browser;
-- (id)initWithBrowser: (struct browser_window *)bw;
+- (void) setBrowser: (struct browser_window *) bw;
{
- NSParameterAssert( NULL != bw );
- if ((self = [super initWithFrame: cocoa_history_rect( bw )]) == nil) return nil;
-
browser = bw;
-
- return self;
+ [self updateHistory];
}
- (void) updateHistory;
{
[self setFrameSize: cocoa_history_rect( browser ).size];
-
- NSView *superView = [self superview];
- if (nil != superView) {
- NSRect visibleRect = [superView visibleRect];
- NSRect rect = [self frame];
- NSRect frame = [superView frame];
-
- rect.origin.x = visibleRect.origin.x + (NSWidth( visibleRect ) - NSWidth( rect )) / 2.0;
- rect.origin.x = MAX( rect.origin.x, frame.origin.x );
-
- rect.origin.y = visibleRect.origin.y + (NSHeight( visibleRect ) - NSHeight( rect )) / 2.0;
- rect.origin.y = MAX( rect.origin.y, frame.origin.y );
-
- [self setFrameOrigin: rect.origin];
- }
-
[self setNeedsDisplay: YES];
}
-- (void) fadeIntoView: (NSView *) superView;
-{
- [self setAlphaValue: 0];
- [superView addSubview: self];
- [[self animator] setAlphaValue: 1.0];
-}
-
-- (void) fadeOut;
-{
- [[self animator] setAlphaValue: 0.0];
- [self performSelector: @selector(removeFromSuperview) withObject: nil
- afterDelay: [[NSAnimationContext currentContext] duration]];
-}
-
-- (void) viewDidMoveToSuperview;
-{
- [self updateHistory];
-}
-
- (void) drawRect: (NSRect)rect;
{
- NSBezierPath *path = [NSBezierPath bezierPathWithRoundedRect: NSInsetRect( [self bounds], 5, 5 )
- xRadius: 10 yRadius: 10];
-
- [[NSColor colorWithDeviceWhite: 0 alpha: 0.8] setFill];
- [path fill];
-
- [path setLineWidth: 2.0];
- [[NSColor whiteColor] set];
- [path stroke];
-
cocoa_set_font_scale_factor( 1.0 );
cocoa_set_clip( rect );
@@ -119,5 +70,4 @@ static NSRect cocoa_history_rect( struct browser_window *bw )
return YES;
}
-
@end