Changeset 3627

Show
Ignore:
Timestamp:
03/18/07 17:09:44 (2 years ago)
Author:
timothy
Message:

Don't call disableFlushWindow if flushing is already disabled. Nesting these calls should work, but they are not... #940

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Views/JVStyleView.m

    r3624 r3627  
    577577                [self clearScrollbarMarks]; 
    578578 
    579                 [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector( _enableFlushWindowTimeout ) object:nil]; 
    580  
     579                [[self window] displayIfNeeded]; 
    581580                if( [[self window] isFlushWindowDisabled] ) 
    582581                        [[self window] enableFlushWindow]; 
    583                 [[self window] displayIfNeeded]; 
     582                [[self window] flushWindowIfNeeded]; 
    584583 
    585584                [self performSelector:@selector( _contentFrameIsReady ) withObject:nil afterDelay:0.]; 
    …… 
    718717        } else _lastScrollPosition = 0; 
    719718 
    720         [[self window] disableFlushWindow]; 
    721         [self performSelector:@selector( _enableFlushWindowTimeout ) withObject:nil afterDelay:2.]; 
     719        if( ! [[self window] isFlushWindowDisabled] ) 
     720               [[self window] disableFlushWindow]; 
    722721 
    723722        if( _mainFrameReady ) { 
    …… 
    729728                [[self mainFrame] loadRequest:request]; 
    730729        } 
    731 } 
    732  
    733 - (void) _enableFlushWindowTimeout { 
    734         if( [[self window] isFlushWindowDisabled] ) 
    735                 [[self window] enableFlushWindow]; 
    736730} 
    737731