adium 4325:0b420f4fa3e8: Ok, enough with the magic numbers! Fix ...

commits at adium.im commits at adium.im
Wed Nov 30 07:48:57 UTC 2011


details:	http://hg.adium.im/adium/rev/0b420f4fa3e8
revision:	4325:0b420f4fa3e8
branch:		(none)
author:		Stephen Holt <sholt at adium.im>
date:		Tue Nov 29 23:46:03 2011 -0800

Ok, enough with the magic numbers! Fix a 2px alignment issue when a borderless contact window is set to vertically resize automatically. Fixes #15626.
Subject: adium 4326:0e7c74106146: changelog

details:	http://hg.adium.im/adium/rev/0e7c74106146
revision:	4326:0e7c74106146
branch:		(none)
author:		Stephen Holt <sholt at adium.im>
date:		Tue Nov 29 23:48:53 2011 -0800

changelog

diffs (69 lines):

diff -r 6e513a922a44 -r 0e7c74106146 ChangeLogs/Changes Between Betas.txt
--- a/ChangeLogs/Changes Between Betas.txt	Mon Nov 28 16:20:28 2011 -0800
+++ b/ChangeLogs/Changes Between Betas.txt	Tue Nov 29 23:48:53 2011 -0800
@@ -1,6 +1,7 @@
 Adium 1.5b6
  * Fixed automatic updating between betas failing with the error "Can't make a temporary directory for the update download". (#15666)
  * Correct strange behavior in the messages pref pane. (#15670)
+ * Fixed a 2px alignment issue when a borderless contact window is set to vertically resize automatically. (#15626)
 
 Adium 1.5b5
  * Fixed crash when loading Skype plugin. (#15590)
diff -r 6e513a922a44 -r 0e7c74106146 Source/AIAnimatingListOutlineView.m
--- a/Source/AIAnimatingListOutlineView.m	Mon Nov 28 16:20:28 2011 -0800
+++ b/Source/AIAnimatingListOutlineView.m	Tue Nov 29 23:48:53 2011 -0800
@@ -16,6 +16,7 @@
 
 #import "AIAnimatingListOutlineView.h"
 #import "AIOutlineViewAnimation.h"
+#import "AIApplicationAdditions.h"
 
 #define DISABLE_ALL_ANIMATION				FALSE
 #define DISABLE_ANIMATE_EXPAND_AND_COLLAPSE	TRUE
diff -r 6e513a922a44 -r 0e7c74106146 Source/AIBorderlessListOutlineView.m
--- a/Source/AIBorderlessListOutlineView.m	Mon Nov 28 16:20:28 2011 -0800
+++ b/Source/AIBorderlessListOutlineView.m	Tue Nov 29 23:48:53 2011 -0800
@@ -16,6 +16,7 @@
 
 #import "AIBorderlessListOutlineView.h"
 #import <AIUtilities/AIEventAdditions.h>
+#import "AIApplicationAdditions.h"
 
 #define FORCED_MINIMUM_HEIGHT 20
 
@@ -75,7 +76,7 @@
 
 - (NSInteger)totalHeight
 {
-	return [super totalHeight] + 2;
+	return [super totalHeight;
 }
 
 @end
diff -r 6e513a922a44 -r 0e7c74106146 Source/AIStandardListScrollView.m
--- a/Source/AIStandardListScrollView.m	Mon Nov 28 16:20:28 2011 -0800
+++ b/Source/AIStandardListScrollView.m	Tue Nov 29 23:48:53 2011 -0800
@@ -15,6 +15,7 @@
  */
 
 #import "AIStandardListScrollView.h"
+#import "AIApplicationAdditions.h"
 
 @implementation AIStandardListScrollView
 
@@ -30,9 +31,12 @@
 {
 	[super reflectScrolledClipView:aClipView];
 	
-	NSRect myBounds = [self bounds];
-	NSRect bottomRect = NSMakeRect(NSMaxX(myBounds) - 20, NSMinY(myBounds), 20, NSMaxY(myBounds));
-	[self setNeedsDisplayInRect:bottomRect];
+	// we don't need this on Lion.
+	if ([NSApp isOnLionOrNewer]) {
+		NSRect myBounds = [self bounds];
+		NSRect bottomRect = NSMakeRect(NSMaxX(myBounds) - 20, NSMinY(myBounds), 20, NSMaxY(myBounds));
+		[self setNeedsDisplayInRect:bottomRect];
+	}
 }
 
 @end




More information about the commits mailing list