mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2024-12-26 09:37:56 +00:00
Code Issues Releases Wiki Activity

attempt to fix stuck overlay window

Browse source
This commit is contained in:
Mitchell Livingston 2007-08-18 02:11:45 +00:00
parent 41d5f3c8f5
commit 9f78eda964
2 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
macosx/DragOverlayWindow.m
View file

@ -158,16 +158,13 @@
- (void) fadeOut - (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 [fFadeInAnimation stopAnimation];
if ([fFadeInAnimation isAnimating]) [fFadeOutAnimation setCurrentProgress: 1.0 - [fFadeInAnimation currentProgress]];
{
[fFadeInAnimation stopAnimation];
[fFadeOutAnimation setCurrentProgress: 1.0 - [fFadeInAnimation currentProgress]];
}
[fFadeOutAnimation startAnimation];
} }
[fFadeOutAnimation startAnimation];
} }
@end @end

9
macosx/TorrentTableView.m
View file

@ -350,9 +350,6 @@
if (!fMenuTorrent || ![menu supermenu]) if (!fMenuTorrent || ![menu supermenu])
return; return;
BOOL create = [menu numberOfItems] <= 0, folder;
#warning move to submethod
if (menu == fUploadMenu || menu == fDownloadMenu) if (menu == fUploadMenu || menu == fDownloadMenu)
{ {
BOOL upload = menu == fUploadMenu; BOOL upload = menu == fUploadMenu;
@ -368,8 +365,6 @@
item = [menu itemWithTag: ACTION_MENU_GLOBAL_TAG]; item = [menu itemWithTag: ACTION_MENU_GLOBAL_TAG];
[item setState: mode == TR_SPEEDLIMIT_GLOBAL ? NSOnState : NSOffState]; [item setState: mode == TR_SPEEDLIMIT_GLOBAL ? NSOnState : NSOffState];
return;
} }
else if (menu == fRatioMenu) else if (menu == fRatioMenu)
{ {
@ -385,11 +380,11 @@
item = [menu itemWithTag: ACTION_MENU_GLOBAL_TAG]; item = [menu itemWithTag: ACTION_MENU_GLOBAL_TAG];
[item setState: mode == NSMixedState ? NSOnState : NSOffState]; [item setState: mode == NSMixedState ? NSOnState : NSOffState];
return;
} }
else if ([menu supermenu]) //assume the menu is part of the file list else if ([menu supermenu]) //assume the menu is part of the file list
{ {
BOOL create = [menu numberOfItems] <= 0, folder;
NSMenu * supermenu = [menu supermenu]; NSMenu * supermenu = [menu supermenu];
NSArray * items; NSArray * items;
NSDictionary * folderDict; NSDictionary * folderDict;