Merge pull request #717 from atom/show-inactive

Add BrowserWindow.showInactive()

atom/browser/api/atom_api_window.cc

@@ -153,6 +153,10 @@ void Window::Show() {
   window_->Show();
 }
 
+void Window::ShowInactive() {
+  window_->ShowInactive();
+}
+
 void Window::Hide() {
   window_->Hide();
 }
@@ -388,6 +392,7 @@ void Window::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("focus", &Window::Focus)
       .SetMethod("isFocused", &Window::IsFocused)
       .SetMethod("show", &Window::Show)
+      .SetMethod("showInactive", &Window::ShowInactive)
       .SetMethod("hide", &Window::Hide)
       .SetMethod("isVisible", &Window::IsVisible)
       .SetMethod("maximize", &Window::Maximize)

atom/browser/api/atom_api_window.h

@@ -59,6 +59,7 @@ class Window : public mate::EventEmitter,
   void Focus();
   bool IsFocused();
   void Show();
+  void ShowInactive();
   void Hide();
   bool IsVisible();
   void Maximize();

atom/browser/native_window.h

@@ -101,6 +101,7 @@ class NativeWindow : public brightray::DefaultWebContentsDelegate,
   virtual void Focus(bool focus) = 0;
   virtual bool IsFocused() = 0;
   virtual void Show() = 0;
+  virtual void ShowInactive() = 0;
   virtual void Hide() = 0;
   virtual bool IsVisible() = 0;
   virtual void Maximize() = 0;

atom/browser/native_window_mac.h

@@ -28,6 +28,7 @@ class NativeWindowMac : public NativeWindow {
   virtual void Focus(bool focus) OVERRIDE;
   virtual bool IsFocused() OVERRIDE;
   virtual void Show() OVERRIDE;
+  virtual void ShowInactive() OVERRIDE;
   virtual void Hide() OVERRIDE;
   virtual bool IsVisible() OVERRIDE;
   virtual void Maximize() OVERRIDE;

atom/browser/native_window_mac.mm

@@ -334,6 +334,10 @@ bool NativeWindowMac::IsFocused() {
 }
 
 void NativeWindowMac::Show() {
+  [window_ makeKeyAndOrderFront:nil];
+}
+
+void NativeWindowMac::ShowInactive() {
   [window_ orderFrontRegardless];
 }
 

atom/browser/native_window_views.cc

@@ -232,6 +232,10 @@ bool NativeWindowViews::IsFocused() {
 }
 
 void NativeWindowViews::Show() {
+  window_->Show();
+}
+
+void NativeWindowViews::ShowInactive() {
   window_->ShowInactive();
 }
 

atom/browser/native_window_views.h

@@ -38,6 +38,7 @@ class NativeWindowViews : public NativeWindow,
   virtual void Focus(bool focus) OVERRIDE;
   virtual bool IsFocused() OVERRIDE;
   virtual void Show() OVERRIDE;
+  virtual void ShowInactive() OVERRIDE;
   virtual void Hide() OVERRIDE;
   virtual bool IsVisible() OVERRIDE;
   virtual void Maximize() OVERRIDE;

docs/api/browser-window.md

@@ -232,7 +232,11 @@ Returns whether the window is focused.
 
 ### BrowserWindow.show()
 
-Shows the window.
+Shows and gives focus to the window.
+
+### BrowserWindow.showInactive()
+
+Shows the window but doesn't focus on it.
 
 ### BrowserWindow.hide()
 

spec/api-browser-window-spec.coffee

@@ -5,6 +5,8 @@ remote = require 'remote'
 
 BrowserWindow = remote.require 'browser-window'
 
+isCI = remote.process.argv[1] == '--ci'
+
 describe 'browser-window module', ->
   fixtures = path.resolve __dirname, 'fixtures'
 
@@ -57,8 +59,14 @@ describe 'browser-window module', ->
       w.loadUrl 'about:blank'
 
   describe 'BrowserWindow.show()', ->
-    it 'should not focus window', ->
+    it 'should focus on window', ->
+      return if isCI
       w.show()
+      assert w.isFocused()
+
+  describe 'BrowserWindow.showInactive()', ->
+    it 'should not focus on window', ->
+      w.showInactive()
       assert !w.isFocused()
 
   describe 'BrowserWindow.focus()', ->