Changeset 2828


Ignore:
Timestamp:
Aug 18, 2007, 2:11:45 AM (15 years ago)
Author:
livings124
Message:

attempt to fix stuck overlay window

Location:
trunk/macosx
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/macosx/DragOverlayWindow.m

    r2373 r2828  
    159159- (void) fadeOut
    160160{
    161     if ([self alphaValue] > 0.0)
     161    //stop other animation and set to same progress
     162    if ([fFadeInAnimation isAnimating])
    162163    {
    163         //stop other animation and set to same progress
    164         if ([fFadeInAnimation isAnimating])
    165         {
    166             [fFadeInAnimation stopAnimation];
    167             [fFadeOutAnimation setCurrentProgress: 1.0 - [fFadeInAnimation currentProgress]];
    168         }
    169         [fFadeOutAnimation startAnimation];
     164        [fFadeInAnimation stopAnimation];
     165        [fFadeOutAnimation setCurrentProgress: 1.0 - [fFadeInAnimation currentProgress]];
    170166    }
     167    [fFadeOutAnimation startAnimation];
    171168}
    172169
  • trunk/macosx/TorrentTableView.m

    r2827 r2828  
    351351        return;
    352352   
    353     BOOL create = [menu numberOfItems] <= 0, folder;
    354    
    355     #warning move to submethod
    356353    if (menu == fUploadMenu || menu == fDownloadMenu)
    357354    {
     
    369366        item = [menu itemWithTag: ACTION_MENU_GLOBAL_TAG];
    370367        [item setState: mode == TR_SPEEDLIMIT_GLOBAL ? NSOnState : NSOffState];
    371        
    372         return;
    373368    }
    374369    else if (menu == fRatioMenu)
     
    386381        item = [menu itemWithTag: ACTION_MENU_GLOBAL_TAG];
    387382        [item setState: mode == NSMixedState ? NSOnState : NSOffState];
    388        
    389         return;
    390383    }
    391384    else if ([menu supermenu]) //assume the menu is part of the file list
    392385    {
     386        BOOL create = [menu numberOfItems] <= 0, folder;
     387       
    393388        NSMenu * supermenu = [menu supermenu];
    394389        NSArray * items;
Note: See TracChangeset for help on using the changeset viewer.