Changeset 12598 for trunk/macosx/Controller.m

Timestamp:

Jul 27, 2011, 3:38:01 AM (11 years ago)

Author:

livings124

Message:

Only show a single popover when excessively clicking the global and per-transfer action buttons

File:

• trunk/macosx/Controller.m (modified) (3 diffs)

trunk/macosx/Controller.m

@@ -357 +357 @@
         
         fQuitting = NO;
+        fGlobalPopoverShown = NO;
         fSoundPlaying = NO;
         
@@ -2220 +2221 @@
     if ([NSApp isOnLionOrBetter])
     {
+        if (fGlobalPopoverShown)
+            return;
+        
         NSPopover * popover = [[NSPopoverLion alloc] init];
         [popover setBehavior: NSPopoverBehaviorTransient];
         GlobalOptionsPopoverViewController * viewController = [[GlobalOptionsPopoverViewController alloc] initWithHandle: [PrefsController handle]];
         [popover setContentViewController: viewController];
+        [popover setDelegate: self];
         
         [popover showRelativeToRect: [sender frame] ofView: sender preferredEdge: NSMaxYEdge];
@@ -2248 +2253 @@
         }
     }
+}
+
+//don't show multiple popovers when clicking the gear button repeatedly
+- (void) popoverWillShow: (NSNotification *) notification
+{
+    fGlobalPopoverShown = YES;
+}
+
+- (void) popoverWillClose: (NSNotification *) notification
+{
+    fGlobalPopoverShown = NO;
 }