Correct the desired width for Adium's tabs from double counting the icon and close button.

Author: Frank Dowsett

Source/PSMAdiumTabStyle.m

@@ -197,6 +197,39 @@ - (NSAttributedString *)attributedStringValueForTabCell:(PSMTabBarCell *)cell {
 #pragma mark -
 #pragma mark Determining Cell Size
 
+- (CGFloat)desiredWidthOfTabCell:(PSMTabBarCell *)cell {
+    CGFloat resultWidth = 0.0;
+
+    // left margin
+    resultWidth = MARGIN_X;
+
+    // icon or close button?
+    if ([cell hasIcon]) {
+        resultWidth += kPSMTabBarIconWidth + kPSMTabBarCellPadding;
+    } else if ([cell shouldDrawCloseButton]) {
+        NSImage *image = [cell closeButtonImageOfType:PSMCloseButtonImageTypeStandard];
+        resultWidth += [image size].width + kPSMTabBarCellPadding;
+    }
+
+    // the label
+    resultWidth += [[cell attributedStringValue] size].width;
+
+    // object counter?
+    if ([cell count] > 0) {
+        resultWidth += [cell objectCounterSize].width + kPSMTabBarCellPadding;
+    }
+
+    // indicator?
+    if ([[cell indicator] isHidden] == NO) {
+        resultWidth += kPSMTabBarCellPadding + kPSMTabBarIndicatorWidth;
+    }
+
+    // right margin
+    resultWidth += MARGIN_X;
+
+    return ceil(resultWidth);
+}
+
 - (CGFloat)heightOfTabCellsForTabBarControl:(PSMTabBarControl *)tabBarControl {
     PSMTabBarOrientation orientation = [tabBarControl orientation];
 	return((orientation == PSMTabBarHorizontalOrientation) ? kPSMTabBarControlHeight : kPSMTabBarControlSourceListHeight);

Source/PSMTabBarCell.m

@@ -353,7 +353,7 @@ - (NSRect)closeButtonRectForBounds:(NSRect)theRect {
 - (CGFloat)minimumWidthOfCell {
 
     id < PSMTabStyle > style = [[self controlView] style];
-    if ([style respondsToSelector:@selector(minimumWidthOfTabCell)]) {
+    if ([style respondsToSelector:@selector(minimumWidthOfTabCell:)]) {
         return [style minimumWidthOfTabCell:self];
     } else {
         return [self _minimumWidthOfCell];
@@ -363,7 +363,7 @@ - (CGFloat)minimumWidthOfCell {
 - (CGFloat)desiredWidthOfCell {
 
     id < PSMTabStyle > style = [[self controlView] style];
-    if ([style respondsToSelector:@selector(desiredWidthOfTabCell)]) {
+    if ([style respondsToSelector:@selector(desiredWidthOfTabCell:)]) {
         return [style desiredWidthOfTabCell:self];
     } else {    
         return [self _desiredWidthOfCell];