Changeset 22967

Timestamp:

03/21/2008 10:34:21 PM (8 months ago)

Author:

evands

Message:

Merged [22966]: Each message view controller now provides a unique undo manager to its message entry text view. If we don't do this, we end up with a single undo manager for the whole window per the documentation on the undo manager hierarchy.

This fixes a number of obscure undo/redo bugs in the message window, including crashes after closing a tab and invoking undo/redo (fixes #9511) and undo/redo working across multiple tabs (only one of which is visible) which was just weird.

Files:

• branches/adium-1.2/Plugins/Dual Window Interface/AIMessageViewController.h (modified) (1 diff)
• branches/adium-1.2/Plugins/Dual Window Interface/AIMessageViewController.m (modified) (2 diffs)

branches/adium-1.2/Plugins/Dual Window Interface/AIMessageViewController.h

@@ -66 +66 @@
-        int                                             entryMinHeight;
-        int                                             userListMinWidth;
+
+        NSUndoManager           *undoManager;
-}
-

branches/adium-1.2/Plugins/Dual Window Interface/AIMessageViewController.m

@@ -222 +222 @@
-        //release menuItem
-        [showHide release];
+        
+        [undoManager release]; undoManager = nil;
+
-    [super dealloc];
-}
@@ -1125 +1128 @@
-}       
-
+#pragma mark Undo
+- (NSUndoManager *)undoManagerForTextView:(NSTextView *)aTextView
+{
+        if (!undoManager)
+                undoManager = [[NSUndoManager alloc] init];
+
+        return undoManager;
+}
+
+
-@end