adium/adium

Comply to Cocoa memory management guidelines in AIFloater.

2012-01-24, Adrian Godoroja
af063450a8a4
Parents 09f21de0e8f2
Children f5dca08fb214d169c7f4e8a6060a3916abce
Comply to Cocoa memory management guidelines in AIFloater.
3 files changed, 12 insertions(+), 9 deletions(-)
  • +3 -2
    Frameworks/AIUtilities Framework/Source/AIFloater.h
  • +8 -6
    Frameworks/AIUtilities Framework/Source/AIFloater.m
  • +1 -1
    Frameworks/AIUtilities Framework/Source/AIImageButton.m
    • --- a/Frameworks/AIUtilities Framework/Source/AIFloater.h Tue Jan 24 21:20:40 2012 +0200
    +++ b/Frameworks/AIUtilities Framework/Source/AIFloater.h Tue Jan 24 22:24:42 2012 +0200
    @@ -20,7 +20,8 @@
    * @class AIFloater
    * @brief A programtically movable, fadable <tt>NSImage</tt> display class
    *
    - * <tt>AIFloater</tt> allows for the display of an <tt>NSImage</tt>, including an animating one, anywhere on the screen. The image can be easily moved programatically and will fade into and out of view as requested.
    + * <tt>AIFloater</tt> allows for the display of an <tt>NSImage</tt>, including an animating one, anywhere on the screen.
    + * The image can be easily moved programatically and will fade into and out of view as requested.
    */
    @interface AIFloater : NSObject {
    NSImageView *staticView;
    @@ -35,7 +36,7 @@
    *
    * It will handle releasing itself when closed; it need not be retained by the caller.
    */
    -+ (id)floaterWithImage:(NSImage *)inImage styleMask:(unsigned int)styleMask;
    ++ (id)newFloaterWithImage:(NSImage *)inImage styleMask:(unsigned int)styleMask;
    /*!
    * Position the float at a specified point
    --- a/Frameworks/AIUtilities Framework/Source/AIFloater.m Tue Jan 24 21:20:40 2012 +0200
    +++ b/Frameworks/AIUtilities Framework/Source/AIFloater.m Tue Jan 24 22:24:42 2012 +0200
    @@ -25,14 +25,16 @@
    #define WINDOW_FADE_SNAP 0.05f // How close to min/max we must get before fade is finished
    @interface AIFloater ()
    +
    - (id)initWithImage:(NSImage *)inImage styleMask:(unsigned int)styleMask;
    -- (void)_setWindowOpacity:(CGFloat)opacity;
    +- (void)AI_setWindowOpacity:(CGFloat)opacity;
    +
    @end
    @implementation AIFloater
    // Because the floater can control its own display, it retains itself and releases when it closes.
    -+ (id)floaterWithImage:(NSImage *)inImage styleMask:(unsigned int)styleMask
    ++ (id)newFloaterWithImage:(NSImage *)inImage styleMask:(unsigned int)styleMask
    {
    return [[self alloc] initWithImage:inImage styleMask:styleMask];
    }
    @@ -58,7 +60,7 @@
    [panel setHasShadow:YES];
    [panel setOpaque:NO];
    [panel setBackgroundColor:[NSColor clearColor]];
    - [self _setWindowOpacity:WINDOW_FADE_MIN];
    + [self AI_setWindowOpacity:WINDOW_FADE_MIN];
    // Setup the static view
    staticView = [[NSImageView alloc] initWithFrame:frame];
    @@ -106,7 +108,7 @@
    - (void)setMaxOpacity:(CGFloat)inMaxOpacity
    {
    maxOpacity = inMaxOpacity;
    - if (windowIsVisible) [self _setWindowOpacity:maxOpacity];
    + if (windowIsVisible) [self AI_setWindowOpacity:maxOpacity];
    }
    #pragma mark Window Visibility
    @@ -134,12 +136,12 @@
    [fadeAnimation startAnimation];
    }
    } else {
    - [self _setWindowOpacity:(windowIsVisible ? maxOpacity : WINDOW_FADE_MIN)];
    + [self AI_setWindowOpacity:(windowIsVisible ? maxOpacity : WINDOW_FADE_MIN)];
    }
    }
    }
    -- (void)_setWindowOpacity:(CGFloat)opacity
    +- (void)AI_setWindowOpacity:(CGFloat)opacity
    {
    [panel setAlphaValue:opacity];
    }
    --- a/Frameworks/AIUtilities Framework/Source/AIImageButton.m Tue Jan 24 21:20:40 2012 +0200
    +++ b/Frameworks/AIUtilities Framework/Source/AIImageButton.m Tue Jan 24 22:24:42 2012 +0200
    @@ -114,7 +114,7 @@
    point.x = maxXOrigin;
    }
    - imageFloater = [[AIFloater floaterWithImage:bigImage styleMask:NSBorderlessWindowMask] retain];
    + imageFloater = [[AIFloater newFloaterWithImage:bigImage styleMask:NSBorderlessWindowMask] retain];
    [imageFloater setMaxOpacity:1.0f];
    [imageFloater moveFloaterToPoint:point];
    [imageFloater setVisible:YES animate:NO];