adium/adium

Fix an issue with 3de60ee28376 where the view wasn't sized properly.
adium-1.6
2013-06-13, Frank Dowsett
e9d7a175d087
Parents e7882467b4b0
Children f5f2b36c2143
Fix an issue with 3de60ee28376 where the view wasn't sized properly.
2 files changed, 7 insertions(+), 2 deletions(-)
  • +1 -0
    Plugins/Dual Window Interface/AIMessageViewController.h
  • +6 -2
    Plugins/Dual Window Interface/AIMessageViewController.m
    • --- a/Plugins/Dual Window Interface/AIMessageViewController.h Thu Jun 13 12:06:15 2013 -0400
    +++ b/Plugins/Dual Window Interface/AIMessageViewController.h Thu Jun 13 12:41:09 2013 -0400
    @@ -61,6 +61,7 @@
    AIChat *chat;
    BOOL suppressSendLaterPrompt;
    CGFloat entryMinHeight;
    + BOOL emoticonMenuEnabled;
    BOOL userListOnRight;
    CGFloat userListMinWidth;
    --- a/Plugins/Dual Window Interface/AIMessageViewController.m Thu Jun 13 12:06:15 2013 -0400
    +++ b/Plugins/Dual Window Interface/AIMessageViewController.m Thu Jun 13 12:41:09 2013 -0400
    @@ -619,8 +619,10 @@
    }
    } else if ([group isEqualToString:PREF_GROUP_EMOTICONS]) {
    if (firstTime || [key isEqualToString:KEY_EMOTICON_MENU_ENABLED]) {
    - [textView_outgoing setHasEmoticonsMenu:[[adium.preferenceController preferenceForKey:KEY_EMOTICON_MENU_ENABLED
    - group:PREF_GROUP_EMOTICONS] boolValue]];
    + emoticonMenuEnabled = [[prefDict objectForKey:KEY_EMOTICON_MENU_ENABLED] boolValue];
    +
    + if ([textView_outgoing chat])
    + [textView_outgoing setHasEmoticonsMenu:emoticonMenuEnabled];
    }
    }
    }
    @@ -673,6 +675,8 @@
    if ([[textView_outgoing enclosingScrollView] respondsToSelector:@selector(setVerticalScrollElasticity:)]) {
    [[textView_outgoing enclosingScrollView] setVerticalScrollElasticity:1]; // Swap 1 with NSScrollElasticityNone on 10.7+
    }
    +
    + [textView_outgoing setHasEmoticonsMenu:emoticonMenuEnabled];
    }
    /*!