adium 4254:fd173307cdb6: More view layout fixing. This should fi...
commits at adium.im
commits at adium.im
Wed Oct 26 07:07:51 UTC 2011
details: http://hg.adium.im/adium/rev/fd173307cdb6
revision: 4254:fd173307cdb6
branch: (none)
author: Stephen Holt <sholt at adium.im>
date: Wed Oct 26 00:07:41 2011 -0700
More view layout fixing. This should fix #15560
We should probably flag the AIMessageWindowController and AIMessageViewController for later refactoring. Lots of magic numbers in there with little explination to their purpose (they should, at minimum, be well named defines).
diffs (335 lines):
diff -r 487576f74e86 -r fd173307cdb6 Plugins/Dual Window Interface/AIMessageViewController.m
--- a/Plugins/Dual Window Interface/AIMessageViewController.m Tue Oct 25 17:50:45 2011 -0400
+++ b/Plugins/Dual Window Interface/AIMessageViewController.m Wed Oct 26 00:07:41 2011 -0700
@@ -1348,7 +1348,7 @@
msgFrame.size.width = currentFrame.size.width;
msgFrame.size.height = AIfloor(currentFrame.size.height - textFrame.size.height - dividerThickness + 0.50f);
- textFrame.origin.y = AIfloor(msgFrame.size.height + dividerThickness);
+ textFrame.origin.y = AIfloor(msgFrame.size.height + dividerThickness + 0.5f);
[view_messages setFrame:msgFrame];
[[scrollView_textEntry superview] setFrame:textFrame];
diff -r 487576f74e86 -r fd173307cdb6 Plugins/Dual Window Interface/AIMessageWindowController.m
--- a/Plugins/Dual Window Interface/AIMessageWindowController.m Tue Oct 25 17:50:45 2011 -0400
+++ b/Plugins/Dual Window Interface/AIMessageWindowController.m Wed Oct 26 00:07:41 2011 -0700
@@ -400,7 +400,8 @@
PSMTabBarHorizontalOrientation :
PSMTabBarVerticalOrientation);
- NSRect tabBarFrame = [tabView_tabBar frame], tabViewMessagesFrame = [tabView_messages frame];
+ NSRect tabBarFrame = [tabView_tabBar frame];
+ NSRect tabViewMessagesFrame = [tabView_messages frame];
NSRect contentRect = [[[self window] contentView] frame];
//remove the split view if the last orientation was vertical
@@ -422,15 +423,15 @@
switch (orientation) {
case PSMTabBarHorizontalOrientation:
{
- tabBarFrame.size.height = [tabView_tabBar isTabBarHidden] ? 1 : kPSMTabBarControlHeight;
- tabBarFrame.size.width = contentRect.size.width + 1;
+ tabBarFrame.size.height = [tabView_tabBar isTabBarHidden] ? 0 : kPSMTabBarControlHeight;
+ tabBarFrame.size.width = contentRect.size.width + 0;
//set the position of the tab bar (top/bottom)
if (tabPosition == AdiumTabPositionBottom) {
tabBarFrame.origin.y = NSMinY(contentRect);
- tabViewMessagesFrame.origin.y = NSHeight(tabBarFrame) + ([tabView_tabBar isTabBarHidden] ? 0 : (HORIZONTAL_TAB_BAR_TO_VIEW_SPACING - 1));
+ 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] ? 0 : (HORIZONTAL_TAB_BAR_TO_VIEW_SPACING - 2)));
+ ([tabView_tabBar isTabBarHidden] ? 0 : (HORIZONTAL_TAB_BAR_TO_VIEW_SPACING)));
[tabView_tabBar setAutoresizingMask:(NSViewMaxYMargin | NSViewWidthSizable)];
} else {
@@ -439,7 +440,7 @@
tabBarFrame.origin.y = NSMaxY(contentRect) - NSHeight(tabBarFrame);
tabViewMessagesFrame.origin.y = NSMinY(contentRect);
- tabViewMessagesFrame.size.height = NSHeight(contentRect) - NSHeight(tabBarFrame);
+ tabViewMessagesFrame.size.height = NSHeight(contentRect) - NSHeight(tabBarFrame) + 2;
[tabView_tabBar setAutoresizingMask:(NSViewMinYMargin | NSViewWidthSizable)];
}
/* If the cell is less than 60, icon + title + unread message count may overlap */
@@ -449,8 +450,8 @@
tabBarFrame.origin.x = 0;
//Items within the tabview draw frames, so be sure to clip the left and right edges.
- tabViewMessagesFrame.origin.x = -1;
- tabViewMessagesFrame.size.width = NSWidth(contentRect) + 2;
+ tabViewMessagesFrame.origin.x = 0;
+ tabViewMessagesFrame.size.width = NSWidth(contentRect);
break;
}
case PSMTabBarVerticalOrientation:
@@ -461,11 +462,11 @@
lastTabBarWidth = width;
tabBarFrame.size.height = [[[self window] contentView] frame].size.height;
- tabBarFrame.size.width = [tabView_tabBar isTabBarHidden] ? 1 : width;
+ tabBarFrame.size.width = [tabView_tabBar isTabBarHidden] ? 0 : width;
tabBarFrame.origin.y = NSMinY(contentRect);
- tabViewMessagesFrame.origin.y = NSMinY(contentRect);
- tabViewMessagesFrame.size.height = NSHeight(contentRect) + 1;
- tabViewMessagesFrame.size.width = NSWidth(contentRect) - NSWidth(tabBarFrame) - 5;
+ 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)
if (tabPosition == AdiumTabPositionLeft) {
@@ -474,7 +475,7 @@
[tabView_tabBar setAutoresizingMask:NSViewHeightSizable];
} else {
tabViewMessagesFrame.origin.x = NSMinX(contentRect);
- tabBarFrame.origin.x = NSWidth(contentRect) - NSWidth(tabBarFrame) + 1;
+ tabBarFrame.origin.x = NSWidth(contentRect) - NSWidth(tabBarFrame);
[tabView_tabBar setAutoresizingMask:NSViewHeightSizable | NSViewMinXMargin];
}
[tabView_tabBar setCellMinWidth:50];
@@ -482,8 +483,13 @@
//put the subviews into a split view
NSRect splitViewRect = [[[self window] contentView] frame];
- splitViewRect.size.width++;
- splitViewRect.size.height++;
+ splitViewRect.size.height += 2;
+ if (tabPosition == AdiumTabPositionLeft) {
+ splitViewRect.origin.x -= [tabView_tabBar isTabBarHidden] ? 0 : 1;
+ splitViewRect.size.width += [tabView_tabBar isTabBarHidden] ? 0 : 1;
+ } else {
+ splitViewRect.size.width += [tabView_tabBar isTabBarHidden] ? 0 : 1;
+ }
tabView_splitView = [[[AIMessageTabSplitView alloc] initWithFrame:splitViewRect] autorelease];
[tabView_splitView setDividerThickness:([tabView_tabBar isTabBarHidden] ? 0 : VERTICAL_DIVIDER_THICKNESS)];
[tabView_splitView setVertical:YES];
diff -r 487576f74e86 -r fd173307cdb6 Plugins/Dual Window Interface/MessageView.xib
--- a/Plugins/Dual Window Interface/MessageView.xib Tue Oct 25 17:50:45 2011 -0400
+++ b/Plugins/Dual Window Interface/MessageView.xib Wed Oct 26 00:07:41 2011 -0700
@@ -73,13 +73,13 @@
<object class="NSView" id="739771638">
<reference key="NSNextResponder" ref="632298351"/>
<int key="NSvFlags">274</int>
- <string key="NSFrame">{{1, 1}, {477, 0}}</string>
+ <string key="NSFrame">{{1, 1}, {479, 0}}</string>
<reference key="NSSuperview" ref="632298351"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="351509238"/>
</object>
</object>
- <string key="NSFrameSize">{479, 1}</string>
+ <string key="NSFrameSize">{481, 1}</string>
<reference key="NSSuperview" ref="687025598"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="739771638"/>
@@ -119,7 +119,7 @@
<reference key="NSFillColor2" ref="33147168"/>
</object>
</object>
- <string key="NSFrame">{{0, 300}, {479, 59}}</string>
+ <string key="NSFrame">{{0, 302}, {481, 59}}</string>
<reference key="NSSuperview" ref="465253647"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="632298351"/>
@@ -158,13 +158,13 @@
<object class="NSView" id="819870531">
<reference key="NSNextResponder" ref="916213062"/>
<int key="NSvFlags">274</int>
- <string key="NSFrameSize">{346, 264}</string>
+ <string key="NSFrameSize">{345, 264}</string>
<reference key="NSSuperview" ref="916213062"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="881321079"/>
</object>
</object>
- <string key="NSFrameSize">{346, 264}</string>
+ <string key="NSFrameSize">{345, 264}</string>
<reference key="NSSuperview" ref="60130733"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="819870531"/>
@@ -205,7 +205,7 @@
<double key="NSPercent">0.50602412223815918</double>
</object>
</object>
- <string key="NSFrameSize">{346, 264}</string>
+ <string key="NSFrameSize">{345, 264}</string>
<reference key="NSSuperview" ref="1034558317"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="916213062"/>
@@ -215,7 +215,7 @@
<reference key="NSContentView" ref="916213062"/>
</object>
</object>
- <string key="NSFrameSize">{346, 261}</string>
+ <string key="NSFrameSize">{345, 264}</string>
<reference key="NSSuperview" ref="469967666"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="60130733"/>
@@ -247,7 +247,7 @@
<string key="NSExtension">NSTextView</string>
</object>
</object>
- <string key="NSFrame">{{1, 1}, {347, 37}}</string>
+ <string key="NSFrame">{{1, 1}, {343, 36}}</string>
<reference key="NSSuperview" ref="1006380680"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="662114219"/>
@@ -258,12 +258,14 @@
<object class="NSScroller" id="949636887">
<reference key="NSNextResponder" ref="1006380680"/>
<int key="NSvFlags">-2147483392</int>
- <string key="NSFrame">{{-100, -100}, {15, 27}}</string>
+ <string key="NSFrame">{{331, 1}, {15, 16}}</string>
<reference key="NSSuperview" ref="1006380680"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="559917187"/>
<reference key="NSTarget" ref="1006380680"/>
<string key="NSAction">_doScroller:</string>
+ <double key="NSCurValue">1</double>
+ <double key="NSPercent">0.88888888888888884</double>
</object>
<object class="NSScroller" id="559917187">
<reference key="NSNextResponder" ref="1006380680"/>
@@ -272,30 +274,31 @@
<reference key="NSSuperview" ref="1006380680"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="382054263"/>
+ <bool key="NSEnabled">YES</bool>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="1006380680"/>
<string key="NSAction">_doScroller:</string>
<double key="NSPercent">0.90740740740740744</double>
</object>
</object>
- <string key="NSFrameSize">{349, 39}</string>
+ <string key="NSFrameSize">{345, 38}</string>
<reference key="NSSuperview" ref="944644976"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="382054263"/>
- <int key="NSsFlags">133650</int>
+ <int key="NSsFlags">133778</int>
<reference key="NSVScroller" ref="949636887"/>
<reference key="NSHScroller" ref="559917187"/>
<reference key="NSContentView" ref="382054263"/>
</object>
</object>
- <string key="NSFrame">{{0, 262}, {346, 38}}</string>
+ <string key="NSFrame">{{0, 265}, {345, 38}}</string>
<reference key="NSSuperview" ref="469967666"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1006380680"/>
<string key="NSClassName">NSView</string>
</object>
</object>
- <string key="NSFrameSize">{346, 300}</string>
+ <string key="NSFrameSize">{345, 303}</string>
<reference key="NSSuperview" ref="988585566"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1034558317"/>
@@ -303,7 +306,7 @@
<string key="NSAutosaveName">AdiumMessageView</string>
</object>
</object>
- <string key="NSFrameSize">{344, 300}</string>
+ <string key="NSFrameSize">{345, 303}</string>
<reference key="NSSuperview" ref="351509238"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="469967666"/>
@@ -387,13 +390,13 @@
<object class="NSView" id="274308108">
<reference key="NSNextResponder" ref="140880223"/>
<int key="NSvFlags">274</int>
- <string key="NSFrame">{{1, 1}, {137, 3}}</string>
+ <string key="NSFrame">{{1, 1}, {138, 3}}</string>
<reference key="NSSuperview" ref="140880223"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="282711289"/>
</object>
</object>
- <string key="NSFrame">{{-3, 20}, {139, 5}}</string>
+ <string key="NSFrame">{{-3, 20}, {140, 5}}</string>
<reference key="NSSuperview" ref="561723111"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="274308108"/>
@@ -424,7 +427,7 @@
</object>
</object>
</object>
- <string key="NSFrameSize">{135, 21}</string>
+ <string key="NSFrameSize">{136, 21}</string>
<reference key="NSSuperview" ref="60271943"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="140880223"/>
@@ -443,7 +446,7 @@
<object class="NSOutlineView" id="824656698">
<reference key="NSNextResponder" ref="697712038"/>
<int key="NSvFlags">4352</int>
- <string key="NSFrameSize">{135, 280}</string>
+ <string key="NSFrameSize">{136, 283}</string>
<reference key="NSSuperview" ref="697712038"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="990929380"/>
@@ -456,7 +459,7 @@
<object class="NSMutableArray" key="NSTableColumns">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTableColumn" id="613567889">
- <double key="NSWidth">132</double>
+ <double key="NSWidth">133</double>
<double key="NSMinWidth">16</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -518,7 +521,7 @@
<int key="NSTableViewGroupRowStyle">1</int>
</object>
</object>
- <string key="NSFrameSize">{135, 280}</string>
+ <string key="NSFrameSize">{136, 283}</string>
<reference key="NSSuperview" ref="652921259"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="824656698"/>
@@ -550,7 +553,7 @@
<double key="NSPercent">0.87068963050842285</double>
</object>
</object>
- <string key="NSFrame">{{0, 20}, {135, 280}}</string>
+ <string key="NSFrame">{{0, 20}, {136, 283}}</string>
<reference key="NSSuperview" ref="60271943"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="697712038"/>
@@ -561,14 +564,14 @@
<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
</object>
</object>
- <string key="NSFrame">{{345, 0}, {135, 300}}</string>
+ <string key="NSFrame">{{346, 0}, {136, 303}}</string>
<reference key="NSSuperview" ref="351509238"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="652921259"/>
<string key="NSClassName">NSView</string>
</object>
</object>
- <string key="NSFrameSize">{480, 300}</string>
+ <string key="NSFrameSize">{482, 303}</string>
<reference key="NSSuperview" ref="465253647"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="988585566"/>
@@ -576,7 +579,7 @@
<int key="NSDividerStyle">2</int>
</object>
</object>
- <string key="NSFrame">{{1, 1}, {479, 359}}</string>
+ <string key="NSFrameSize">{481, 361}</string>
<reference key="NSSuperview" ref="472278389"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="687025598"/>
@@ -603,6 +606,7 @@
<int key="NSBoxType">4</int>
<int key="NSTitlePosition">0</int>
<bool key="NSTransparent">NO</bool>
+ <real value="0.0" key="NSBorderWidth2"/>
<reference key="NSBorderColor2" ref="33147168"/>
<object class="NSColor" key="NSFillColor2">
<int key="NSColorSpace">1</int>
diff -r 487576f74e86 -r fd173307cdb6 Plugins/Dual Window Interface/MessageWindow.nib/keyedobjects.nib
Binary file Plugins/Dual Window Interface/MessageWindow.nib/keyedobjects.nib has changed
More information about the commits
mailing list