adium-1.4 2658:1e74dcf92474: New PSMTabBarControl.framework, wit...

commits at adium.im commits at adium.im
Wed Oct 28 05:17:38 UTC 2009


details:	http://hg.adium.im/adium-1.4/rev/1e74dcf92474
revision:	2658:1e74dcf92474
author:		Stephen Holt <sholt at adium.im>
date:		Wed Oct 28 01:17:06 2009 -0400

New PSMTabBarControl.framework, with some fixed leaks.

ppc/i386 build only for 1.4.

diffs (217 lines):

diff -r ad52bfd5b3bd -r 1e74dcf92474 Frameworks/PSMTabBarControl.framework/Versions/A/Headers/PSMOverflowPopUpButton.h
--- a/Frameworks/PSMTabBarControl.framework/Versions/A/Headers/PSMOverflowPopUpButton.h	Tue Oct 27 18:47:03 2009 -0700
+++ b/Frameworks/PSMTabBarControl.framework/Versions/A/Headers/PSMOverflowPopUpButton.h	Wed Oct 28 01:17:06 2009 -0400
@@ -15,7 +15,7 @@
     BOOL            _down;
 	BOOL			_animatingAlternateImage;
 	NSTimer			*_animationTimer;
-	float			_animationValue;
+	CGFloat			_animationValue;
 }
 
 //alternate image display
diff -r ad52bfd5b3bd -r 1e74dcf92474 Frameworks/PSMTabBarControl.framework/Versions/A/Headers/PSMTabBarCell.h
--- a/Frameworks/PSMTabBarControl.framework/Versions/A/Headers/PSMTabBarCell.h	Tue Oct 27 18:47:03 2009 -0700
+++ b/Frameworks/PSMTabBarControl.framework/Versions/A/Headers/PSMTabBarCell.h	Wed Oct 28 01:17:06 2009 -0400
@@ -16,11 +16,11 @@
     // sizing
     NSRect              _frame;
     NSSize              _stringSize;
-    int                 _currentStep;
+    NSInteger                 _currentStep;
     BOOL                _isPlaceholder;
     
     // state
-    int                 _tabState;
+    NSInteger                 _tabState;
     NSTrackingRectTag   _closeButtonTrackingTag;    // left side tracking, if dragging
     NSTrackingRectTag   _cellTrackingTag;           // right side tracking, if dragging
     BOOL                _closeButtonOver;
@@ -31,7 +31,7 @@
     BOOL                _isCloseButtonSuppressed;
     BOOL                _hasIcon;
 	BOOL				_hasLargeImage;
-    int                 _count;
+    NSInteger                 _count;
 	NSColor				*_countColor;
     BOOL                _isEdited;
 }
@@ -48,14 +48,14 @@
 - (void)setCloseButtonTrackingTag:(NSTrackingRectTag)tag;
 - (NSTrackingRectTag)cellTrackingTag;
 - (void)setCellTrackingTag:(NSTrackingRectTag)tag;
-- (float)width;
+- (CGFloat)width;
 - (NSRect)frame;
 - (void)setFrame:(NSRect)rect;
 - (void)setStringValue:(NSString *)aString;
 - (NSSize)stringSize;
 - (NSAttributedString *)attributedStringValue;
-- (int)tabState;
-- (void)setTabState:(int)state;
+- (NSInteger)tabState;
+- (void)setTabState:(NSInteger)state;
 - (NSProgressIndicator *)indicator;
 - (BOOL)isInOverflowMenu;
 - (void)setIsInOverflowMenu:(BOOL)value;
@@ -71,22 +71,22 @@
 - (void)setHasIcon:(BOOL)value;
 - (BOOL)hasLargeImage;
 - (void)setHasLargeImage:(BOOL)value;
-- (int)count;
-- (void)setCount:(int)value;
+- (NSInteger)count;
+- (void)setCount:(NSInteger)value;
 - (NSColor *)countColor;
 - (void)setCountColor:(NSColor *)value;
 - (BOOL)isPlaceholder;
 - (void)setIsPlaceholder:(BOOL)value;
