Merge pull request #118 from getlantern/ox/issue109

When launching app window on macOS, make application a foreground app…

.gitignore

@@ -1,4 +1,6 @@
 example/example
+example/main
+example/main.exe
 *~
 *.swp
 *.exe

example/main.go

@@ -66,7 +66,7 @@ func onReady() {
 				mEnabled.SetTitle("Disabled")
 				mEnabled.Disable()
 			case <-mUrl.ClickedCh:
-				systray.ShowAppWindow("https://www.getlantern.org")
+				systray.ShowAppWindow("https://www.github.com/getlantern/lantern")
 			case <-mToggle.ClickedCh:
 				if shown {
 					mQuitOrig.Hide()

systray_browser_darwin.m

@@ -3,6 +3,7 @@
 #include "systray.h"
 
 NSWindowController *windowController = nil;
+NSWindow *window = nil;
 WKWebView *webView = nil;
 
 void configureAppWindow(char* title, int width, int height)
@@ -12,15 +13,17 @@ void configureAppWindow(char* title, int width, int height)
     return;
   }
 
+  NSApplication *app = [NSApplication sharedApplication];
+  [app setActivationPolicy:NSApplicationActivationPolicyRegular];
+  [app activateIgnoringOtherApps:YES];
+
   NSRect frame = NSMakeRect(0, 0, width, height);
   int mask = NSWindowStyleMaskTitled | NSWindowStyleMaskResizable | NSWindowStyleMaskClosable;
-  NSWindow *window =
-    [[NSWindow alloc] initWithContentRect:frame
-                                 styleMask:mask
-                                   backing:NSBackingStoreBuffered
-                                     defer:NO];
+  window = [[NSWindow alloc] initWithContentRect:frame
+                              styleMask:mask
+                              backing:NSBackingStoreBuffered
+                              defer:NO];
   [window setTitle:[[NSString alloc] initWithUTF8String:title]];
-  [window makeKeyAndOrderFront:nil];
   [window center];
 
   NSView *contentView = [window contentView];
@@ -46,6 +49,7 @@ void configureAppWindow(char* title, int width, int height)
 
   // Window controller:
   windowController = [[NSWindowController alloc] initWithWindow:window];
+
   free(title);
 }
 
@@ -55,12 +59,13 @@ void doShowAppWindow(char* url)
     // no app window to open
     return;
   }
+
   id nsURL = [NSURL URLWithString:[[NSString alloc] initWithUTF8String:url]];
   id req = [[NSURLRequest alloc] initWithURL: nsURL
                                  cachePolicy: NSURLRequestUseProtocolCachePolicy
                                  timeoutInterval: 5];
   [webView loadRequest:req];
-  [windowController.window orderFrontRegardless];
+  [windowController showWindow:window];
   free(url);
 }
 

systray_darwin.m

@@ -187,8 +187,6 @@ - (void) quit
 
 @end
 
-void configureAppWindow(char* title, int width, int height);
-
 int nativeLoop(char* title, int width, int height) {
   AppDelegate *delegate = [[AppDelegate alloc] init];
   [[NSApplication sharedApplication] setDelegate:delegate];