[Adium-commits] adium 1998:a0cfaa0f04e2: Correct the type here
adium-commits at adiumx.com
adium-commits at adiumx.com
Mon Apr 27 08:19:19 UTC 2009
details: http://hg.adiumx.com/adium/rev/a0cfaa0f04e2
revision: 1998:a0cfaa0f04e2
author: David Smith <catfish.man at gmail.com>
date: Mon Apr 27 01:17:14 2009 -0700
Correct the type here
Subject: adium 1999:0df2d21c69c3: Merge
details: http://hg.adiumx.com/adium/rev/0df2d21c69c3
revision: 1999:0df2d21c69c3
author: David Smith <catfish.man at gmail.com>
date: Mon Apr 27 01:19:10 2009 -0700
Merge
diffstat:
Frameworks/Adium Framework/Source/AIListCell.m | 2 +-
Resources/ContactListWindowBorderless.nib/classes.nib | 83 ++++++++++++++++-
Resources/ContactListWindowBorderless.nib/info.nib | 2 +-
Resources/ContactListWindowBorderless.nib/keyedobjects.nib |
Source/AIListWindowController.m | 24 +++-
5 files changed, 98 insertions(+), 13 deletions(-)
diffs (227 lines):
diff -r 20846a5f630d -r 0df2d21c69c3 Frameworks/Adium Framework/Source/AIListCell.m
--- a/Frameworks/Adium Framework/Source/AIListCell.m Sun Apr 26 17:12:36 2009 -0700
+++ b/Frameworks/Adium Framework/Source/AIListCell.m Mon Apr 27 01:19:10 2009 -0700
@@ -347,7 +347,7 @@
//Attributes for displaying the label string
//Cache is invalidated on font changes,
-- (NSDictionary *)labelAttributes
+- (NSMutableDictionary *)labelAttributes
{
if (!labelAttributes) {
labelAttributes = [[NSMutableDictionary dictionaryWithObjectsAndKeys:
diff -r 20846a5f630d -r 0df2d21c69c3 Resources/ContactListWindowBorderless.nib/classes.nib
--- a/Resources/ContactListWindowBorderless.nib/classes.nib Sun Apr 26 17:12:36 2009 -0700
+++ b/Resources/ContactListWindowBorderless.nib/classes.nib Mon Apr 27 01:19:10 2009 -0700
@@ -6,6 +6,22 @@
<array>
<dict>
<key>CLASS</key>
+ <string>AIAlternatingRowOutlineView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>AIOutlineView</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>NSApplication</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSResponder</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
<string>RBSplitView</string>
<key>LANGUAGE</key>
<string>ObjC</string>
@@ -35,6 +51,14 @@
</dict>
<dict>
<key>CLASS</key>
+ <string>NSMenu</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
<string>NSWindowController</string>
<key>LANGUAGE</key>
<string>ObjC</string>
@@ -90,6 +114,14 @@
<string>AIAnimatingListOutlineView</string>
</dict>
<dict>
+ <key>CLASS</key>
+ <string>NSScrollView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSView</string>
+ </dict>
+ <dict>
<key>ACTIONS</key>
<dict>
<key>close</key>
@@ -125,6 +157,14 @@
</dict>
<dict>
<key>CLASS</key>
+ <string>AIFilterBarView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSView</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
<string>AIBorderlessListWindowController</string>
<key>LANGUAGE</key>
<string>ObjC</string>
@@ -133,11 +173,11 @@
</dict>
<dict>
<key>CLASS</key>
- <string>AIFilterBarView</string>
+ <string>NSView</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
- <string>NSView</string>
+ <string>NSResponder</string>
</dict>
<dict>
<key>CLASS</key>
@@ -145,7 +185,7 @@
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
- <string>AIOutlineView</string>
+ <string>AIVariableHeightOutlineView</string>
</dict>
<dict>
<key>CLASS</key>
@@ -165,6 +205,14 @@
</dict>
<dict>
<key>CLASS</key>
+ <string>NSCell</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
<string>NSButton</string>
<key>LANGUAGE</key>
<string>ObjC</string>
@@ -173,6 +221,14 @@
</dict>
<dict>
<key>CLASS</key>
+ <string>NSOutlineView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSTableView</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
<string>AIBorderlessWindow</string>
<key>LANGUAGE</key>
<string>ObjC</string>
@@ -189,6 +245,19 @@
</dict>
<dict>
<key>CLASS</key>
+ <string>AIVariableHeightOutlineView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>AIAlternatingRowOutlineView</string>
+ </dict>
+ <dict>
+ <key>ACTIONS</key>
+ <dict>
+ <key>performFindPanelAction</key>
+ <string>id</string>
+ </dict>
+ <key>CLASS</key>
<string>AIOutlineView</string>
<key>LANGUAGE</key>
<string>ObjC</string>
@@ -229,6 +298,14 @@
<key>SUPERCLASS</key>
<string>NSScrollView</string>
</dict>
+ <dict>
+ <key>CLASS</key>
+ <string>NSTableView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSControl</string>
+ </dict>
</array>
<key>IBVersion</key>
<string>1</string>
diff -r 20846a5f630d -r 0df2d21c69c3 Resources/ContactListWindowBorderless.nib/info.nib
--- a/Resources/ContactListWindowBorderless.nib/info.nib Sun Apr 26 17:12:36 2009 -0700
+++ b/Resources/ContactListWindowBorderless.nib/info.nib Mon Apr 27 01:19:10 2009 -0700
@@ -10,7 +10,7 @@
<integer>5</integer>
<key>IBOpenObjects</key>
<array>
- <integer>198</integer>
+ <integer>208</integer>
</array>
<key>IBSystem Version</key>
<string>9G55</string>
diff -r 20846a5f630d -r 0df2d21c69c3 Resources/ContactListWindowBorderless.nib/keyedobjects.nib
Binary file Resources/ContactListWindowBorderless.nib/keyedobjects.nib has changed
diff -r 20846a5f630d -r 0df2d21c69c3 Source/AIListWindowController.m
--- a/Source/AIListWindowController.m Sun Apr 26 17:12:36 2009 -0700
+++ b/Source/AIListWindowController.m Mon Apr 27 01:19:10 2009 -0700
@@ -1543,22 +1543,30 @@
targetFrame.size.height = NSHeight(targetFrame) - NSHeight([filterBarView bounds]);
}
+
+ // Filter bar resizing
+ // Create a new variable here, because we want the bar's view to be based, visually, on the location of the contact list, not its enclosing super view.
+ NSRect barTargetFrame = contactListView.frame;
+ if (filterBarIsVisible) {
+ barTargetFrame.size.height = NSHeight(barTargetFrame) + NSHeight(filterBarView.bounds);
+ } else {
+ barTargetFrame.size.height = NSHeight(barTargetFrame) - NSHeight(filterBarView.bounds);
+ }
- // Filter bar resizing
if (!filterBarIsVisible) {
- // If the filter bar isn't already visible
- [filterBarView setFrame:NSMakeRect(NSMinX(targetFrame),
- NSHeight([targetView frame]),
- NSWidth(targetFrame),
+ // If the filter bar isn't already visible
+ [filterBarView setFrame:NSMakeRect(NSMinX(barTargetFrame),
+ NSHeight([contactListView frame]),
+ NSWidth(barTargetFrame),
NSHeight([filterBarView bounds]))];
-
+
// Attach the filter bar to the window
[[[self window] contentView] addSubview:filterBarView];
}
filterBarDict = [NSDictionary dictionaryWithObjectsAndKeys:filterBarView, NSViewAnimationTargetKey,
- [NSValue valueWithRect:NSMakeRect(NSMinX(targetFrame), NSHeight(targetFrame),
- NSWidth(targetFrame), NSHeight([filterBarView bounds]))], NSViewAnimationEndFrameKey, nil];
+ [NSValue valueWithRect:NSMakeRect(NSMinX(barTargetFrame), NSHeight(barTargetFrame),
+ NSWidth(barTargetFrame), NSHeight([filterBarView bounds]))], NSViewAnimationEndFrameKey, nil];
targetViewDict = [NSDictionary dictionaryWithObjectsAndKeys:targetView, NSViewAnimationTargetKey,
[NSValue valueWithRect:targetFrame], NSViewAnimationEndFrameKey, nil];
More information about the commits
mailing list