-- (int)currentStep;
-- (void)setCurrentStep:(int)value;
+- (NSInteger)currentStep;
+- (void)setCurrentStep:(NSInteger)value;
 - (BOOL)isEdited;
 - (void)setIsEdited:(BOOL)value;
 
 // component attributes
 - (NSRect)indicatorRectForFrame:(NSRect)cellFrame;
 - (NSRect)closeButtonRectForFrame:(NSRect)cellFrame;
-- (float)minimumWidthOfCell;
-- (float)desiredWidthOfCell;
+- (CGFloat)minimumWidthOfCell;
+- (CGFloat)desiredWidthOfCell;
 
 // drawing
 - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView;
diff -r ad52bfd5b3bd -r 1e74dcf92474 Frameworks/PSMTabBarControl.framework/Versions/A/Headers/PSMTabBarControl.h
--- a/Frameworks/PSMTabBarControl.framework/Versions/A/Headers/PSMTabBarControl.h	Tue Oct 27 18:47:03 2009 -0700
+++ b/Frameworks/PSMTabBarControl.framework/Versions/A/Headers/PSMTabBarControl.h	Wed Oct 28 01:17:06 2009 -0400
@@ -79,7 +79,7 @@
     BOOL                        _useOverflowMenu;
 	BOOL						_alwaysShowActiveTab;
 	BOOL						_allowsScrubbing;
-	int							_resizeAreaCompensation;
+	NSInteger							_resizeAreaCompensation;
 	PSMTabBarOrientation		_orientation;
 	BOOL						_automaticallyAnimates;
 	NSTimer						*_animationTimer;
@@ -94,16 +94,16 @@
 	BOOL						_resizing;
 	
     // cell width
-    int                         _cellMinWidth;
-    int                         _cellMaxWidth;
-    int                         _cellOptimumWidth;
+    NSInteger                         _cellMinWidth;
+    NSInteger                         _cellMaxWidth;
+    NSInteger                         _cellOptimumWidth;
     
     // animation for hide/show
-    int                         _currentStep;
+    NSInteger                         _currentStep;
     BOOL                        _isHidden;
     IBOutlet id                 partnerView;                // gets resized when hide/show
     BOOL                        _awakenedFromNib;
-	int							_tabBarWidth;
+	NSInteger							_tabBarWidth;
     NSTimer						*_showHideAnimationTimer;
 
     // drag and drop
@@ -117,7 +117,7 @@
 
 // control characteristics
 + (NSBundle *)bundle;
-- (float)availableCellWidth;
+- (CGFloat)availableCellWidth;
 - (NSRect)genericCellRect;
 
 // control configuration
@@ -135,12 +135,12 @@
 - (void)setHideForSingleTab:(BOOL)value;
 - (BOOL)showAddTabButton;
 - (void)setShowAddTabButton:(BOOL)value;
-- (int)cellMinWidth;
-- (void)setCellMinWidth:(int)value;
-- (int)cellMaxWidth;
-- (void)setCellMaxWidth:(int)value;
-- (int)cellOptimumWidth;
-- (void)setCellOptimumWidth:(int)value;
+- (NSInteger)cellMinWidth;
+- (void)setCellMinWidth:(NSInteger)value;
+- (NSInteger)cellMaxWidth;
+- (void)setCellMaxWidth:(NSInteger)value;
+- (NSInteger)cellOptimumWidth;
+- (void)setCellOptimumWidth:(NSInteger)value;
 - (BOOL)sizeCellsToFit;
 - (void)setSizeCellsToFit:(BOOL)value;
 - (BOOL)useOverflowMenu;
@@ -174,7 +174,7 @@
 
 // tab information
 - (NSMutableArray *)representedTabViewItems;
-- (int)numberOfVisibleTabs;
+- (NSInteger)numberOfVisibleTabs;
 - (PSMTabBarCell *)lastVisibleTab;
 
 // special effects
@@ -210,18 +210,18 @@
 
 
 //Tear-off tabs methods
-- (NSImage *)tabView:(NSTabView *)aTabView imageForTabViewItem:(NSTabViewItem *)tabViewItem offset:(NSSize *)offset styleMask:(unsigned int *)styleMask;
+- (NSImage *)tabView:(NSTabView *)aTabView imageForTabViewItem:(NSTabViewItem *)tabViewItem offset:(NSSize *)offset styleMask:(NSUInteger *)styleMask;
 - (PSMTabBarControl *)tabView:(NSTabView *)aTabView newTabBarForDraggedTabViewItem:(NSTabViewItem *)tabViewItem atPoint:(NSPoint)point;
 - (void)tabView:(NSTabView *)aTabView closeWindowForLastTabViewItem:(NSTabViewItem *)tabViewItem;
 
 //Overflow menu validation
