Changeset 3471

Timestamp:

12/17/06 22:35:56 (2 years ago)

Author:

timothy

Message:

Adds a safe guard to prevent the chat window from 'freezing' and not updating it's display until minimized. Also some code clean up. #940

Files:

• trunk/Controllers/JVChatWindowController.m (modified) (2 diffs)
• trunk/Controllers/JVSidebarChatWindowController.m (modified) (2 diffs)
• trunk/Controllers/JVTabbedChatWindowController.m (modified) (3 diffs)
• trunk/Panels/JVChatConsolePanel.m (modified) (1 diff)
• trunk/Panels/JVDirectChatPanel.m (modified) (1 diff)
• trunk/Preferences/JVAppearancePreferences.m (modified) (2 diffs)
• trunk/Views/JVStyleView.m (modified) (4 diffs)

trunk/Controllers/JVChatWindowController.m

@@ -984 +984 @@
-
-- (void) _refreshWindow {
+        id item = [self selectedListItem];
+        if( ! item ) return;
+
-        [[self window] disableFlushWindow];
-
-        id item = [self selectedListItem];
-        if( ! item ) goto end;
-
-        if( ( [item conformsToProtocol:@protocol( JVChatViewController )] && item != (id) _activeViewController ) || ( ! _activeViewController && [[item parent] conformsToProtocol:@protocol( JVChatViewController )] && ( item = [item parent] ) ) ) {
@@ -1021 +1021 @@
-        [self _refreshWindowTitle];
-
-
-
+
+       
-        [[self window] displayIfNeeded];
-}

trunk/Controllers/JVSidebarChatWindowController.m

@@ -71 +71 @@
-
-- (void) _refreshWindow {
+        id item = [self selectedListItem];
+        if( ! item ) return;
+
-        [[self window] disableFlushWindow];
-
-        id item = [self selectedListItem];
-        if( ! item ) goto end;
-
-        if( ( [item conformsToProtocol:@protocol( JVChatViewController )] && item != (id) _activeViewController ) || ( ! _activeViewController && [[item parent] conformsToProtocol:@protocol( JVChatViewController )] && ( item = [item parent] ) ) ) {
@@ -111 +111 @@
-        [self _refreshWindowTitle];
-
-
-
+
+       
-        [[self window] displayIfNeeded];
-}

trunk/Controllers/JVTabbedChatWindowController.m

@@ -529 +529 @@
-        [tabView setNeedsDisplay:YES];
-
-
+
+
-        [[self window] displayIfNeeded];
-
@@ -537 +538 @@
-
-- (void) _refreshWindow {
+        id item = [(JVChatTabItem *)[tabView selectedTabViewItem] chatViewController];
+        if( ! item ) return;
+
-        [[self window] disableFlushWindow];
-
-        id item = [(JVChatTabItem *)[tabView selectedTabViewItem] chatViewController];
-        if( ! item ) goto end;
-
-        if( ( [item conformsToProtocol:@protocol( JVChatViewController )] && item != (id) _activeViewController ) || ( ! _activeViewController && [[item parent] conformsToProtocol:@protocol( JVChatViewController )] && ( item = [item parent] ) ) ) {
@@ -570 +571 @@
-        [self _refreshWindowTitle];
-
-
-
+
+       
-        [[self window] displayIfNeeded];
-}

trunk/Panels/JVChatConsolePanel.m

@@ -490 +490 @@
-
-        [splitView setNeedsDisplay:YES]; // makes the divider redraw correctly later
-
+
+
-        [[display window] displayIfNeeded];
-}

trunk/Panels/JVDirectChatPanel.m

@@ -1211 +1211 @@
-
-        [splitView setNeedsDisplay:YES]; // makes the divider redraw correctly later
-
+
+
-        [[display window] displayIfNeeded];
-}

trunk/Preferences/JVAppearancePreferences.m

@@ -99 +99 @@
-
-#pragma mark -
-
-- (void) awakeFromNib {
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector( styleDidReload: ) name:JVStyleViewDidChangeStylesNotification object:preview];
-}
-
-- (void) initializeFromDefaults {
@@ -291 +287 @@
-- (void) updateVariant {
-        [preview setStyleVariant:[_style defaultVariantName]];
-
-        if( [[preview window] isFlushWindowDisabled] ) [[preview window] enableFlushWindow];
-
-        [[preview window] disableFlushWindow];
-        [preview reloadCurrentStyle];
-}
-
-- (void) styleDidReload:(NSNotification *) notification {
-        if( [[preview window] isFlushWindowDisabled] ) [[preview window] enableFlushWindow];
-        [[preview window] displayIfNeeded];
-}
-

trunk/Views/JVStyleView.m

@@ -502 +502 @@
-                }
-
-[_domDocument autorelease]
+id old = _domDocument
-                _domDocument = (DOMHTMLDocument *)[[frame DOMDocument] retain];
-
-
+
+
+
-                _body = (DOMHTMLElement *)[[_domDocument getElementById:@"contents"] retain];
-                if( ! _body ) _body = (DOMHTMLElement *)[[_domDocument body] retain];
+                [old release];
-
-                [self performSelector:@selector( _checkForTransparantStyle ) withObject:nil afterDelay:0.];
@@ -515 +517 @@
-                [self clearScrollbarMarks];
-
-
+
+
+
+
-                [[self window] displayIfNeeded];
-
@@ -665 +670 @@
-
-        [[self window] disableFlushWindow];
+        [self performSelector:@selector( _enableFlushWindowTimeout ) withObject:nil afterDelay:2.];
-
-        if( _mainFrameReady ) {
@@ -674 +680 @@
-                [[self mainFrame] loadRequest:request];
-        }
+}
+
+- (void) _enableFlushWindowTimeout {
+        if( [[self window] isFlushWindowDisabled] )
+                [[self window] enableFlushWindow];
-}
-