adium/adium

Fix the image copying to not repeatedly darken the emoticon menu for each new tab.
adium-1.6
2013-05-15, Frank Dowsett
6ce9b9ca54fe
Parents e59656c07a3d
Children 7f22572f0ffc
Fix the image copying to not repeatedly darken the emoticon menu for each new tab.
1 files changed, 8 insertions(+), 5 deletions(-)
  • +8 -5
    Frameworks/Adium Framework/Source/AIMessageEntryTextView.m
    • --- a/Frameworks/Adium Framework/Source/AIMessageEntryTextView.m Mon May 13 13:02:33 2013 -0400
    +++ b/Frameworks/Adium Framework/Source/AIMessageEntryTextView.m Wed May 15 12:14:06 2013 -0400
    @@ -1794,16 +1794,19 @@
    [emoticonsMenuButton setAction:@selector(popUpEmoticonsMenu)];
    [[emoticonsMenuButton cell] setImageScaling:NSImageScaleNone];
    - [emoticonsMenuButton setImage:[emoticonsMenuIcon copy]];
    + [emoticonsMenuButton setImage:emoticonsMenuIcon];
    +
    + NSImage *alternateMenuIcon = [emoticonsMenuIcon copy];
    // Adjust image for On/Alternate state
    - [emoticonsMenuIcon lockFocus];
    - [emoticonsMenuIcon drawAtPoint:NSZeroPoint fromRect:NSZeroRect operation:NSCompositePlusDarker fraction:0.5f];
    - [emoticonsMenuIcon unlockFocus];
    + [alternateMenuIcon lockFocus];
    + [alternateMenuIcon drawAtPoint:NSZeroPoint fromRect:NSZeroRect operation:NSCompositePlusDarker fraction:0.5f];
    + [alternateMenuIcon unlockFocus];
    - [emoticonsMenuButton setAlternateImage:emoticonsMenuIcon];
    + [emoticonsMenuButton setAlternateImage:alternateMenuIcon];
    [emoticonsMenuIcon release];
    + [alternateMenuIcon release];
    // Register for notifications
    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(positionIndicators:)