adium 4258:9ae3774e810d: Backed out changeset 90850d66a030. It i...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/9ae3774e810d
revision:	4258:9ae3774e810d
branch:		(none)
author:		Stephen Holt <sholt at adium.im>
date:		Wed Oct 26 22:21:06 2011 -0700

Backed out changeset 90850d66a030. It introduced other, larger, alignment issues.

diffs (88 lines):

diff -r 90850d66a030 -r 9ae3774e810d Plugins/Dual Window Interface/AIMessageWindowController.m
--- a/Plugins/Dual Window Interface/AIMessageWindowController.m	Wed Oct 26 22:00:55 2011 -0700
+++ b/Plugins/Dual Window Interface/AIMessageWindowController.m	Wed Oct 26 22:21:06 2011 -0700
@@ -431,7 +431,7 @@
 						tabBarFrame.origin.y = NSMinY(contentRect);
 						tabViewMessagesFrame.origin.y = NSHeight(tabBarFrame) + ([tabView_tabBar isTabBarHidden] ? 0 : (HORIZONTAL_TAB_BAR_TO_VIEW_SPACING + 2));
 						tabViewMessagesFrame.size.height = (NSHeight(contentRect) - NSHeight(tabBarFrame) -
-															([tabView_tabBar isTabBarHidden] ? -2 : (HORIZONTAL_TAB_BAR_TO_VIEW_SPACING)));
+															([tabView_tabBar isTabBarHidden] ? 0 : (HORIZONTAL_TAB_BAR_TO_VIEW_SPACING)));
 						[tabView_tabBar setAutoresizingMask:(NSViewMaxYMargin | NSViewWidthSizable)];
 						
 					} else {
@@ -457,15 +457,15 @@
 				case PSMTabBarVerticalOrientation:
 				{
 					CGFloat width = ([prefDict objectForKey:KEY_VERTICAL_TABS_WIDTH] ?
-									 (CGFloat)[[prefDict objectForKey:KEY_VERTICAL_TABS_WIDTH] floatValue] :
+								   (CGFloat)[[prefDict objectForKey:KEY_VERTICAL_TABS_WIDTH] doubleValue] :
 								   100);
 					lastTabBarWidth = width;
 					
 					tabBarFrame.size.height = [[[self window] contentView] frame].size.height;
 					tabBarFrame.size.width = [tabView_tabBar isTabBarHidden] ? 0 : width;
 					tabBarFrame.origin.y = NSMinY(contentRect);
-					tabViewMessagesFrame.origin.y = NSMinY(contentRect);
-					tabViewMessagesFrame.size.height = NSHeight(contentRect);
+					tabViewMessagesFrame.origin.y = NSMinY(contentRect) - 0;
+					tabViewMessagesFrame.size.height = NSHeight(contentRect) + 2;
 					tabViewMessagesFrame.size.width = NSWidth(contentRect) - NSWidth(tabBarFrame);
 					
 					//set the position of the tab bar (left/right)
@@ -1097,8 +1097,8 @@
 			 * This space is not needed when the tab bar is at the top.
 			 */			
 			if (tabPosition == AdiumTabPositionBottom) {
-				frame.origin.y -= HORIZONTAL_TAB_BAR_TO_VIEW_SPACING +3;
-				frame.size.height += HORIZONTAL_TAB_BAR_TO_VIEW_SPACING +3;				
+				frame.origin.y -= HORIZONTAL_TAB_BAR_TO_VIEW_SPACING;
+				frame.size.height += HORIZONTAL_TAB_BAR_TO_VIEW_SPACING;				
 			}
 			break;
 
@@ -1128,8 +1128,8 @@
 			 * This space is not needed when the tab bar is at the top.
 			 */
 			if (tabPosition == AdiumTabPositionBottom) {
-				frame.origin.y += HORIZONTAL_TAB_BAR_TO_VIEW_SPACING +3;
-				frame.size.height -= HORIZONTAL_TAB_BAR_TO_VIEW_SPACING +3;				
+				frame.origin.y += HORIZONTAL_TAB_BAR_TO_VIEW_SPACING;
+				frame.size.height -= HORIZONTAL_TAB_BAR_TO_VIEW_SPACING;				
 			}
 			break;
 
diff -r 90850d66a030 -r 9ae3774e810d Plugins/Dual Window Interface/MessageWindow.xib
--- a/Plugins/Dual Window Interface/MessageWindow.xib	Wed Oct 26 22:00:55 2011 -0700
+++ b/Plugins/Dual Window Interface/MessageWindow.xib	Wed Oct 26 22:21:06 2011 -0700
@@ -57,16 +57,17 @@
 						<object class="NSTabView" id="301587204">
 							<reference key="NSNextResponder" ref="643374404"/>
 							<int key="NSvFlags">274</int>
-							<string key="NSFrame">{{0, 20}, {400, 215}}</string>
+							<string key="NSFrame">{{0, 19}, {400, 216}}</string>
 							<reference key="NSSuperview" ref="643374404"/>
 							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="1044278685"/>
 							<array class="NSMutableArray" key="NSTabViewItems">
 								<object class="NSTabViewItem" id="185672595">
 									<string key="NSIdentifier">1</string>
 									<object class="NSView" key="NSView" id="1044278685">
 										<reference key="NSNextResponder" ref="301587204"/>
 										<int key="NSvFlags">256</int>
-										<string key="NSFrameSize">{400, 215}</string>
+										<string key="NSFrameSize">{400, 216}</string>
 										<reference key="NSSuperview" ref="301587204"/>
 										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="824588683"/>
@@ -98,9 +99,10 @@
 						<object class="NSCustomView" id="824588683">
 							<reference key="NSNextResponder" ref="643374404"/>
 							<int key="NSvFlags">258</int>
-							<string key="NSFrameSize">{400, 20}</string>
+							<string key="NSFrameSize">{400, 22}</string>
 							<reference key="NSSuperview" ref="643374404"/>
 							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView"/>
 							<string key="NSClassName">PSMTabBarControl</string>
 							<string key="NSExtension">NSControl</string>
 						</object>