Allow popover to be dismissed

gnustep · Oct 1, 2023 · 4c6b833 · 4c6b833
1 parent 14baf92
commit 4c6b833
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 10 deletions.
diff --git a/Headers/AppKit/NSStoryboardSegue.h b/Headers/AppKit/NSStoryboardSegue.h
@@ -45,11 +45,14 @@ APPKIT_EXPORT_CLASS
   id _sourceController;
   id _destinationController;
   NSStoryboardSegueIdentifier _identifier;
+
   NSString *_kind;
   NSString *_relationship;
   id _popoverAnchorView;
   NSPopoverBehavior _popoverBehavior;
+  NSPopover *_popover;
   NSRectEdge _preferredEdge;
+
   GSStoryboardSeguePerformHandler _handler;
 }
 

diff --git a/Source/NSPopover.m b/Source/NSPopover.m
@@ -232,12 +232,16 @@ - (void) close
 {
   [_realPanel close];
   [_realPanel setDelegate:nil];
+  [_realPanel orderOut: nil];
+  _shown = NO;
 }
 
 - (IBAction) performClose: (id)sender
 {
-  [_realPanel performClose:sender];
-  [_realPanel setDelegate:nil];
+  [_realPanel performClose: sender];
+  [_realPanel setDelegate: nil];
+  [_realPanel orderOut: nil];
+  _shown = NO;
 }
 
 - (void) showRelativeToRect: (NSRect)positioningRect

diff --git a/Source/NSStoryboardSegue.m b/Source/NSStoryboardSegue.m
@@ -172,14 +172,27 @@ - (void) perform
     }
   else if ([_kind isEqualToString: @"popover"])
     {
-      NSPopover *po = [[NSPopover alloc] init];
-      NSRect rect = [_popoverAnchorView frame];
-
-      [po setBehavior: _popoverBehavior];
-      [po setContentViewController: _destinationController];
-      [po showRelativeToRect: rect
-                      ofView: _popoverAnchorView
-               preferredEdge: _preferredEdge];      
+      if (_popover == nil)
+	{
+	  NSPopover *po = [[NSPopover alloc] init];
+	  NSRect rect = [_popoverAnchorView frame];
+
+	  _popover = po; // weak... since we manually release...
+	  [po setBehavior: _popoverBehavior];
+	  [po setContentViewController: _destinationController];
+	  [po showRelativeToRect: rect
+			  ofView: _popoverAnchorView
+		   preferredEdge: _preferredEdge];
+	}
+      else
+	{
+	  if ([_popover behavior] == NSPopoverBehaviorTransient)
+	    {
+	      [_popover close];
+	      RELEASE(_popover);
+	      _popover = nil;
+	    }
+	}
     }
   else if ([_kind isEqualToString: @"sheet"])
     {