adium 5164:8d2662469229: Use a similar colour scheme for the Acc...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/8d2662469229
revision:	5164:8d2662469229
branch:		adium-1.6
author:		Paul Wilde <me at paulwilde.co.uk>
date:		Mon Oct 22 00:37:30 2012 +0100

Use a similar colour scheme for the Account Selection view to the one used by Safari's in-line search.
Subject: adium 5165:ba94329ea106: Merge.

details:	http://hg.adium.im/adium/rev/ba94329ea106
revision:	5165:ba94329ea106
branch:		adium-1.6
author:		Paul Wilde <me at paulwilde.co.uk>
date:		Mon Oct 22 00:40:37 2012 +0100

Merge.

diffs (57 lines):

diff -r d59705c34be0 -r ba94329ea106 Plugins/Dual Window Interface/AIAccountSelectionView.m
--- a/Plugins/Dual Window Interface/AIAccountSelectionView.m	Mon Oct 22 00:38:23 2012 +0200
+++ b/Plugins/Dual Window Interface/AIAccountSelectionView.m	Mon Oct 22 00:40:37 2012 +0100
@@ -22,8 +22,8 @@
 -(void)drawRect:(NSRect)aRect
 {
     NSBezierPath *path = [NSBezierPath bezierPathWithRect:self.bounds];
-    [path linearGradientFillWithStartColor:[NSColor colorWithCalibratedWhite:0.80f alpha:1.0f]
-                                  endColor:[NSColor colorWithCalibratedWhite:0.95f alpha:1.0f]];
+    [path linearGradientFillWithStartColor:[NSColor colorWithCalibratedWhite:0.79f alpha:1.0f]
+                                  endColor:[NSColor colorWithCalibratedWhite:0.91f alpha:1.0f]];
     
     path = [NSBezierPath bezierPath];
     
@@ -32,7 +32,7 @@
     [path moveToPoint:NSMakePoint(NSMinX(self.bounds), NSMinY(self.bounds))];
     [path lineToPoint:NSMakePoint(NSMaxX(self.bounds), NSMinY(self.bounds))];
     
-    [[NSColor colorWithCalibratedWhite:0.65f alpha:1.0f] setStroke];
+    [[NSColor colorWithCalibratedWhite:0.45f alpha:1.0f] setStroke];
     [path stroke];
 }
 
diff -r d59705c34be0 -r ba94329ea106 Plugins/Dual Window Interface/AIMessageViewController.m
--- a/Plugins/Dual Window Interface/AIMessageViewController.m	Mon Oct 22 00:38:23 2012 +0200
+++ b/Plugins/Dual Window Interface/AIMessageViewController.m	Mon Oct 22 00:40:37 2012 +0100
@@ -1394,22 +1394,26 @@
     }
     
     NSSize splitViewSize = NSMakeSize(NSWidth(view_contents.frame), NSHeight(view_contents.frame) - yPosition);
+    
+    [NSAnimationContext beginGrouping];
+    [[NSAnimationContext currentContext] setDuration:0.05];
     if (splitViewSize.height != NSHeight(splitView_verticalSplit.frame)) {
         [splitView_verticalSplit.animator setFrameSize:splitViewSize];
     }
     
-    [view_topBars setFrameSize:NSMakeSize(NSWidth(view_contents.frame), yPosition)];
-    [view_topBars setFrameOrigin:NSMakePoint(NSMinX(view_contents.frame), NSMaxY(view_contents.frame) - yPosition)];
+    [view_topBars.animator setFrameSize:NSMakeSize(NSWidth(view_contents.frame), yPosition)];
+    [view_topBars.animator setFrameOrigin:NSMakePoint(NSMinX(view_contents.frame), NSMaxY(view_contents.frame) - yPosition)];
     
     yPosition = 0.0f;
     for (AIMessageViewTopBarController *existingController in topBarControllers.reverseObjectEnumerator) {
         if (![existingController.view isHidden]) {
-            [existingController.view setFrameOrigin:NSMakePoint(0.0f, yPosition)];
-            [existingController.view setFrameSize:NSMakeSize(NSWidth(view_contents.frame), NSHeight(existingController.view.frame))];
+            [existingController.view.animator setFrameOrigin:NSMakePoint(0.0f, yPosition)];
+            [existingController.view.animator setFrameSize:NSMakeSize(NSWidth(view_contents.frame), NSHeight(existingController.view.frame))];
             yPosition += NSHeight(existingController.view.frame);
         }
     }
     
+    [NSAnimationContext endGrouping];
     [self _updateTextEntryViewHeight];
 }