Adium

Changeset 22142

Show
Ignore:
Timestamp:
01/06/2008 11:27:57 AM (11 months ago)
Author:
evands
Message:

I broke retention of the minimum text entry height on 10.5 in 1.2. This should fix it. Fixes #8759

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Plugins/Dual Window Interface/AIMessageViewController.m

    r22112 r22142  
    788788        if ([NSApp isOnLeopardOrBetter]) { 
    789789                //Attempt to maximize the message view's size.  We'll automatically restrict it to the correct minimum via the NSSplitView's delegate methods. 
    790                 [splitView_textEntryHorizontal setPosition:NSHeight([splitView_textEntryHorizontal frame]) 
     790                [splitView_textEntryHorizontal adjustSubviews]; 
     791                [splitView_textEntryHorizontal setPosition:(NSHeight([splitView_textEntryHorizontal frame]) - height) 
    791792                                                                  ofDividerAtIndex:0]; 
    792793                 
    …… 
    829830        //Our primary goal is to display all the entered text 
    830831        height = [textView_outgoing desiredSize].height; 
    831          
     832 
    832833        //But we must never fall below the user's prefered mininum or above the allowed height 
    833         if (!ignoreUserMininum && height < entryMinHeight) height = entryMinHeight; 
     834        if (!ignoreUserMininum && height < entryMinHeight) { 
     835                height = entryMinHeight; 
     836        } 
    834837        if (height > allowedHeight) height = allowedHeight; 
    835838         
    …… 
    10911094- (float)splitView:(NSSplitView *)sender constrainMaxCoordinate:(float)proposedMax ofSubviewAt:(int)offset 
    10921095{ 
    1093         if (sender == splitView_textEntryHorizontal) { 
     1096        if (sender == splitView_textEntryHorizontal) {          
    10941097                return ([sender frame].size.height - ([self _textEntryViewProperHeightIgnoringUserMininum:YES] + 
    10951098                                                                                         [sender dividerThickness])); 
    …… 
    11251128{ 
    11261129        if (sender == splitView_textEntryHorizontal) { 
    1127                 entryMinHeight = (int)([sender frame].size.height - (proposedPosition + [sender dividerThickness])); 
     1130                entryMinHeight = (int)([sender frame].size.height - proposedPosition); 
    11281131        } else { 
    11291132                NSLog(@"Unknown split view %@",sender);