-- (BOOL)tabView:(NSTabView *)aTabView validateOverflowMenuItem:(id <NSMenuItem>)menuItem forTabViewItem:(NSTabViewItem *)tabViewItem;
+- (BOOL)tabView:(NSTabView *)aTabView validateOverflowMenuItem:(NSMenuItem *)menuItem forTabViewItem:(NSTabViewItem *)tabViewItem;
 - (void)tabView:(NSTabView *)aTabView tabViewItem:(NSTabViewItem *)tabViewItem isInOverflowMenu:(BOOL)inOverflowMenu;
 
 //tab bar hiding methods
 - (void)tabView:(NSTabView *)aTabView tabBarDidHide:(PSMTabBarControl *)tabBarControl;
 - (void)tabView:(NSTabView *)aTabView tabBarDidUnhide:(PSMTabBarControl *)tabBarControl;
-- (float)desiredWidthForVerticalTabBar:(PSMTabBarControl *)tabBarControl;
+- (CGFloat)desiredWidthForVerticalTabBar:(PSMTabBarControl *)tabBarControl;
 
 //closing
 - (BOOL)tabView:(NSTabView *)aTabView disableTabCloseForTabViewItem:(NSTabViewItem *)tabViewItem;
@@ -230,6 +230,6 @@
 - (NSString *)tabView:(NSTabView *)aTabView toolTipForTabViewItem:(NSTabViewItem *)tabViewItem;
 
 //accessibility
-- (NSString *)accessibilityStringForTabView:(NSTabView *)aTabView objectCount:(int)objectCount;
+- (NSString *)accessibilityStringForTabView:(NSTabView *)aTabView objectCount:(NSInteger)objectCount;
 
 @end
diff -r ad52bfd5b3bd -r 1e74dcf92474 Frameworks/PSMTabBarControl.framework/Versions/A/Headers/PSMTabStyle.h
--- a/Frameworks/PSMTabBarControl.framework/Versions/A/Headers/PSMTabStyle.h	Tue Oct 27 18:47:03 2009 -0700
+++ b/Frameworks/PSMTabBarControl.framework/Versions/A/Headers/PSMTabStyle.h	Wed Oct 28 01:17:06 2009 -0400
@@ -19,9 +19,9 @@
 - (NSString *)name;
 
 // control specific parameters
-- (float)leftMarginForTabBarControl;
-- (float)rightMarginForTabBarControl;
-- (float)topMarginForTabBarControl;
+- (CGFloat)leftMarginForTabBarControl;
+- (CGFloat)rightMarginForTabBarControl;
+- (CGFloat)topMarginForTabBarControl;
 - (void)setOrientation:(PSMTabBarOrientation)value;
 
 // add tab button
@@ -35,9 +35,9 @@
 - (NSRect)iconRectForTabCell:(PSMTabBarCell *)cell;
 - (NSRect)indicatorRectForTabCell:(PSMTabBarCell *)cell;
 - (NSRect)objectCounterRectForTabCell:(PSMTabBarCell *)cell;
-- (float)minimumWidthOfTabCell:(PSMTabBarCell *)cell;
-- (float)desiredWidthOfTabCell:(PSMTabBarCell *)cell;
-- (float)tabCellHeight;
+- (CGFloat)minimumWidthOfTabCell:(PSMTabBarCell *)cell;
+- (CGFloat)desiredWidthOfTabCell:(PSMTabBarCell *)cell;
+- (CGFloat)tabCellHeight;
 
 // cell values
 - (NSAttributedString *)attributedObjectCountValueForTabCell:(PSMTabBarCell *)cell;
diff -r ad52bfd5b3bd -r 1e74dcf92474 Frameworks/PSMTabBarControl.framework/Versions/A/PSMTabBarControl
Binary file Frameworks/PSMTabBarControl.framework/Versions/A/PSMTabBarControl has changed




More information about the commits mailing list