From e1ff0ceaff390a5af29ac0a74ffcefaafe483d22 Mon Sep 17 00:00:00 2001 From: Allan Odgaard Date: Sat, 27 Apr 2013 14:14:54 +0700 Subject: [PATCH] Move already open find/HTML windows to active space MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is only when invoking the “order front” action and the window is already showing on another space. --- Frameworks/Find/src/FindWindowController.mm | 9 +++++---- Frameworks/HTMLOutputWindow/src/HTMLOutputWindow.mm | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Frameworks/Find/src/FindWindowController.mm b/Frameworks/Find/src/FindWindowController.mm index e2dbfeba..e10cd4d3 100644 --- a/Frameworks/Find/src/FindWindowController.mm +++ b/Frameworks/Find/src/FindWindowController.mm @@ -177,10 +177,11 @@ static NSProgressIndicator* OakCreateProgressIndicator () NSRect r = [[NSScreen mainScreen] visibleFrame]; if((self = [super initWithWindow:[[NSPanel alloc] initWithContentRect:NSMakeRect(NSMidX(r)-100, NSMidY(r)+100, 200, 200) styleMask:(NSTitledWindowMask|NSClosableWindowMask|NSResizableWindowMask|NSMiniaturizableWindowMask) backing:NSBackingStoreBuffered defer:NO]])) { - self.window.title = @"Find"; - self.window.frameAutosaveName = @"Find"; - self.window.hidesOnDeactivate = NO; - self.window.delegate = self; + self.window.title = @"Find"; + self.window.frameAutosaveName = @"Find"; + self.window.hidesOnDeactivate = NO; + self.window.collectionBehavior = self.window.collectionBehavior | NSWindowCollectionBehaviorMoveToActiveSpace; + self.window.delegate = self; self.findLabel = OakCreateLabel(@"Find:"); self.findTextField = OakCreateTextField(self); diff --git a/Frameworks/HTMLOutputWindow/src/HTMLOutputWindow.mm b/Frameworks/HTMLOutputWindow/src/HTMLOutputWindow.mm index 8655e3c9..fb2f3195 100644 --- a/Frameworks/HTMLOutputWindow/src/HTMLOutputWindow.mm +++ b/Frameworks/HTMLOutputWindow/src/HTMLOutputWindow.mm @@ -33,6 +33,7 @@ static std::multimap Windows; [self.window setReleasedWhenClosed:NO]; [self.window setAutorecalculatesContentBorderThickness:NO forEdge:NSMinYEdge]; [self.window setContentBorderThickness:25 forEdge:NSMinYEdge]; + [self.window setCollectionBehavior:[self.window collectionBehavior] | NSWindowCollectionBehaviorMoveToActiveSpace]; [OakWindowFrameHelper windowFrameHelperWithWindow:self.window];