summaryrefslogtreecommitdiff
path: root/frontends/cocoa/HistoryView.m
diff options
context:
space:
mode:
Diffstat (limited to 'frontends/cocoa/HistoryView.m')
-rw-r--r--frontends/cocoa/HistoryView.m153
1 files changed, 77 insertions, 76 deletions
diff --git a/frontends/cocoa/HistoryView.m b/frontends/cocoa/HistoryView.m
index 00a7d4abc..94d526123 100644
--- a/frontends/cocoa/HistoryView.m
+++ b/frontends/cocoa/HistoryView.m
@@ -30,116 +30,117 @@
@synthesize browser = browserView;
-- (void) setBrowser: (BrowserView *) bw
+- (void)setBrowser:(BrowserView *)bw
{
- browserView = bw;
- browser = [bw browser];
- [self updateHistory];
+ browserView = bw;
+ browser = [bw browser];
+ [self updateHistory];
}
-- (NSSize) size
+- (NSSize)size
{
- int width, height;
- browser_window_history_size( browser, &width, &height );
-
- return cocoa_size( width, height );
+ int width, height;
+ browser_window_history_size(browser, &width, &height);
+
+ return cocoa_size(width, height);
}
-- (void) updateHistory
+- (void)updateHistory
{
- [self setFrameSize: [self size]];
- [self setNeedsDisplay: YES];
+ [self setFrameSize:[self size]];
+ [self setNeedsDisplay:YES];
}
-- (void) drawRect: (NSRect)rect
+- (void)drawRect:(NSRect)rect
{
- [[NSColor clearColor] set];
- [NSBezierPath fillRect: rect];
-
- struct redraw_context ctx = {
- .interactive = true,
- .background_images = true,
- .plot = &cocoa_plotters
- };
-
- cocoa_set_clip( rect );
-
- browser_window_history_redraw( browser, &ctx );
+ [[NSColor clearColor] set];
+ [NSBezierPath fillRect:rect];
+
+ struct redraw_context ctx = {
+ .interactive = true,
+ .background_images = true,
+ .plot = &cocoa_plotters
+ };
+
+ cocoa_set_clip(rect);
+
+ browser_window_history_redraw(browser, &ctx);
}
-- (void) mouseUp: (NSEvent *)theEvent
+- (void)mouseUp:(NSEvent *)theEvent
{
- const NSPoint location = [self convertPoint: [theEvent locationInWindow] fromView: nil];
- const bool newWindow = [theEvent modifierFlags] & NSEventModifierFlagCommand;
- if (browser_window_history_click( browser,
- cocoa_pt_to_px( location.x ), cocoa_pt_to_px( location.y ),
- newWindow )) {
- [browserView setHistoryVisible: NO];
- }
+ const NSPoint location = [self convertPoint:[theEvent locationInWindow] fromView:nil];
+ const bool newWindow = [theEvent modifierFlags] & NSEventModifierFlagCommand;
+ if (browser_window_history_click(browser,
+ cocoa_pt_to_px(location.x), cocoa_pt_to_px(location.y),
+ newWindow)) {
+ [browserView setHistoryVisible:NO];
+ }
}
-- (BOOL) isFlipped
+- (BOOL)isFlipped
{
- return YES;
+ return YES;
}
-- (void) mouseEntered: (NSEvent *) event
+- (void)mouseEntered:(NSEvent *)event
{
- [[NSCursor pointingHandCursor] set];
+ [[NSCursor pointingHandCursor] set];
}
-- (void) mouseExited: (NSEvent *) event
+- (void)mouseExited:(NSEvent *)event
{
- [[NSCursor arrowCursor] set];
+ [[NSCursor arrowCursor] set];
}
-static bool cursor_rects_cb( const struct browser_window *bw, int x0, int y0, int x1, int y1,
- const struct history_entry *page, void *user_data )
+static bool cursor_rects_cb(const struct browser_window *bw, int x0, int y0, int x1, int y1,
+ const struct history_entry *page, void *user_data)
{
- HistoryView *view = (__bridge HistoryView *)user_data;
-
- NSRect rect = NSIntersectionRect( [view visibleRect], cocoa_rect( x0, y0, x1, y1 ) );
- if (!NSIsEmptyRect( rect )) {
-
- NSString *toolTip = [NSString stringWithFormat: @"%s\n%s", browser_window_history_entry_get_title(page),
- browser_window_history_entry_get_url( page )];
-
- [view addToolTipRect: rect owner: toolTip userData: nil];
- NSTrackingArea *area = [[NSTrackingArea alloc] initWithRect: rect
- options: NSTrackingMouseEnteredAndExited | NSTrackingActiveInActiveApp
- owner: view userInfo: nil];
- [view addTrackingArea: area];
- }
-
- return true;
+ HistoryView *view = (__bridge HistoryView *)user_data;
+
+ NSRect rect = NSIntersectionRect([view visibleRect], cocoa_rect(x0, y0, x1, y1));
+ if (!NSIsEmptyRect(rect)) {
+
+ NSString *toolTip = [NSString stringWithFormat:@"%s\n%s", browser_window_history_entry_get_title(page),
+ browser_window_history_entry_get_url(page)];
+
+ [view addToolTipRect:rect owner:toolTip userData:nil];
+ NSTrackingArea *area = [[NSTrackingArea alloc] initWithRect:rect
+ options:NSTrackingMouseEnteredAndExited | NSTrackingActiveInActiveApp
+ owner:view
+ userInfo:nil];
+ [view addTrackingArea:area];
+ }
+
+ return true;
}
-- (NSToolTipTag)addToolTipRect: (NSRect) rect owner: (id) owner userData: (void *) userData
+- (NSToolTipTag)addToolTipRect:(NSRect)rect owner:(id)owner userData:(void *)userData
{
- if (toolTips == nil) toolTips = [[NSMutableArray alloc] init];
- [toolTips addObject: owner];
-
- return [super addToolTipRect: rect owner: owner userData: userData];
+ if (toolTips == nil)
+ toolTips = [[NSMutableArray alloc] init];
+ [toolTips addObject:owner];
+
+ return [super addToolTipRect:rect owner:owner userData:userData];
}
-- (void) removeAllToolTips
+- (void)removeAllToolTips
{
- [super removeAllToolTips];
- [toolTips removeAllObjects];
+ [super removeAllToolTips];
+ [toolTips removeAllObjects];
}
-- (void) updateTrackingAreas
+- (void)updateTrackingAreas
{
- [self removeAllToolTips];
-
- for (NSTrackingArea *area in [self trackingAreas]) {
- [self removeTrackingArea: area];
- }
-
- browser_window_history_enumerate( browser, cursor_rects_cb, (__bridge void *)self );
-
- [super updateTrackingAreas];
-}
+ [self removeAllToolTips];
+ for (NSTrackingArea *area in [self trackingAreas]) {
+ [self removeTrackingArea:area];
+ }
+
+ browser_window_history_enumerate(browser, cursor_rects_cb, (__bridge void *)self);
+
+ [super updateTrackingAreas];
+}
@end