From 18aefabd20a16dda9ed5363088f0da5ada0d4431 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Mon, 30 Jun 2014 16:40:56 +0100 Subject: change reformat to be driven from the scheduler like redraw --- cocoa/BrowserView.m | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) (limited to 'cocoa/BrowserView.m') diff --git a/cocoa/BrowserView.m b/cocoa/BrowserView.m index b0042f760..2a3382c8c 100644 --- a/cocoa/BrowserView.m +++ b/cocoa/BrowserView.m @@ -38,7 +38,6 @@ - (void) scrollVertical: (CGFloat) amount; - (CGFloat) pageScroll; -+ (void)reformatTimerFired: (NSTimer *) timer; - (void) reformat; - (void) popUpContextMenuForEvent: (NSEvent *) event; @@ -60,8 +59,6 @@ static const CGFloat CaretWidth = 1.0; static const NSTimeInterval CaretBlinkTime = 0.8; -static NSMutableArray *cocoa_reformat_pending = nil; - - initWithFrame: (NSRect) frame; { @@ -438,13 +435,7 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt ) - (void) adjustFrame; { - browser->reformat_pending = true; - browser_reformat_pending = true; - - if (cocoa_reformat_pending == nil) { - cocoa_reformat_pending = [[NSMutableArray alloc] init]; - } - [cocoa_reformat_pending addObject: self]; + browser_window_schedule_reformat(browser); [super adjustFrame]; } @@ -492,24 +483,6 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt ) browser_window_reformat( browser, false, cocoa_pt_to_px( NSWidth( size ) ), cocoa_pt_to_px( NSHeight( size ) ) ); } -+ (void)reformatTimerFired: (NSTimer *) timer; -{ - if (browser_reformat_pending) { - [cocoa_reformat_pending makeObjectsPerformSelector: @selector( reformat )]; - [cocoa_reformat_pending removeAllObjects]; - browser_reformat_pending = false; - } -} - -+ (void) initialize; -{ - NSTimer *timer = [[NSTimer alloc] initWithFireDate: nil interval: 0.02 - target: self selector: @selector(reformatTimerFired:) - userInfo: nil repeats: YES]; - [[NSRunLoop currentRunLoop] addTimer: timer forMode: NSRunLoopCommonModes]; - [timer release]; -} - - (void) popUpContextMenuForEvent: (NSEvent *) event; { if (content_get_type( browser->current_content ) != CONTENT_HTML) return; -- cgit v1.2.3