mirror of
https://github.com/transmission/transmission
synced 2024-12-25 01:03:01 +00:00
attempt to fix stuck overlay window
This commit is contained in:
parent
41d5f3c8f5
commit
9f78eda964
2 changed files with 7 additions and 15 deletions
|
@ -158,16 +158,13 @@
|
|||
|
||||
- (void) fadeOut
|
||||
{
|
||||
if ([self alphaValue] > 0.0)
|
||||
//stop other animation and set to same progress
|
||||
if ([fFadeInAnimation isAnimating])
|
||||
{
|
||||
//stop other animation and set to same progress
|
||||
if ([fFadeInAnimation isAnimating])
|
||||
{
|
||||
[fFadeInAnimation stopAnimation];
|
||||
[fFadeOutAnimation setCurrentProgress: 1.0 - [fFadeInAnimation currentProgress]];
|
||||
}
|
||||
[fFadeOutAnimation startAnimation];
|
||||
[fFadeInAnimation stopAnimation];
|
||||
[fFadeOutAnimation setCurrentProgress: 1.0 - [fFadeInAnimation currentProgress]];
|
||||
}
|
||||
[fFadeOutAnimation startAnimation];
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
|
@ -350,9 +350,6 @@
|
|||
if (!fMenuTorrent || ![menu supermenu])
|
||||
return;
|
||||
|
||||
BOOL create = [menu numberOfItems] <= 0, folder;
|
||||
|
||||
#warning move to submethod
|
||||
if (menu == fUploadMenu || menu == fDownloadMenu)
|
||||
{
|
||||
BOOL upload = menu == fUploadMenu;
|
||||
|
@ -368,8 +365,6 @@
|
|||
|
||||
item = [menu itemWithTag: ACTION_MENU_GLOBAL_TAG];
|
||||
[item setState: mode == TR_SPEEDLIMIT_GLOBAL ? NSOnState : NSOffState];
|
||||
|
||||
return;
|
||||
}
|
||||
else if (menu == fRatioMenu)
|
||||
{
|
||||
|
@ -385,11 +380,11 @@
|
|||
|
||||
item = [menu itemWithTag: ACTION_MENU_GLOBAL_TAG];
|
||||
[item setState: mode == NSMixedState ? NSOnState : NSOffState];
|
||||
|
||||
return;
|
||||
}
|
||||
else if ([menu supermenu]) //assume the menu is part of the file list
|
||||
{
|
||||
BOOL create = [menu numberOfItems] <= 0, folder;
|
||||
|
||||
NSMenu * supermenu = [menu supermenu];
|
||||
NSArray * items;
|
||||
NSDictionary * folderDict;
|
||||
|
|
Loading…
Reference in a new issue