Changeset 813 for trunk/macosx

Timestamp:

Aug 22, 2006, 1:08:44 AM (16 years ago)

Author:

livings124

Message:

Empty (and display) buffer right away when changing message level, and update the log a little more often.

Location:

trunk/macosx

Files:

• English.lproj/MessageWindow.nib/classes.nib (modified) (1 diff)
• English.lproj/MessageWindow.nib/keyedobjects.nib (modified) (previous)
• MessageWindowController.h (modified) (1 diff)
• MessageWindowController.m (modified) (4 diffs)

trunk/macosx/English.lproj/MessageWindow.nib/classes.nib

@@ -6 +6 @@
             CLASS = MessageWindowController; 
             LANGUAGE = ObjC; 
-            OUTLETS = {fLevelButton = NSPopUpButton; fTextView = NSTextView; }; 
+            OUTLETS = {
+                fLevelButton = NSPopUpButton; 
+                fScrollView = NSScrollView; 
+                fTextView = NSTextView; 
+            }; 
             SUPERCLASS = NSWindowController; 
         }

trunk/macosx/MessageWindowController.h

@@ -28 +28 @@
 {
     IBOutlet NSTextView * fTextView;
+    IBOutlet NSScrollView * fScrollView;
+    
     IBOutlet NSPopUpButton * fLevelButton;
     

trunk/macosx/MessageWindowController.m

@@ -30 +30 @@
 #define LEVEL_DEBUG 2
 
-#define UPDATE_SECONDS 0.5
+#define UPDATE_SECONDS 0.35
 
 @interface MessageWindowController (Private)
@@ -124 +124 @@
         return;
     
+    //keep scrolled to bottom if already at bottom or there is no scroll bar yet
+    BOOL shouldScroll = NO;
+    NSScroller * scroller = [fScrollView verticalScroller];
+    if ([scroller floatValue] == 1.0 || [scroller isHidden] || [scroller knobProportion] == 1.0)
+        shouldScroll = YES;
+    
     [fLock lock];
     
@@ -130 +136 @@
     while ((messageString = [enumerator nextObject]))
         [[fTextView textStorage] appendAttributedString: messageString];
-    
     [fBufferArray removeAllObjects];
     
     [fLock unlock];
+    
+    if (shouldScroll)
+        [fTextView scrollRangeToVisible: NSMakeRange([[fTextView string] length], 0)];
 }
 
@@ -145 +153 @@
     else
         level = TR_MSG_ERR;
+    
+    [self updateLog: nil];
     
     tr_setMessageLevel(level);