adium 4351:cabe83e56b8d: Disable elastic scroll in Change User P...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/cabe83e56b8d
revision:	4351:cabe83e56b8d
branch:		(none)
author:		Adrian Godoroja <robotive at me.com>
date:		Mon Dec 05 22:52:41 2011 +0200

Disable elastic scroll in Change User Picture Menu.
Remove double #include of AIApplicationAdditions.h in AIStandardListScrollView.m

diffs (26 lines):

diff -r c36603d1df38 -r cabe83e56b8d Source/AIContactListUserPictureMenuController.m
--- a/Source/AIContactListUserPictureMenuController.m	Mon Dec 05 11:28:27 2011 +0100
+++ b/Source/AIContactListUserPictureMenuController.m	Mon Dec 05 22:52:41 2011 +0200
@@ -75,6 +75,11 @@
 		[imageCollectionView setMaxNumberOfColumns:5];
 		[imageCollectionView setMaxNumberOfRows:2];
 		[imageCollectionView setMaxItemSize:NSMakeSize(36.0f, 36.0f)];
+		// Disable elastic scroll
+		// Remove the check on 10.7+
+		if ([[imageCollectionView enclosingScrollView] respondsToSelector:@selector(setVerticalScrollElasticity:)]) {
+			[[imageCollectionView enclosingScrollView] setVerticalScrollElasticity:1]; // Swap 1 with NSScrollElasticityNone on 10.7+
+		}
 		
 		NSMutableArray *pictures = [self recentSmallPictures];
 		NSSize pictureSize = NSMakeSize(32.0f, 32.0f);
diff -r c36603d1df38 -r cabe83e56b8d Source/AIStandardListScrollView.m
--- a/Source/AIStandardListScrollView.m	Mon Dec 05 11:28:27 2011 +0100
+++ b/Source/AIStandardListScrollView.m	Mon Dec 05 22:52:41 2011 +0200
@@ -15,7 +15,6 @@
  */
 
 #import "AIStandardListScrollView.h"
-#import "AIApplicationAdditions.h"
 #import <AIUtilities/AIApplicationAdditions.h>
 
 @implementation AIStandardListScrollView