adium 3086:587edad8877e: Add -fno-builtin-strndup to Adium's xcc...
commits at adium.im
commits at adium.im
Tue Dec 29 05:36:58 UTC 2009
details: http://hg.adium.im/adium/rev/587edad8877e
revision: 3086:587edad8877e
author: Stephen Holt <sholt at adium.im>
date: Tue Dec 29 00:36:26 2009 -0500
Add -fno-builtin-strndup to Adium's xcconfig as well.
Subject: adium 3087:30703336e5b6: Resolve implicit 64->32 bit castings in Adium.app
details: http://hg.adium.im/adium/rev/30703336e5b6
revision: 3087:30703336e5b6
author: Stephen Holt <sholt at adium.im>
date: Tue Dec 29 00:36:28 2009 -0500
Resolve implicit 64->32 bit castings in Adium.app
Subject: adium 3088:86d1432abf47: Remove shadowing varibles in Adium.app.
details: http://hg.adium.im/adium/rev/86d1432abf47
revision: 3088:86d1432abf47
author: Stephen Holt <sholt at adium.im>
date: Tue Dec 29 00:36:28 2009 -0500
Remove shadowing varibles in Adium.app.
diffs (truncated from 5492 to 1000 lines):
diff -r fafab246e257 -r 86d1432abf47 Frameworks/AIUtilities Framework/Source/AIArrayAdditions.h
--- a/Frameworks/AIUtilities Framework/Source/AIArrayAdditions.h Mon Dec 28 19:46:02 2009 -0500
+++ b/Frameworks/AIUtilities Framework/Source/AIArrayAdditions.h Tue Dec 29 00:36:28 2009 -0500
@@ -15,6 +15,6 @@
@interface NSMutableArray (ESArrayAdditions)
- (void)addObjectsFromArrayIgnoringDuplicates:(NSArray *)inArray;
-- (void)moveObject:(id)object toIndex:(unsigned)newIndex;
-- (void)setObject:(id)object atIndex:(unsigned)idx;
+- (void)moveObject:(id)object toIndex:(NSUInteger)newIndex;
+- (void)setObject:(id)object atIndex:(NSUInteger)idx;
@end
diff -r fafab246e257 -r 86d1432abf47 Frameworks/AIUtilities Framework/Source/AIArrayAdditions.m
--- a/Frameworks/AIUtilities Framework/Source/AIArrayAdditions.m Mon Dec 28 19:46:02 2009 -0500
+++ b/Frameworks/AIUtilities Framework/Source/AIArrayAdditions.m Tue Dec 29 00:36:28 2009 -0500
@@ -97,7 +97,7 @@
}
}
-- (void)moveObject:(id)object toIndex:(unsigned)newIndex
+- (void)moveObject:(id)object toIndex:(NSUInteger)newIndex
{
NSUInteger currentIndex = [self indexOfObject:object];
@@ -117,7 +117,7 @@
//just a better name for an existing NSMutableArray method.
//this makes it uniform in style with -[NSMutableDictionary setObject:forKey:].
-- (void)setObject:(id)object atIndex:(unsigned)idx
+- (void)setObject:(id)object atIndex:(NSUInteger)idx
{
[self replaceObjectAtIndex:idx withObject:object];
}
diff -r fafab246e257 -r 86d1432abf47 Frameworks/AIUtilities Framework/Source/AIMenuAdditions.h
--- a/Frameworks/AIUtilities Framework/Source/AIMenuAdditions.h Mon Dec 28 19:46:02 2009 -0500
+++ b/Frameworks/AIUtilities Framework/Source/AIMenuAdditions.h Tue Dec 29 00:36:28 2009 -0500
@@ -16,7 +16,7 @@
@interface NSMenu (ItemCreationAdditions)
- (NSMenuItem *)addItemWithTitle:(NSString *)aString target:(id)target action:(SEL)aSelector keyEquivalent:(NSString *)charCode;
-- (NSMenuItem *)addItemWithTitle:(NSString *)aString target:(id)target action:(SEL)aSelector keyEquivalent:(NSString *)charCode tag:(int)tag;
+- (NSMenuItem *)addItemWithTitle:(NSString *)aString target:(id)target action:(SEL)aSelector keyEquivalent:(NSString *)charCode tag:(NSInteger)tag;
- (NSMenuItem *)addItemWithTitle:(NSString *)aString target:(id)target action:(SEL)aSelector keyEquivalent:(NSString *)charCode representedObject:(id)object;
- (void)removeAllItems;
- (void)removeAllItemsButFirst;
diff -r fafab246e257 -r 86d1432abf47 Frameworks/AIUtilities Framework/Source/AIMenuAdditions.m
--- a/Frameworks/AIUtilities Framework/Source/AIMenuAdditions.m Mon Dec 28 19:46:02 2009 -0500
+++ b/Frameworks/AIUtilities Framework/Source/AIMenuAdditions.m Tue Dec 29 00:36:28 2009 -0500
@@ -27,7 +27,7 @@
return [theMenuItem autorelease];
}
-- (NSMenuItem *)addItemWithTitle:(NSString *)aString target:(id)target action:(SEL)aSelector keyEquivalent:(NSString *)charCode tag:(int)tag
+- (NSMenuItem *)addItemWithTitle:(NSString *)aString target:(id)target action:(SEL)aSelector keyEquivalent:(NSString *)charCode tag:(NSInteger)tag
{
NSMenuItem *theMenuItem = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:aString action:aSelector keyEquivalent:charCode];
[theMenuItem setTarget:target];
diff -r fafab246e257 -r 86d1432abf47 Frameworks/Adium Framework/Source/AIAbstractListController.h
--- a/Frameworks/Adium Framework/Source/AIAbstractListController.h Mon Dec 28 19:46:02 2009 -0500
+++ b/Frameworks/Adium Framework/Source/AIAbstractListController.h Tue Dec 29 00:36:28 2009 -0500
@@ -181,7 +181,7 @@
ESObjectWithProperties<AIContainingObject> *contactList;
BOOL hideRoot;
- float backgroundOpacity;
+ CGFloat backgroundOpacity;
BOOL inDrag;
NSArray *dragItems;
@@ -212,7 +212,7 @@
- (void)setUseContactListGroups:(BOOL)useContactListGroups;
- (void)reloadData;
-- (void)setBackgroundOpacity:(float)opacity;
+- (void)setBackgroundOpacity:(CGFloat)opacity;
- (IBAction)performDefaultActionOnSelectedItem:(NSOutlineView *)sender;
diff -r fafab246e257 -r 86d1432abf47 Frameworks/Adium Framework/Source/AIAbstractListController.m
--- a/Frameworks/Adium Framework/Source/AIAbstractListController.m Mon Dec 28 19:46:02 2009 -0500
+++ b/Frameworks/Adium Framework/Source/AIAbstractListController.m Tue Dec 29 00:36:28 2009 -0500
@@ -533,7 +533,7 @@
}
//Background opacity is set independently from layout
-- (void)setBackgroundOpacity:(float)opacity
+- (void)setBackgroundOpacity:(CGFloat)opacity
{
backgroundOpacity = opacity;
diff -r fafab246e257 -r 86d1432abf47 Frameworks/Adium Framework/Source/AIContentControllerProtocol.h
--- a/Frameworks/Adium Framework/Source/AIContentControllerProtocol.h Mon Dec 28 19:46:02 2009 -0500
+++ b/Frameworks/Adium Framework/Source/AIContentControllerProtocol.h Tue Dec 29 00:36:28 2009 -0500
@@ -46,10 +46,10 @@
#define FILTER_DIRECTION_COUNT 2
#define HIGHEST_FILTER_PRIORITY 0
-#define HIGH_FILTER_PRIORITY 0.25
-#define DEFAULT_FILTER_PRIORITY 0.5
-#define LOW_FILTER_PRIORITY 0.75
-#define LOWEST_FILTER_PRIORITY 1.0
+#define HIGH_FILTER_PRIORITY 0.25f
+#define DEFAULT_FILTER_PRIORITY 0.5f
+#define LOW_FILTER_PRIORITY 0.75f
+#define LOWEST_FILTER_PRIORITY 1.0f
@protocol AIContentFilter, AIDelayedContentFilter, AIHTMLContentFilter;
@protocol AdiumMessageEncryptor;
diff -r fafab246e257 -r 86d1432abf47 Frameworks/Adium Framework/Source/AIListOutlineView+Drawing.m
--- a/Frameworks/Adium Framework/Source/AIListOutlineView+Drawing.m Mon Dec 28 19:46:02 2009 -0500
+++ b/Frameworks/Adium Framework/Source/AIListOutlineView+Drawing.m Tue Dec 29 00:36:28 2009 -0500
@@ -140,7 +140,7 @@
[self setNeedsDisplay:YES];
}
-- (void)setBackgroundOpacity:(float)opacity forWindowStyle:(AIContactListWindowStyle)inWindowStyle
+- (void)setBackgroundOpacity:(CGFloat)opacity forWindowStyle:(AIContactListWindowStyle)inWindowStyle
{
backgroundOpacity = opacity;
@@ -163,12 +163,12 @@
afterDelay:0.2];
}
-- (void)setBackgroundFade:(float)fade
+- (void)setBackgroundFade:(CGFloat)fade
{
backgroundFade = fade;
[self setNeedsDisplay:YES];
}
-- (float)backgroundFade
+- (CGFloat)backgroundFade
{
//Factor in opacity
return backgroundFade * backgroundOpacity;
diff -r fafab246e257 -r 86d1432abf47 Frameworks/Adium Framework/Source/AIListOutlineView.h
--- a/Frameworks/Adium Framework/Source/AIListOutlineView.h Mon Dec 28 19:46:02 2009 -0500
+++ b/Frameworks/Adium Framework/Source/AIListOutlineView.h Tue Dec 29 00:36:28 2009 -0500
@@ -33,21 +33,21 @@
BOOL updateShadowsWhileDrawing;
NSImage *backgroundImage;
- float backgroundFade;
+ CGFloat backgroundFade;
BOOL _drawBackground;
AIBackgroundStyle backgroundStyle;
AIContactListWindowStyle windowStyle;
NSColor *backgroundColor;
NSColor *_backgroundColorWithOpacity;
- float backgroundOpacity;
+ CGFloat backgroundOpacity;
NSColor *highlightColor;
NSColor *rowColor;
NSColor *_rowColorWithOpacity;
- float minimumDesiredWidth;
+ CGFloat minimumDesiredWidth;
BOOL desiredHeightPadding;
NSArray *draggedItems;
@@ -55,7 +55,7 @@
@property (readonly, nonatomic) NSInteger desiredHeight;
@property (readonly, nonatomic) NSInteger desiredWidth;
-- (void)setMinimumDesiredWidth:(int)inMinimumDesiredWidth;
+- (void)setMinimumDesiredWidth:(CGFloat)inMinimumDesiredWidth;
- (void)setDesiredHeightPadding:(int)inPadding;
//Contact menu
@@ -81,8 +81,8 @@
//Backgrounds
- (void)setBackgroundImage:(NSImage *)inImage;
- (void)setBackgroundStyle:(AIBackgroundStyle)inBackgroundStyle;
-- (void)setBackgroundOpacity:(float)opacity forWindowStyle:(AIContactListWindowStyle)windowStyle;
-- (void)setBackgroundFade:(float)fade;
+- (void)setBackgroundOpacity:(CGFloat)opacity forWindowStyle:(AIContactListWindowStyle)windowStyle;
+- (void)setBackgroundFade:(CGFloat)fade;
@property (readwrite, nonatomic, retain) NSColor *backgroundColor;
@property (readwrite, nonatomic, retain) NSColor *highlightColor;
@property (readwrite, nonatomic, retain) NSColor *alternatingRowColor;
diff -r fafab246e257 -r 86d1432abf47 Frameworks/Adium Framework/Source/AIListOutlineView.m
--- a/Frameworks/Adium Framework/Source/AIListOutlineView.m Mon Dec 28 19:46:02 2009 -0500
+++ b/Frameworks/Adium Framework/Source/AIListOutlineView.m Tue Dec 29 00:36:28 2009 -0500
@@ -171,7 +171,7 @@
/*!
* @brief Set the minimum desired width reported by -[self desiredWidth]
*/
-- (void)setMinimumDesiredWidth:(int)inMinimumDesiredWidth
+- (void)setMinimumDesiredWidth:(CGFloat)inMinimumDesiredWidth
{
minimumDesiredWidth = inMinimumDesiredWidth;
}
diff -r fafab246e257 -r 86d1432abf47 Frameworks/Adium Framework/Source/ESObjectWithProperties.h
--- a/Frameworks/Adium Framework/Source/ESObjectWithProperties.h Mon Dec 28 19:46:02 2009 -0500
+++ b/Frameworks/Adium Framework/Source/ESObjectWithProperties.h Tue Dec 29 00:36:28 2009 -0500
@@ -44,6 +44,7 @@
@property (readonly, nonatomic) NSDictionary *properties;
- (id)valueForProperty:(NSString *)key;
- (NSInteger)integerValueForProperty:(NSString *)key;
+- (int)intValueForProperty:(NSString *)key;
- (BOOL)boolValueForProperty:(NSString *)key;
- (NSNumber *)numberValueForProperty:(NSString *)key;
diff -r fafab246e257 -r 86d1432abf47 Frameworks/Adium Framework/Source/ESObjectWithProperties.m
--- a/Frameworks/Adium Framework/Source/ESObjectWithProperties.m Mon Dec 28 19:46:02 2009 -0500
+++ b/Frameworks/Adium Framework/Source/ESObjectWithProperties.m Tue Dec 29 00:36:28 2009 -0500
@@ -175,6 +175,12 @@
return number ? [number integerValue] : 0;
}
+- (int)intValueForProperty:(NSString *)key
+{
+ NSNumber *number = [self numberValueForProperty:key];
+ return number ? [number intValue] : 0;
+}
+
- (BOOL)boolValueForProperty:(NSString *)key
{
NSNumber *number = [self numberValueForProperty:key];
diff -r fafab246e257 -r 86d1432abf47 Frameworks/ShortcutRecorder/Source/SRCommon.h
--- a/Frameworks/ShortcutRecorder/Source/SRCommon.h Mon Dec 28 19:46:02 2009 -0500
+++ b/Frameworks/ShortcutRecorder/Source/SRCommon.h Tue Dec 29 00:36:28 2009 -0500
@@ -21,7 +21,7 @@
#pragma mark Typedefs
typedef struct _KeyCombo {
- unsigned int flags; // 0 for no flags
+ NSUInteger flags; // 0 for no flags
signed short code; // -1 for no code
} KeyCombo;
@@ -135,29 +135,29 @@
// SRCharacter... - X - -
//
NSString * SRStringForKeyCode( signed short keyCode );
-NSString * SRStringForCarbonModifierFlags( unsigned int flags );
-NSString * SRStringForCarbonModifierFlagsAndKeyCode( unsigned int flags, signed short keyCode );
-NSString * SRStringForCocoaModifierFlags( unsigned int flags );
-NSString * SRStringForCocoaModifierFlagsAndKeyCode( unsigned int flags, signed short keyCode );
-NSString * SRReadableStringForCarbonModifierFlagsAndKeyCode( unsigned int flags, signed short keyCode );
-NSString * SRReadableStringForCocoaModifierFlagsAndKeyCode( unsigned int flags, signed short keyCode );
-NSString *SRCharacterForKeyCodeAndCarbonFlags(signed short keyCode, unsigned int carbonFlags);
-NSString *SRCharacterForKeyCodeAndCocoaFlags(signed short keyCode, unsigned int cocoaFlags);
+NSString * SRStringForCarbonModifierFlags( NSUInteger flags );
+NSString * SRStringForCarbonModifierFlagsAndKeyCode( NSUInteger flags, signed short keyCode );
+NSString * SRStringForCocoaModifierFlags( NSUInteger flags );
+NSString * SRStringForCocoaModifierFlagsAndKeyCode( NSUInteger flags, signed short keyCode );
+NSString * SRReadableStringForCarbonModifierFlagsAndKeyCode( NSUInteger flags, signed short keyCode );
+NSString * SRReadableStringForCocoaModifierFlagsAndKeyCode( NSUInteger flags, signed short keyCode );
+NSString *SRCharacterForKeyCodeAndCarbonFlags(signed short keyCode, NSUInteger carbonFlags);
+NSString *SRCharacterForKeyCodeAndCocoaFlags(signed short keyCode, NSUInteger cocoaFlags);
#pragma mark Converting between Cocoa and Carbon modifier flags
-unsigned int SRCarbonToCocoaFlags( unsigned int carbonFlags );
-unsigned int SRCocoaToCarbonFlags( unsigned int cocoaFlags );
+NSUInteger SRCarbonToCocoaFlags( NSUInteger carbonFlags );
+NSUInteger SRCocoaToCarbonFlags( NSUInteger cocoaFlags );
#pragma mark -
#pragma mark Animation pace function
-double SRAnimationEaseInOut(double t);
+CGFloat SRAnimationEaseInOut(CGFloat t);
#pragma mark -
#pragma mark Inlines
-FOUNDATION_STATIC_INLINE KeyCombo SRMakeKeyCombo(signed short code, unsigned int flags) {
+FOUNDATION_STATIC_INLINE KeyCombo SRMakeKeyCombo(signed short code, NSUInteger flags) {
KeyCombo kc;
kc.code = code;
kc.flags = flags;
@@ -179,7 +179,7 @@
// (or Copyright demands) are stated, so we pretend it's public domain.
//
@interface NSBezierPath( SRAdditions )
-+ (NSBezierPath*)bezierPathWithSRCRoundRectInRect:(NSRect)aRect radius:(float)radius;
++ (NSBezierPath*)bezierPathWithSRCRoundRectInRect:(NSRect)aRect radius:(CGFloat)radius;
@end
@interface NSError( SRAdditions )
diff -r fafab246e257 -r 86d1432abf47 Frameworks/ShortcutRecorder/Source/SRCommon.m
--- a/Frameworks/ShortcutRecorder/Source/SRCommon.m Mon Dec 28 19:46:02 2009 -0500
+++ b/Frameworks/ShortcutRecorder/Source/SRCommon.m Tue Dec 29 00:36:28 2009 -0500
@@ -43,7 +43,7 @@
//----------------------------------------------------------
// SRStringForCarbonModifierFlags()
//----------------------------------------------------------
-NSString * SRStringForCarbonModifierFlags( unsigned int flags )
+NSString * SRStringForCarbonModifierFlags( NSUInteger flags )
{
NSString *modifierFlagsString = [NSString stringWithFormat:@"%@%@%@%@",
( flags & controlKey ? [NSString stringWithFormat:@"%C", KeyboardControlGlyph] : @"" ),
@@ -56,7 +56,7 @@
//----------------------------------------------------------
// SRStringForCarbonModifierFlagsAndKeyCode()
//----------------------------------------------------------
-NSString * SRStringForCarbonModifierFlagsAndKeyCode( unsigned int flags, signed short keyCode )
+NSString * SRStringForCarbonModifierFlagsAndKeyCode( NSUInteger flags, signed short keyCode )
{
return [NSString stringWithFormat: @"%@%@",
SRStringForCarbonModifierFlags( flags ),
@@ -66,7 +66,7 @@
//----------------------------------------------------------
// SRStringForCocoaModifierFlags()
//----------------------------------------------------------
-NSString * SRStringForCocoaModifierFlags( unsigned int flags )
+NSString * SRStringForCocoaModifierFlags( NSUInteger flags )
{
NSString *modifierFlagsString = [NSString stringWithFormat:@"%@%@%@%@",
( flags & NSControlKeyMask ? [NSString stringWithFormat:@"%C", KeyboardControlGlyph] : @"" ),
@@ -80,7 +80,7 @@
//----------------------------------------------------------
// SRStringForCocoaModifierFlagsAndKeyCode()
//----------------------------------------------------------
-NSString * SRStringForCocoaModifierFlagsAndKeyCode( unsigned int flags, signed short keyCode )
+NSString * SRStringForCocoaModifierFlagsAndKeyCode( NSUInteger flags, signed short keyCode )
{
return [NSString stringWithFormat: @"%@%@",
SRStringForCocoaModifierFlags( flags ),
@@ -90,7 +90,7 @@
//----------------------------------------------------------
// SRReadableStringForCarbonModifierFlagsAndKeyCode()
//----------------------------------------------------------
-NSString * SRReadableStringForCarbonModifierFlagsAndKeyCode( unsigned int flags, signed short keyCode )
+NSString * SRReadableStringForCarbonModifierFlagsAndKeyCode( NSUInteger flags, signed short keyCode )
{
NSString *readableString = [NSString stringWithFormat:@"%@%@%@%@%@",
( flags & cmdKey ? SRLoc(@"Command + ") : @""),
@@ -104,7 +104,7 @@
//----------------------------------------------------------
// SRReadableStringForCocoaModifierFlagsAndKeyCode()
//----------------------------------------------------------
-NSString * SRReadableStringForCocoaModifierFlagsAndKeyCode( unsigned int flags, signed short keyCode )
+NSString * SRReadableStringForCocoaModifierFlagsAndKeyCode( NSUInteger flags, signed short keyCode )
{
NSString *readableString = [NSString stringWithFormat:@"%@%@%@%@%@",
(flags & NSCommandKeyMask ? SRLoc(@"Command + ") : @""),
@@ -118,15 +118,16 @@
//----------------------------------------------------------
// SRCarbonToCocoaFlags()
//----------------------------------------------------------
-unsigned int SRCarbonToCocoaFlags( unsigned int carbonFlags )
+NSUInteger SRCarbonToCocoaFlags( NSUInteger carbonFlags )
{
- unsigned int cocoaFlags = ShortcutRecorderEmptyFlags;
+ NSUInteger cocoaFlags = ShortcutRecorderEmptyFlags;
if (carbonFlags & cmdKey) cocoaFlags |= NSCommandKeyMask;
if (carbonFlags & optionKey) cocoaFlags |= NSAlternateKeyMask;
if (carbonFlags & controlKey) cocoaFlags |= NSControlKeyMask;
if (carbonFlags & shiftKey) cocoaFlags |= NSShiftKeyMask;
if (carbonFlags & NSFunctionKeyMask) cocoaFlags += NSFunctionKeyMask;
+ if (carbonFlags & NSDeviceIndependentModifierFlagsMask) cocoaFlags |= NSDeviceIndependentModifierFlagsMask;
return cocoaFlags;
}
@@ -134,15 +135,16 @@
//----------------------------------------------------------
// SRCocoaToCarbonFlags()
//----------------------------------------------------------
-unsigned int SRCocoaToCarbonFlags( unsigned int cocoaFlags )
+NSUInteger SRCocoaToCarbonFlags( NSUInteger cocoaFlags )
{
- unsigned int carbonFlags = ShortcutRecorderEmptyFlags;
+ NSUInteger carbonFlags = ShortcutRecorderEmptyFlags;
if (cocoaFlags & NSCommandKeyMask) carbonFlags |= cmdKey;
if (cocoaFlags & NSAlternateKeyMask) carbonFlags |= optionKey;
if (cocoaFlags & NSControlKeyMask) carbonFlags |= controlKey;
if (cocoaFlags & NSShiftKeyMask) carbonFlags |= shiftKey;
if (cocoaFlags & NSFunctionKeyMask) carbonFlags |= NSFunctionKeyMask;
+ if (cocoaFlags & NSDeviceIndependentModifierFlagsMask) carbonFlags |= NSDeviceIndependentModifierFlagsMask;
return carbonFlags;
}
@@ -150,23 +152,23 @@
//----------------------------------------------------------
// SRCharacterForKeyCodeAndCarbonFlags()
//----------------------------------------------------------
-NSString *SRCharacterForKeyCodeAndCarbonFlags(signed short keyCode, unsigned int carbonFlags) {
+NSString *SRCharacterForKeyCodeAndCarbonFlags(signed short keyCode, NSUInteger carbonFlags) {
return SRCharacterForKeyCodeAndCocoaFlags(keyCode, SRCarbonToCocoaFlags(carbonFlags));
}
//----------------------------------------------------------
// SRCharacterForKeyCodeAndCocoaFlags()
//----------------------------------------------------------
-NSString *SRCharacterForKeyCodeAndCocoaFlags(signed short keyCode, unsigned int cocoaFlags) {
+NSString *SRCharacterForKeyCodeAndCocoaFlags(signed short keyCode, NSUInteger cocoaFlags) {
return SRStringForKeyCode(keyCode);
}
#pragma mark Animation Easing
// From: http://developer.apple.com/samplecode/AnimatedSlider/ as "easeFunction"
-double SRAnimationEaseInOut(double t) {
+CGFloat SRAnimationEaseInOut(CGFloat t) {
// This function implements a sinusoidal ease-in/ease-out for t = 0 to 1.0. T is scaled to represent the interval of one full period of the sine function, and transposed to lie above the X axis.
- double x = ((sin((t * M_PI) - M_PI_2) + 1.0 ) / 2.0);
+ CGFloat x = ((AIsin((t * (CGFloat)M_PI) - (CGFloat)M_PI_2) + 1.0f ) / 2.0f);
// NSLog(@"SRAnimationEaseInOut: %f. a: %f, b: %f, c: %f, d: %f, e: %f", t, (t * M_PI), ((t * M_PI) - M_PI_2), sin((t * M_PI) - M_PI_2), (sin((t * M_PI) - M_PI_2) + 1.0), x);
return x;
}
@@ -180,15 +182,16 @@
//----------------------------------------------------------
// + bezierPathWithSRCRoundRectInRect:radius:
//----------------------------------------------------------
-+ (NSBezierPath*)bezierPathWithSRCRoundRectInRect:(NSRect)aRect radius:(float)radius
++ (NSBezierPath*)bezierPathWithSRCRoundRectInRect:(NSRect)aRect radius:(CGFloat)radius
{
NSBezierPath* path = [self bezierPath];
- radius = MIN(radius, 0.5f * MIN(NSWidth(aRect), NSHeight(aRect)));
+ CGFloat widthOrHeight = MIN(NSWidth(aRect), NSHeight(aRect));
+ radius = MIN(radius, 0.5f * widthOrHeight);
NSRect rect = NSInsetRect(aRect, radius, radius);
- [path appendBezierPathWithArcWithCenter:NSMakePoint(NSMinX(rect), NSMinY(rect)) radius:radius startAngle:180.0 endAngle:270.0];
- [path appendBezierPathWithArcWithCenter:NSMakePoint(NSMaxX(rect), NSMinY(rect)) radius:radius startAngle:270.0 endAngle:360.0];
- [path appendBezierPathWithArcWithCenter:NSMakePoint(NSMaxX(rect), NSMaxY(rect)) radius:radius startAngle: 0.0 endAngle: 90.0];
- [path appendBezierPathWithArcWithCenter:NSMakePoint(NSMinX(rect), NSMaxY(rect)) radius:radius startAngle: 90.0 endAngle:180.0];
+ [path appendBezierPathWithArcWithCenter:NSMakePoint(NSMinX(rect), NSMinY(rect)) radius:radius startAngle:180.0f endAngle:270.0f];
+ [path appendBezierPathWithArcWithCenter:NSMakePoint(NSMaxX(rect), NSMinY(rect)) radius:radius startAngle:270.0f endAngle:360.0f];
+ [path appendBezierPathWithArcWithCenter:NSMakePoint(NSMaxX(rect), NSMaxY(rect)) radius:radius startAngle: 0.0f endAngle: 90.0f];
+ [path appendBezierPathWithArcWithCenter:NSMakePoint(NSMinX(rect), NSMaxY(rect)) radius:radius startAngle: 90.0f endAngle:180.0f];
[path closePath];
return path;
}
@@ -248,7 +251,7 @@
+ (void)_drawSRRemoveShortcutPressed:(id)anNSCustomImageRep;
+ (NSValue *)_sizeSRRemoveShortcutPressed;
-+ (void)_drawARemoveShortcutBoxUsingRep:(id)anNSCustomImageRep opacity:(double)opacity;
++ (void)_drawARemoveShortcutBoxUsingRep:(id)anNSCustomImageRep opacity:(CGFloat)opacity;
@end
@implementation SRSharedImageProvider
@@ -307,7 +310,7 @@
#define MakeRelativePoint(x,y) NSMakePoint(x*hScale, y*vScale)
+ (NSValue *)_sizeSRSnapback {
- return [NSValue valueWithSize:NSMakeSize(14.0,14.0)];
+ return [NSValue valueWithSize:NSMakeSize(14.0f,14.0f)];
}
+ (void)_drawSRSnapback:(id)anNSCustomImageRep {
@@ -316,32 +319,32 @@
NSCustomImageRep *rep = anNSCustomImageRep;
NSSize size = [rep size];
[[NSColor whiteColor] setFill];
- double hScale = (size.width/1.0);
- double vScale = (size.height/1.0);
+ CGFloat hScale = (size.width/1.0f);
+ CGFloat vScale = (size.height/1.0f);
NSBezierPath *bp = [[NSBezierPath alloc] init];
[bp setLineWidth:hScale];
- [bp moveToPoint:MakeRelativePoint(0.0489685, 0.6181513)];
- [bp lineToPoint:MakeRelativePoint(0.4085750, 0.9469318)];
- [bp lineToPoint:MakeRelativePoint(0.4085750, 0.7226146)];
- [bp curveToPoint:MakeRelativePoint(0.8508247, 0.4836237) controlPoint1:MakeRelativePoint(0.4085750, 0.7226146) controlPoint2:MakeRelativePoint(0.8371143, 0.7491841)];
- [bp curveToPoint:MakeRelativePoint(0.5507195, 0.0530682) controlPoint1:MakeRelativePoint(0.8677834, 0.1545071) controlPoint2:MakeRelativePoint(0.5507195, 0.0530682)];
- [bp curveToPoint:MakeRelativePoint(0.7421721, 0.3391942) controlPoint1:MakeRelativePoint(0.5507195, 0.0530682) controlPoint2:MakeRelativePoint(0.7458685, 0.1913146)];
- [bp curveToPoint:MakeRelativePoint(0.4085750, 0.5154130) controlPoint1:MakeRelativePoint(0.7383412, 0.4930328) controlPoint2:MakeRelativePoint(0.4085750, 0.5154130)];
- [bp lineToPoint:MakeRelativePoint(0.4085750, 0.2654000)];
+ [bp moveToPoint:MakeRelativePoint(0.0489685f, 0.6181513f)];
+ [bp lineToPoint:MakeRelativePoint(0.4085750f, 0.9469318f)];
+ [bp lineToPoint:MakeRelativePoint(0.4085750f, 0.7226146f)];
+ [bp curveToPoint:MakeRelativePoint(0.8508247f, 0.4836237f) controlPoint1:MakeRelativePoint(0.4085750f, 0.7226146f) controlPoint2:MakeRelativePoint(0.8371143f, 0.7491841f)];
+ [bp curveToPoint:MakeRelativePoint(0.5507195f, 0.0530682f) controlPoint1:MakeRelativePoint(0.8677834f, 0.1545071f) controlPoint2:MakeRelativePoint(0.5507195f, 0.0530682f)];
+ [bp curveToPoint:MakeRelativePoint(0.7421721f, 0.3391942f) controlPoint1:MakeRelativePoint(0.5507195f, 0.0530682f) controlPoint2:MakeRelativePoint(0.7458685f, 0.1913146f)];
+ [bp curveToPoint:MakeRelativePoint(0.4085750f, 0.5154130f) controlPoint1:MakeRelativePoint(0.7383412f, 0.4930328f) controlPoint2:MakeRelativePoint(0.4085750f, 0.5154130f)];
+ [bp lineToPoint:MakeRelativePoint(0.4085750f, 0.2654000f)];
NSAffineTransform *flip = [[NSAffineTransform alloc] init];
// [flip translateXBy:0.95 yBy:-1.0];
- [flip scaleXBy:0.9 yBy:1.0];
- [flip translateXBy:0.5 yBy:-0.5];
+ [flip scaleXBy:0.9f yBy:1.0f];
+ [flip translateXBy:0.5f yBy:-0.5f];
[bp transformUsingAffineTransform:flip];
NSShadow *sh = [[NSShadow alloc] init];
- [sh setShadowColor:[[NSColor blackColor] colorWithAlphaComponent:0.45]];
- [sh setShadowBlurRadius:1.0];
- [sh setShadowOffset:NSMakeSize(0.0,-1.0)];
+ [sh setShadowColor:[[NSColor blackColor] colorWithAlphaComponent:0.45f]];
+ [sh setShadowBlurRadius:1.0f];
+ [sh setShadowOffset:NSMakeSize(0.0f,-1.0f)];
[sh set];
[bp fill];
@@ -352,26 +355,26 @@
}
+ (NSValue *)_sizeSRRemoveShortcut {
- return [NSValue valueWithSize:NSMakeSize(14.0,14.0)];
+ return [NSValue valueWithSize:NSMakeSize(14.0f,14.0f)];
}
+ (NSValue *)_sizeSRRemoveShortcutRollover { return [self _sizeSRRemoveShortcut]; }
+ (NSValue *)_sizeSRRemoveShortcutPressed { return [self _sizeSRRemoveShortcut]; }
-+ (void)_drawARemoveShortcutBoxUsingRep:(id)anNSCustomImageRep opacity:(double)opacity {
++ (void)_drawARemoveShortcutBoxUsingRep:(id)anNSCustomImageRep opacity:(CGFloat)opacity {
// NSLog(@"drawARemoveShortcutBoxUsingRep: %@ opacity: %f", anNSCustomImageRep, opacity);
NSCustomImageRep *rep = anNSCustomImageRep;
NSSize size = [rep size];
- [[NSColor colorWithCalibratedWhite:0.0 alpha:1-opacity] setFill];
- double hScale = (size.width/14.0);
- double vScale = (size.height/14.0);
+ [[NSColor colorWithCalibratedWhite:0.0f alpha:1-opacity] setFill];
+ CGFloat hScale = (size.width/14.0f);
+ CGFloat vScale = (size.height/14.0f);
- [[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(0.0,0.0,size.width,size.height)] fill];
+ [[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(0.0f,0.0f,size.width,size.height)] fill];
[[NSColor whiteColor] setStroke];
NSBezierPath *cross = [[NSBezierPath alloc] init];
- [cross setLineWidth:hScale*1.2];
+ [cross setLineWidth:hScale*1.2f];
[cross moveToPoint:MakeRelativePoint(4,4)];
[cross lineToPoint:MakeRelativePoint(10,10)];
@@ -385,18 +388,18 @@
// NSLog(@"drawSRRemoveShortcut using: %@", anNSCustomImageRep);
- [self _drawARemoveShortcutBoxUsingRep:anNSCustomImageRep opacity:0.75];
+ [self _drawARemoveShortcutBoxUsingRep:anNSCustomImageRep opacity:0.75f];
}
+ (void)_drawSRRemoveShortcutRollover:(id)anNSCustomImageRep {
// NSLog(@"drawSRRemoveShortcutRollover using: %@", anNSCustomImageRep);
- [self _drawARemoveShortcutBoxUsingRep:anNSCustomImageRep opacity:0.65];
+ [self _drawARemoveShortcutBoxUsingRep:anNSCustomImageRep opacity:0.65f];
}
+ (void)_drawSRRemoveShortcutPressed:(id)anNSCustomImageRep {
// NSLog(@"drawSRRemoveShortcutPressed using: %@", anNSCustomImageRep);
- [self _drawARemoveShortcutBoxUsingRep:anNSCustomImageRep opacity:0.55];
+ [self _drawARemoveShortcutBoxUsingRep:anNSCustomImageRep opacity:0.55f];
}
@end
diff -r fafab246e257 -r 86d1432abf47 Frameworks/ShortcutRecorder/Source/SRRecorderCell.h
--- a/Frameworks/ShortcutRecorder/Source/SRRecorderCell.h Mon Dec 28 19:46:02 2009 -0500
+++ b/Frameworks/ShortcutRecorder/Source/SRRecorderCell.h Tue Dec 29 00:36:28 2009 -0500
@@ -16,14 +16,14 @@
#define SRMinWidth 50
#define SRMaxHeight 22
-#define SRTransitionFPS 30.0
-#define SRTransitionDuration 0.35
+#define SRTransitionFPS 30.0f
+#define SRTransitionDuration 0.35f
//#define SRTransitionDuration 2.35
#define SRTransitionFrames (SRTransitionFPS*SRTransitionDuration)
#define SRAnimationAxisIsY YES
#define ShortcutRecorderNewStyleDrawing
-#define SRAnimationOffsetRect(X,Y) (SRAnimationAxisIsY ? NSOffsetRect(X,0.0,-NSHeight(Y)) : NSOffsetRect(X,NSWidth(Y),0.0))
+#define SRAnimationOffsetRect(X,Y) (SRAnimationAxisIsY ? NSOffsetRect(X,0.0f,-NSHeight(Y)) : NSOffsetRect(X,NSWidth(Y),0.0f))
@class SRRecorderControl, CTGradient, SRValidator;
@@ -45,7 +45,7 @@
SRRecorderStyle style;
BOOL isAnimating;
- double transitionProgress;
+ CGFloat transitionProgress;
BOOL isAnimatingNow;
BOOL isAnimatingTowardsRecording;
BOOL comboJustChanged;
@@ -58,9 +58,9 @@
NSString *keyChars;
NSString *keyCharsIgnoringModifiers;
- unsigned int allowedFlags;
- unsigned int requiredFlags;
- unsigned int recordingFlags;
+ NSUInteger allowedFlags;
+ NSUInteger requiredFlags;
+ NSUInteger recordingFlags;
BOOL allowsKeyOnly;
BOOL escapeKeysRecord;
@@ -100,11 +100,11 @@
- (BOOL)performKeyEquivalent:(NSEvent *)theEvent;
- (void)flagsChanged:(NSEvent *)theEvent;
-- (unsigned int)allowedFlags;
-- (void)setAllowedFlags:(unsigned int)flags;
+- (NSUInteger)allowedFlags;
+- (void)setAllowedFlags:(NSUInteger)flags;
-- (unsigned int)requiredFlags;
-- (void)setRequiredFlags:(unsigned int)flags;
+- (NSUInteger)requiredFlags;
+- (void)setRequiredFlags:(NSUInteger)flags;
- (BOOL)allowsKeyOnly;
- (void)setAllowsKeyOnly:(BOOL)nAllowsKeyOnly escapeKeysRecord:(BOOL)nEscapeKeysRecord;
@@ -131,6 +131,6 @@
// Delegate Methods
@interface NSObject (SRRecorderCellDelegate)
-- (BOOL)shortcutRecorderCell:(SRRecorderCell *)aRecorderCell isKeyCode:(signed short)keyCode andFlagsTaken:(unsigned int)flags reason:(NSString **)aReason;
+- (BOOL)shortcutRecorderCell:(SRRecorderCell *)aRecorderCell isKeyCode:(signed short)keyCode andFlagsTaken:(NSUInteger)flags reason:(NSString **)aReason;
- (void)shortcutRecorderCell:(SRRecorderCell *)aRecorderCell keyComboDidChange:(KeyCombo)newCombo;
@end
diff -r fafab246e257 -r 86d1432abf47 Frameworks/ShortcutRecorder/Source/SRRecorderCell.m
--- a/Frameworks/ShortcutRecorder/Source/SRRecorderCell.m Mon Dec 28 19:46:02 2009 -0500
+++ b/Frameworks/ShortcutRecorder/Source/SRRecorderCell.m Tue Dec 29 00:36:28 2009 -0500
@@ -27,7 +27,7 @@
{
static NSGradient *grad;
if (!grad) {
- grad = [[NSGradient alloc] initWithStartingColor:[NSColor colorWithCalibratedWhite:0.75 alpha:alpha] endingColor:[NSColor colorWithCalibratedWhite:0.90 alpha:alpha]];
+ grad = [[NSGradient alloc] initWithStartingColor:[NSColor colorWithCalibratedWhite:0.75f alpha:alpha] endingColor:[NSColor colorWithCalibratedWhite:0.90f alpha:alpha]];
}
return grad;
}
@@ -36,7 +36,7 @@
{
static NSGradient *grad;
if (!grad) {
- grad = [[NSGradient alloc] initWithStartingColor:[NSColor colorWithCalibratedWhite:0.6 alpha:alpha] endingColor:[NSColor colorWithCalibratedWhite:0.75 alpha:alpha]];
+ grad = [[NSGradient alloc] initWithStartingColor:[NSColor colorWithCalibratedWhite:0.6f alpha:alpha] endingColor:[NSColor colorWithCalibratedWhite:0.75f alpha:alpha]];
}
return grad;
}
@@ -62,9 +62,9 @@
- (NSRect)_removeButtonRectForFrame:(NSRect)cellFrame;
- (NSRect)_snapbackRectForFrame:(NSRect)cellFrame;
-- (unsigned int)_filteredCocoaFlags:(unsigned int)flags;
-- (unsigned int)_filteredCocoaToCarbonFlags:(unsigned int)cocoaFlags;
-- (BOOL)_validModifierFlags:(unsigned int)flags;
+- (NSUInteger)_filteredCocoaFlags:(NSUInteger)flags;
+- (NSUInteger)_filteredCocoaToCarbonFlags:(NSUInteger)cocoaFlags;
+- (BOOL)_validModifierFlags:(NSUInteger)flags;
- (BOOL)_isEmpty;
@end
@@ -109,7 +109,7 @@
autosaveName = [[aDecoder decodeObjectForKey: @"autosaveName"] retain];
keyCombo.code = [[aDecoder decodeObjectForKey: @"keyComboCode"] shortValue];
- keyCombo.flags = [[aDecoder decodeObjectForKey: @"keyComboFlags"] unsignedIntValue];
+ keyCombo.flags = [[aDecoder decodeObjectForKey: @"keyComboFlags"] unsignedIntegerValue];
if ([aDecoder containsValueForKey:@"keyChars"]) {
hasKeyChars = YES;
@@ -117,8 +117,8 @@
keyCharsIgnoringModifiers = (NSString *)[aDecoder decodeObjectForKey: @"keyCharsIgnoringModifiers"];
}
- allowedFlags = [[aDecoder decodeObjectForKey: @"allowedFlags"] unsignedIntValue];
- requiredFlags = [[aDecoder decodeObjectForKey: @"requiredFlags"] unsignedIntValue];
+ allowedFlags = [[aDecoder decodeObjectForKey: @"allowedFlags"] unsignedIntegerValue];
+ requiredFlags = [[aDecoder decodeObjectForKey: @"requiredFlags"] unsignedIntegerValue];
allowsKeyOnly = [[aDecoder decodeObjectForKey:@"allowsKeyOnly"] boolValue];
escapeKeysRecord = [[aDecoder decodeObjectForKey:@"escapeKeysRecord"] boolValue];
@@ -129,10 +129,10 @@
autosaveName = [[aDecoder decodeObject] retain];
keyCombo.code = [[aDecoder decodeObject] shortValue];
- keyCombo.flags = [[aDecoder decodeObject] unsignedIntValue];
+ keyCombo.flags = [[aDecoder decodeObject] unsignedIntegerValue];
- allowedFlags = [[aDecoder decodeObject] unsignedIntValue];
- requiredFlags = [[aDecoder decodeObject] unsignedIntValue];
+ allowedFlags = [[aDecoder decodeObject] unsignedIntegerValue];
+ requiredFlags = [[aDecoder decodeObject] unsignedIntegerValue];
}
allowedFlags |= NSFunctionKeyMask;
@@ -149,10 +149,10 @@
if ([aCoder allowsKeyedCoding]) {
[aCoder encodeObject:[self autosaveName] forKey:@"autosaveName"];
[aCoder encodeObject:[NSNumber numberWithShort: keyCombo.code] forKey:@"keyComboCode"];
- [aCoder encodeObject:[NSNumber numberWithUnsignedInt: keyCombo.flags] forKey:@"keyComboFlags"];
+ [aCoder encodeObject:[NSNumber numberWithUnsignedInteger: keyCombo.flags] forKey:@"keyComboFlags"];
- [aCoder encodeObject:[NSNumber numberWithUnsignedInt: allowedFlags] forKey:@"allowedFlags"];
- [aCoder encodeObject:[NSNumber numberWithUnsignedInt: requiredFlags] forKey:@"requiredFlags"];
+ [aCoder encodeObject:[NSNumber numberWithUnsignedInteger: allowedFlags] forKey:@"allowedFlags"];
+ [aCoder encodeObject:[NSNumber numberWithUnsignedInteger: requiredFlags] forKey:@"requiredFlags"];
if (hasKeyChars) {
[aCoder encodeObject:keyChars forKey:@"keyChars"];
@@ -168,10 +168,10 @@
// Unkeyed archiving and encoding is deprecated and unsupported. Use keyed archiving and encoding.
[aCoder encodeObject: [self autosaveName]];
[aCoder encodeObject: [NSNumber numberWithShort: keyCombo.code]];
- [aCoder encodeObject: [NSNumber numberWithUnsignedInt: keyCombo.flags]];
+ [aCoder encodeObject: [NSNumber numberWithUnsignedInteger: keyCombo.flags]];
- [aCoder encodeObject: [NSNumber numberWithUnsignedInt: allowedFlags]];
- [aCoder encodeObject: [NSNumber numberWithUnsignedInt: requiredFlags]];
+ [aCoder encodeObject: [NSNumber numberWithUnsignedInteger: allowedFlags]];
+ [aCoder encodeObject: [NSNumber numberWithUnsignedInteger: requiredFlags]];
}
}
@@ -249,32 +249,32 @@
// Draw gradient when in recording mode
if (isRecording)
{
- roundedRect = [NSBezierPath bezierPathWithSRCRoundRectInRect:cellFrame radius:NSHeight(cellFrame)/2.0];
+ roundedRect = [NSBezierPath bezierPathWithSRCRoundRectInRect:cellFrame radius:NSHeight(cellFrame)/2.0f];
// Fill background with gradient
[[NSGraphicsContext currentContext] saveGraphicsState];
[roundedRect addClip];
- [recordingGradient drawInRect:cellFrame angle:90.0];
+ [recordingGradient drawInRect:cellFrame angle:90.0f];
[[NSGraphicsContext currentContext] restoreGraphicsState];
// Highlight if inside or down
if (mouseInsideTrackingArea)
{
- [[[NSColor blackColor] colorWithAlphaComponent: (mouseDown ? 0.4 : 0.2)] set];
+ [[[NSColor blackColor] colorWithAlphaComponent: (mouseDown ? 0.4f : 0.2f)] set];
[roundedRect fill];
}
// Draw snapback image
NSImage *snapBackArrow = SRResIndImage(@"SRSnapback");
- [snapBackArrow dissolveToPoint:[self _snapbackRectForFrame: cellFrame].origin fraction:1.0];
+ [snapBackArrow dissolveToPoint:[self _snapbackRectForFrame: cellFrame].origin fraction:1.0f];
// Because of the gradient and snapback image, the white rounded rect will be smaller
- whiteRect = NSInsetRect(cellFrame, 9.5, 2.0);
- whiteRect.origin.x -= 7.5;
+ whiteRect = NSInsetRect(cellFrame, 9.5f, 2.0f);
+ whiteRect.origin.x -= 7.5f;
}
// Draw white rounded box
- roundedRect = [NSBezierPath bezierPathWithSRCRoundRectInRect:whiteRect radius:NSHeight(whiteRect)/2.0];
+ roundedRect = [NSBezierPath bezierPathWithSRCRoundRectInRect:whiteRect radius:NSHeight(whiteRect)/2.0f];
[[NSGraphicsContext currentContext] saveGraphicsState];
[roundedRect addClip];
[[NSColor whiteColor] set];
@@ -291,7 +291,7 @@
{
NSString *removeImageName = [NSString stringWithFormat: @"SRRemoveShortcut%@", (mouseInsideTrackingArea ? (mouseDown ? @"Pressed" : @"Rollover") : (mouseDown ? @"Rollover" : @""))];
NSImage *removeImage = SRResIndImage(removeImageName);
- [removeImage dissolveToPoint:[self _removeButtonRectForFrame: cellFrame].origin fraction:1.0];
+ [removeImage dissolveToPoint:[self _removeButtonRectForFrame: cellFrame].origin fraction:1.0f];
}
}
@@ -369,20 +369,20 @@
[NSGraphicsContext saveGraphicsState];
NSSetFocusRingStyle(NSFocusRingOnly);
[[NSBezierPath bezierPathWithSRCRoundRectInRect:cellFrame //NSInsetRect(cellFrame,2,2)
- radius:NSHeight(cellFrame)/2.0] fill];
+ radius:NSHeight(cellFrame)/2.0f] fill];
[NSGraphicsContext restoreGraphicsState];
}
} else {
// NSRect rawCellFrame = cellFrame;
- cellFrame = NSInsetRect(cellFrame,0.5,0.5);
+ cellFrame = NSInsetRect(cellFrame,0.5f,0.5f);
NSRect whiteRect = cellFrame;
NSBezierPath *roundedRect;
BOOL isVaguelyRecording = isRecording;
- double xanim = 0.0;
+ CGFloat xanim = 0.0f;
if (isAnimatingNow) {
// NSLog(@"tp: %f; xanim: %f", transitionProgress, xanim);
@@ -390,9 +390,9 @@
// NSLog(@"tp: %f; xanim: %f", transitionProgress, xanim);
}
- double alphaRecording = 1.0; double alphaView = 1.0;
- if (isAnimatingNow && !isAnimatingTowardsRecording) { alphaRecording = 1.0 - xanim; alphaView = xanim; }
- if (isAnimatingNow && isAnimatingTowardsRecording) { alphaView = 1.0 - xanim; alphaRecording = xanim; }
+ CGFloat alphaRecording = 1.0f; CGFloat alphaView = 1.0f;
+ if (isAnimatingNow && !isAnimatingTowardsRecording) { alphaRecording = 1.0f - xanim; alphaView = xanim; }
+ if (isAnimatingNow && isAnimatingTowardsRecording) { alphaView = 1.0f - xanim; alphaRecording = xanim; }
if (isAnimatingNow) {
//NSLog(@"animation step: %f, effective: %f, alpha recording: %f, view: %f", transitionProgress, xanim, alphaRecording, alphaView);
@@ -411,22 +411,22 @@
// [transitionMovement translateXBy:(isAnimatingTowardsRecording ? -(NSWidth(cellFrame)*(1.0-xanim)) : +(NSWidth(cellFrame)*xanim)) yBy:0.0];
if (SRAnimationAxisIsY) {
// [viewportMovement translateXBy:0.0 yBy:(isAnimatingTowardsRecording ? -(NSHeight(cellFrame)*(xanim)) : -(NSHeight(cellFrame)*(1.0-xanim)))];
- [viewportMovement translateXBy:0.0 yBy:(isAnimatingTowardsRecording ? NSHeight(cellFrame)*(xanim) : NSHeight(cellFrame)*(1.0-xanim))];
+ [viewportMovement translateXBy:0.0f yBy:(isAnimatingTowardsRecording ? NSHeight(cellFrame)*(xanim) : NSHeight(cellFrame)*(1.0f-xanim))];
} else {
- [viewportMovement translateXBy:(isAnimatingTowardsRecording ? -(NSWidth(cellFrame)*(xanim)) : -(NSWidth(cellFrame)*(1.0-xanim))) yBy:0.0];
+ [viewportMovement translateXBy:(isAnimatingTowardsRecording ? -(NSWidth(cellFrame)*(xanim)) : -(NSWidth(cellFrame)*(1.0f-xanim))) yBy:0.0f];
}
} else {
if (SRAnimationAxisIsY) {
- [viewportMovement translateXBy:0.0 yBy:NSHeight(cellFrame)];
+ [viewportMovement translateXBy:0.0f yBy:NSHeight(cellFrame)];
} else {
- [viewportMovement translateXBy:-(NSWidth(cellFrame)) yBy:0.0];
+ [viewportMovement translateXBy:-(NSWidth(cellFrame)) yBy:0.0f];
}
}
}
// Draw white rounded box
- roundedRect = [NSBezierPath bezierPathWithSRCRoundRectInRect:whiteRect radius:NSHeight(whiteRect)/2.0];
+ roundedRect = [NSBezierPath bezierPathWithSRCRoundRectInRect:whiteRect radius:NSHeight(whiteRect)/2.0f];
[[NSColor whiteColor] set];
[[NSGraphicsContext currentContext] saveGraphicsState];
[roundedRect fill];
@@ -443,19 +443,19 @@
NSRect correctedSnapBackRect = snapBackRect;
// correctedSnapBackRect.origin.y = NSMinY(whiteRect);
correctedSnapBackRect.size.height = NSHeight(whiteRect);
- correctedSnapBackRect.size.width *= 1.3;
- correctedSnapBackRect.origin.y -= 5.0;
- correctedSnapBackRect.origin.x -= 1.5;
+ correctedSnapBackRect.size.width *= 1.3f;
+ correctedSnapBackRect.origin.y -= 5.0f;
+ correctedSnapBackRect.origin.x -= 1.5f;
- correctedSnapBackOrigin.x -= 0.5;
+ correctedSnapBackOrigin.x -= 0.5f;
correctedSnapBackRect.origin = [viewportMovement transformPoint:correctedSnapBackRect.origin];
NSBezierPath *snapBackButton = [NSBezierPath bezierPathWithRect:correctedSnapBackRect];
- [[[[NSColor windowFrameColor] shadowWithLevel:0.2] colorWithAlphaComponent:alphaRecording] set];
+ [[[[NSColor windowFrameColor] shadowWithLevel:0.2f] colorWithAlphaComponent:alphaRecording] set];
[snapBackButton stroke];
// NSLog(@"stroked along path of %@", NSStringFromRect(correctedSnapBackRect));
- [((mouseDown && mouseInsideTrackingArea) ? ([NSGradient unifiedPressedGradientWithAlpha:alphaRecording]) : ([NSGradient unifiedNormalGradientWithAlpha:alphaRecording])) drawInRect:NSInsetRect(correctedSnapBackRect,-([snapBackButton lineWidth]/2.0),-([snapBackButton lineWidth]/2.0)) angle:90];
+ [((mouseDown && mouseInsideTrackingArea) ? ([NSGradient unifiedPressedGradientWithAlpha:alphaRecording]) : ([NSGradient unifiedNormalGradientWithAlpha:alphaRecording])) drawInRect:NSInsetRect(correctedSnapBackRect,-([snapBackButton lineWidth]/2.0f),-([snapBackButton lineWidth]/2.0f)) angle:90];
/*
// Highlight if inside or down
if (mouseInsideTrackingArea)
@@ -466,7 +466,7 @@
// Draw snapback image
NSImage *snapBackArrow = SRResIndImage(@"SRSnapback");
- [snapBackArrow dissolveToPoint:correctedSnapBackOrigin fraction:1.0*alphaRecording];
+ [snapBackArrow dissolveToPoint:correctedSnapBackOrigin fraction:1.0f*alphaRecording];
}
// Draw border and remove badge if needed
@@ -490,11 +490,11 @@
[mpstyle setLineBreakMode: NSLineBreakByTruncatingTail];
[mpstyle setAlignment: NSCenterTextAlignment];
- double alphaCombo = alphaView;
- double alphaRecordingText = alphaRecording;
+ CGFloat alphaCombo = alphaView;
+ CGFloat alphaRecordingText = alphaRecording;
if (comboJustChanged) {
- alphaCombo = 1.0;
- alphaRecordingText = 0.0;//(alphaRecordingText/2.0);
+ alphaCombo = 1.0f;
+ alphaRecordingText = 0.0f;//(alphaRecordingText/2.0);
}
@@ -535,7 +535,7 @@
// Calculate rect in which to draw the text in...
NSRect textRect = SRAnimationOffsetRect(cellFrame,cellFrame);
//NSLog(@"draw record text in rect (preadjusted): %@", NSStringFromRect(textRect));
- textRect.origin.y -= 3.0;
+ textRect.origin.y -= 3.0f;
textRect.origin = [viewportMovement transformPoint:textRect.origin];
//NSLog(@"draw record text in rect: %@", NSStringFromRect(textRect));
@@ -574,7 +574,7 @@
//NSLog(@"draw view text in rect (pre-adjusted): %@", NSStringFromRect(textRect));
textRect.origin = [viewportMovement transformPoint:textRect.origin];
}
- textRect.origin.y = NSMinY(textRect)-3.0;// - ((lineHeight/2.0)+([f descender]/2.0));
+ textRect.origin.y = NSMinY(textRect)-3.0f;// - ((lineHeight/2.0)+([f descender]/2.0));
//NSLog(@"draw view text in rect: %@", NSStringFromRect(textRect));
@@ -591,7 +591,7 @@
[NSGraphicsContext saveGraphicsState];
NSSetFocusRingStyle(NSFocusRingOnly);
[[NSBezierPath bezierPathWithSRCRoundRectInRect:cellFrame //NSInsetRect(cellFrame,2,2)
- radius:NSHeight(cellFrame)/2.0] fill];
+ radius:NSHeight(cellFrame)/2.0f] fill];
[NSGraphicsContext restoreGraphicsState];
}
@@ -783,10 +783,10 @@
- (BOOL) performKeyEquivalent:(NSEvent *)theEvent
{
- unsigned int flags = [self _filteredCocoaFlags: [theEvent modifierFlags]];
+ NSUInteger flags = [self _filteredCocoaFlags: [theEvent modifierFlags]];
NSNumber *keyCodeNumber = [NSNumber numberWithUnsignedShort: [theEvent keyCode]];
BOOL snapback = [cancelCharacterSet containsObject: keyCodeNumber];
- BOOL validModifiers = [self _validModifierFlags: (snapback) ? [theEvent modifierFlags] : flags]; // Snapback key shouldn't interfer with required flags!
+ BOOL validModifiers = [self _validModifierFlags: (snapback) ? (unsigned int)[theEvent modifierFlags] : flags]; // Snapback key shouldn't interfer with required flags!
// Special case for the space key when we aren't recording...
if (!isRecording && [[theEvent characters] isEqualToString:@" "]) {
@@ -895,23 +895,23 @@
#pragma mark -
-- (unsigned int)allowedFlags
+- (NSUInteger)allowedFlags
{
return allowedFlags;
}
-- (void)setAllowedFlags:(unsigned int)flags
+- (void)setAllowedFlags:(NSUInteger)flags
{
allowedFlags = flags;
// filter new flags and change keycombo if not recording
if (isRecording)
{
- recordingFlags = [self _filteredCocoaFlags: [[NSApp currentEvent] modifierFlags]];;
+ recordingFlags = [self _filteredCocoaFlags: [[NSApp currentEvent] modifierFlags]];
}
else
{
- unsigned int originalFlags = keyCombo.flags;
+ NSUInteger originalFlags = keyCombo.flags;
keyCombo.flags = [self _filteredCocoaFlags: keyCombo.flags];
if (keyCombo.flags != originalFlags && keyCombo.code > ShortcutRecorderEmptyCode)
@@ -941,12 +941,12 @@
escapeKeysRecord = nEscapeKeysRecord;
}
-- (unsigned int)requiredFlags
+- (NSUInteger)requiredFlags
{
return requiredFlags;
}
-- (void)setRequiredFlags:(unsigned int)flags
+- (void)setRequiredFlags:(NSUInteger)flags
{
requiredFlags = flags;
@@ -957,7 +957,7 @@
}
else
{
- unsigned int originalFlags = keyCombo.flags;
+ NSUInteger originalFlags = keyCombo.flags;
keyCombo.flags = [self _filteredCocoaFlags: keyCombo.flags];
if (keyCombo.flags != originalFlags && keyCombo.code > ShortcutRecorderEmptyCode)
@@ -1076,8 +1076,8 @@
{
[recordingGradient autorelease];
- NSColor *gradientStartColor = [[[NSColor alternateSelectedControlColor] shadowWithLevel: 0.2] colorWithAlphaComponent: 0.9];
- NSColor *gradientEndColor = [[[NSColor alternateSelectedControlColor] highlightWithLevel: 0.2] colorWithAlphaComponent: 0.9];
+ NSColor *gradientStartColor = [[[NSColor alternateSelectedControlColor] shadowWithLevel: 0.2f] colorWithAlphaComponent: 0.9f];
+ NSColor *gradientEndColor = [[[NSColor alternateSelectedControlColor] highlightWithLevel: 0.2f] colorWithAlphaComponent: 0.9f];
recordingGradient = [[NSGradient alloc] initWithStartingColor:gradientStartColor endingColor:gradientEndColor];
@@ -1100,7 +1100,7 @@
if ([self _effectiveIsAnimating]) {
isAnimatingTowardsRecording = YES;
isAnimatingNow = YES;
- transitionProgress = 0.0;
+ transitionProgress = 0.0f;
[[self class] cancelPreviousPerformRequestsWithTarget:self selector:@selector(_transitionTick) object:nil];
[self performSelector:@selector(_transitionTick) withObject:nil afterDelay:(SRTransitionDuration/SRTransitionFrames)];
// NSLog(@"start recording-transition");
@@ -1113,7 +1113,7 @@
if ([self _effectiveIsAnimating]) {
isAnimatingTowardsRecording = NO;
isAnimatingNow = YES;
- transitionProgress = 0.0;
+ transitionProgress = 0.0f;
[[self class] cancelPreviousPerformRequestsWithTarget:self selector:@selector(_transitionTick) object:nil];
More information about the commits
mailing list