adium 5343:94b3acee0622: Removed some 10.7-- checks. Moved to 10...

commits at adium.im commits at adium.im
Thu Feb 21 20:53:39 UTC 2013


details:	http://hg.adium.im/adium/rev/94b3acee0622
revision:	5343:94b3acee0622
branch:		(none)
author:		Adrian Godoroja <robotive at icloud.com>
date:		Thu Feb 21 21:53:27 2013 +0100

Removed some 10.7-- checks. Moved to 10.7.5.

diffs (90 lines):

diff -r 1f92dea9382b -r 94b3acee0622 Frameworks/AIUtilities Framework/Source/AIDockingWindow.m
--- a/Frameworks/AIUtilities Framework/Source/AIDockingWindow.m	Tue Feb 19 21:52:40 2013 +0100
+++ b/Frameworks/AIUtilities Framework/Source/AIDockingWindow.m	Thu Feb 21 21:53:27 2013 +0100
@@ -75,10 +75,8 @@
 	dockingEnabled = YES;
 	
 	// Disable Lion windows restore feature
-	// XXX - Remove the check on 10.7+
-	if ([self respondsToSelector:@selector(setRestorable:)]) {
-        [self setRestorable:NO]; // Remove on UI rewrite
-    }
+	// XXX: Remove on UI rewrite
+	[self setRestorable:NO];
 }
 
 //Stop observing movement
diff -r 1f92dea9382b -r 94b3acee0622 Frameworks/AIUtilities Framework/Source/JVMarkedScroller.m
--- a/Frameworks/AIUtilities Framework/Source/JVMarkedScroller.m	Tue Feb 19 21:52:40 2013 +0100
+++ b/Frameworks/AIUtilities Framework/Source/JVMarkedScroller.m	Thu Feb 21 21:53:27 2013 +0100
@@ -51,8 +51,8 @@
 	[super drawRect:rect];
 	
 	NSAffineTransform *transform = [NSAffineTransform transform];
-	//Use -scrollerWidthForControlSize:scrollerStyle: on 10.7+
-	CGFloat width = [[self class] scrollerWidthForControlSize:[self controlSize]];
+	
+	CGFloat width =  [[self class] scrollerWidthForControlSize:[self controlSize] scrollerStyle:[self scrollerStyle]];
 	
 	CGFloat scale = [self scaleToContentView];
 	[transform scaleXBy:( sFlags.isHoriz ? scale : 1.f ) yBy:( sFlags.isHoriz ? 1.f : scale )];
diff -r 1f92dea9382b -r 94b3acee0622 Plists/Info.plist
--- a/Plists/Info.plist	Tue Feb 19 21:52:40 2013 +0100
+++ b/Plists/Info.plist	Thu Feb 21 21:53:27 2013 +0100
@@ -475,7 +475,7 @@
 	<key>LSFileQuarantineEnabled</key>
 	<true/>
 	<key>LSMinimumSystemVersion</key>
-	<string>10.6.8</string>
+	<string>10.7.5</string>
 	<key>LSRequiresNativeExecution</key>
 	<true/>
 	<key>NSAppleScriptEnabled</key>
diff -r 1f92dea9382b -r 94b3acee0622 Plugins/Dual Window Interface/AIMessageViewController.m
--- a/Plugins/Dual Window Interface/AIMessageViewController.m	Tue Feb 19 21:52:40 2013 +0100
+++ b/Plugins/Dual Window Interface/AIMessageViewController.m	Thu Feb 21 21:53:27 2013 +0100
@@ -640,11 +640,8 @@
 	[self _updateTextEntryViewHeight];
 	
 	// Disable elastic scroll
-	// Remove the check on 10.7+
 	// Not sure why it won't work in AIMessageEntryTextView
-	if ([[textView_outgoing enclosingScrollView] respondsToSelector:@selector(setVerticalScrollElasticity:)]) {
-		[[textView_outgoing enclosingScrollView] setVerticalScrollElasticity:1]; // Swap 1 with NSScrollElasticityNone on 10.7+
-	}
+	[[textView_outgoing enclosingScrollView] setVerticalScrollElasticity:NSScrollElasticityNone];
 }
 
 /*!
diff -r 1f92dea9382b -r 94b3acee0622 Source/AIContactListUserPictureMenuController.m
--- a/Source/AIContactListUserPictureMenuController.m	Tue Feb 19 21:52:40 2013 +0100
+++ b/Source/AIContactListUserPictureMenuController.m	Thu Feb 21 21:53:27 2013 +0100
@@ -73,11 +73,7 @@
 		[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+
-		}
+		[[imageCollectionView enclosingScrollView] setVerticalScrollElasticity:NSScrollElasticityNone];
 		
 		NSMutableArray *pictures = [self recentSmallPictures];
 		NSSize pictureSize = NSMakeSize(32.0f, 32.0f);
diff -r 1f92dea9382b -r 94b3acee0622 Source/AIListWindowController.m
--- a/Source/AIListWindowController.m	Tue Feb 19 21:52:40 2013 +0100
+++ b/Source/AIListWindowController.m	Thu Feb 21 21:53:27 2013 +0100
@@ -362,10 +362,9 @@
 		}
 		
 		/* Avoid the bouncing effect when scrolling on Lion. This looks very bad when using a borderless window.
-		 * TODO: (10.7+) remove this if
 		 */
-		if (windowStyle != AIContactListWindowStyleStandard && [scrollView_contactList respondsToSelector:@selector(setVerticalScrollElasticity:)]) {
-			[scrollView_contactList setVerticalScrollElasticity:1]; // NSScrollElasticityNone
+		if (windowStyle != AIContactListWindowStyleStandard) {
+			[scrollView_contactList setVerticalScrollElasticity:NSScrollElasticityNone];
 		}
 
 		if (autoResizeHorizontally) {




More information about the commits mailing list