Changeset 3473

Show
Ignore:
Timestamp:
12/18/06 23:43:00 (2 years ago)
Author:
timothy
Message:

Reverting my last change, it caused a white flash when reloading styles.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Models/JVSQLChatTranscript.m

    r3406 r3473  
    358358                } 
    359359 
    360                 sqlite3_bind_int64( compiledMsgQuery, 1, 0 ); // context 
    361                 sqlite3_bind_int64( compiledMsgQuery, 2, 0 ); // session 
     360                sqlite3_bind_int64( compiledMsgQuery, 1, _currentContext ); // context 
     361                sqlite3_bind_int64( compiledMsgQuery, 2, _currentSession ); // session 
    362362                sqlite3_bind_int64( compiledMsgQuery, 3, userIdentifier ); // user 
    363363                if( [message date] ) sqlite3_bind_text( compiledMsgQuery, 4, [[[message date] description] UTF8String], -1, SQLITE_STATIC ); // received 
    …… 
    446446                } 
    447447 
    448                 sqlite3_bind_int64( compiledQuery, 1, 0 ); // context 
    449                 sqlite3_bind_int64( compiledQuery, 2, 0 ); // session 
     448                sqlite3_bind_int64( compiledQuery, 1, _currentContext ); // context 
     449                sqlite3_bind_int64( compiledQuery, 2, _currentSession ); // session 
    450450                if( [event name] ) sqlite3_bind_text( compiledQuery, 3, [[event name] UTF8String], -1, SQLITE_STATIC ); // name 
    451451                if( [event date] ) sqlite3_bind_text( compiledQuery, 4, [[[event date] description] UTF8String], -1, SQLITE_STATIC ); // occurred 

  • trunk/Views/JVStyleView.m

    r3472 r3473  
    517517                [self clearScrollbarMarks]; 
    518518 
     519                [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector( _enableFlushWindowTimeout ) object:nil]; 
     520 
     521                if( [[self window] isFlushWindowDisabled] ) 
     522                        [[self window] enableFlushWindow]; 
     523                [[self window] displayIfNeeded]; 
     524 
    519525                [self performSelector:@selector( _contentFrameIsReady ) withObject:nil afterDelay:0.]; 
    520526        } 
    …… 
    658664        } else _lastScrollPosition = 0; 
    659665 
    660         if( [self respondsToSelector:@selector(setBackgroundColor:)] ) 
    661                 [self setBackgroundColor:[NSColor whiteColor]]; 
    662         else [self setDrawsBackground:YES]; 
     666        [[self window] disableFlushWindow]; 
     667        [self performSelector:@selector( _enableFlushWindowTimeout ) withObject:nil afterDelay:2.]; 
    663668 
    664669        if( _mainFrameReady ) { 
    …… 
    670675                [[self mainFrame] loadRequest:request]; 
    671676        } 
     677} 
     678 
     679- (void) _enableFlushWindowTimeout { 
     680        if( [[self window] isFlushWindowDisabled] ) 
     681                [[self window] enableFlushWindow]; 
    672682} 
    673683