Changeset 9698

Timestamp:

Dec 10, 2009, 4:44:21 AM (12 years ago)

Author:

livings124

Message:

reset the message index when clearing the log

Location:

trunk/macosx

Files:

• MessageWindowController.h (modified) (1 diff)
• MessageWindowController.m (modified) (3 diffs)
• NSStringAdditions.m (modified) (1 diff)

trunk/macosx/MessageWindowController.h

@@ -33 +33 @@
     
     NSMutableArray * fMessages, * fDisplayedMessages;
+    NSUInteger fCurrentIndex;
     
     NSDictionary * fAttributes;

trunk/macosx/MessageWindowController.m

@@ -154 +154 @@
         return;
     
-    static NSUInteger currentIndex = 0;
-    
     [fLock lock];
     
     NSScroller * scroller = [[fMessageTable enclosingScrollView] verticalScroller];
-    const BOOL shouldScroll = currentIndex == 0 || [scroller floatValue] == 1.0 || [scroller isHidden]
+    const BOOL shouldScroll = fCurrentIndex == 0 || [scroller floatValue] == 1.0 || [scroller isHidden]
                                 || [scroller knobProportion] == 1.0;
     
@@ -176 +174 @@
                                     [NSString stringWithUTF8String: currentMessage->message], @"Message",
                                     [NSDate dateWithTimeIntervalSince1970: currentMessage->when], @"Date",
-                                    [NSNumber numberWithUnsignedInteger: currentIndex++], @"Index", //more accurate when sorting by date
+                                    [NSNumber numberWithUnsignedInteger: fCurrentIndex++], @"Index", //more accurate when sorting by date
                                     [NSNumber numberWithInteger: currentMessage->level], @"Level",
                                     name, @"Name",
@@ -362 +360 @@
     [fDisplayedMessages removeAllObjects];
     [fMessageTable reloadData];
+    fCurrentIndex = 0;
     
     [fLock unlock];

trunk/macosx/NSStringAdditions.m

@@ -154 +154 @@
 }
 
-//also used in InfoWindow.xib
+//also used in InfoWindow.xib and MessageWindow.xib
 - (NSComparisonResult) compareFinder: (NSString *) string
 {