adium 5741:974e4e72a348: Fix contact list vertical sizing with 1...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/974e4e72a348
revision:	5741:974e4e72a348
branch:		adium-1.5.9
author:		Frank Dowsett <wixardy at adium.im>
date:		Mon Oct 28 22:03:01 2013 -0400

Fix contact list vertical sizing with 10.9's multiple menu bars. Fixes #16514

diffs (117 lines):

diff -r 2927fdcefe2a -r 974e4e72a348 ChangeLogs/Changes.txt
--- a/ChangeLogs/Changes.txt	Sun Oct 27 11:16:46 2013 +0100
+++ b/ChangeLogs/Changes.txt	Mon Oct 28 22:03:01 2013 -0400
@@ -4,6 +4,7 @@
  * Fixed a crash which could occur when attempting to send files, especially on OS X 10.9. ("fain") (#16352, #16430)
  * Fixed a crash which could occur on OS X 10.9.
  * Fixed building Adium on OS X 10.9. (#16408)
+ * Fix borderless contact lists not taking multi-screen menu bars into account. (#16514)
 
 
 Version 1.5.8 (10/13/2013)
diff -r 2927fdcefe2a -r 974e4e72a348 Frameworks/AIUtilities Framework/Source/AIApplicationAdditions.h
--- a/Frameworks/AIUtilities Framework/Source/AIApplicationAdditions.h	Sun Oct 27 11:16:46 2013 +0100
+++ b/Frameworks/AIUtilities Framework/Source/AIApplicationAdditions.h	Mon Oct 28 22:03:01 2013 -0400
@@ -19,5 +19,6 @@
 - (NSString *)applicationVersion;
 
 - (BOOL)isOnLionOrNewer;
+- (BOOL)isOnMavericksOrNewer;
 
 @end
diff -r 2927fdcefe2a -r 974e4e72a348 Frameworks/AIUtilities Framework/Source/AIApplicationAdditions.m
--- a/Frameworks/AIUtilities Framework/Source/AIApplicationAdditions.m	Sun Oct 27 11:16:46 2013 +0100
+++ b/Frameworks/AIUtilities Framework/Source/AIApplicationAdditions.m	Mon Oct 28 22:03:01 2013 -0400
@@ -20,6 +20,9 @@
 #ifndef NSAppKitVersionNumber10_6
 #define NSAppKitVersionNumber10_6 1038
 #endif 
+#ifndef NSAppKitVersionNumber10_8
+#define NSAppKitVersionNumber10_8 1187
+#endif
 
 
 @implementation NSApplication (AIApplicationAdditions)
@@ -34,4 +37,9 @@
 	return (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_6);
 }
 
+- (BOOL)isOnMavericksOrNewer
+{
+	return (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_8);
+}
+
 @end
diff -r 2927fdcefe2a -r 974e4e72a348 Frameworks/AIUtilities Framework/Source/AIOSCompatibility.h
--- a/Frameworks/AIUtilities Framework/Source/AIOSCompatibility.h	Sun Oct 27 11:16:46 2013 +0100
+++ b/Frameworks/AIUtilities Framework/Source/AIOSCompatibility.h	Mon Oct 28 22:03:01 2013 -0400
@@ -14,17 +14,30 @@
  * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-// XXX - Remove this on 10.7+ transition
-
-#ifndef AILeopardCompatibility
-#define AILeopardCompatibility
+#ifndef AICompatibility
+#define AICompatibility
 
 #import <AvailabilityMacros.h>
 
+#ifndef MAC_OS_X_VERSION_10_9
+#define MAC_OS_X_VERSION_10_9 1090
+#endif //ndef MAC_OS_X_VERSION_10_9
+
 #ifndef MAC_OS_X_VERSION_10_7
 #define MAC_OS_X_VERSION_10_7 1070
 #endif //ndef MAC_OS_X_VERSION_10_7
 
+#if MAC_OS_X_VERSION_10_9 > MAC_OS_X_VERSION_MAX_ALLOWED
+
+#ifdef __OBJC__
+
+ at interface NSScreen (NewMavericksMethods)
++ (BOOL)screensHaveSeparateSpaces;
+ at end
+
+#endif
+#endif //MAC_OS_X_VERSION_10_9
+
 #if MAC_OS_X_VERSION_10_7 > MAC_OS_X_VERSION_MAX_ALLOWED
 
 #ifdef __OBJC__
@@ -43,9 +56,6 @@
 @end
 
 #endif
-
-#else //Not compiling for 10.7
-
 #endif //MAC_OS_X_VERSION_10_7
 
 #endif
diff -r 2927fdcefe2a -r 974e4e72a348 Source/AIListController.m
--- a/Source/AIListController.m	Sun Oct 27 11:16:46 2013 +0100
+++ b/Source/AIListController.m	Mon Oct 28 22:03:01 2013 -0400
@@ -44,6 +44,8 @@
 #import <AIUtilities/AIFunctions.h>
 #import <AIUtilities/AIEventAdditions.h>
 #import <AIUtilities/AIAttributedStringAdditions.h>
+#import <AIUtilities/AIOSCompatibility.h>
+#import <AIUtilities/AIApplicationAdditions.h>
 
 #define EDGE_CATCH_X						40.0f
 #define EDGE_CATCH_Y						40.0f
@@ -338,9 +340,10 @@
 		boundingFrame = screenFrame;
 
 		//We still should not violate the menuBar, so account for it here if we are on the menuBar screen.
-		if ((screens = [NSScreen screens]) &&
+		if (([NSApp isOnMavericksOrNewer] && [NSScreen screensHaveSeparateSpaces]) ||
+			((screens = [NSScreen screens]) &&
 			([screens count]) &&
-			(currentScreen == [screens objectAtIndex:0])) {
+			(currentScreen == [screens objectAtIndex:0]))) {
 			boundingFrame.size.height -= MENU_BAR_HEIGHT;
 		}