Win: implement 'focus' property of Window to set initial focus

rogerwang · rogerwang · commit 576259c676be · 2013-09-07T18:08:51.000+08:00
Fix nwjs#424
diff --git a/src/browser/native_window_win.cc b/src/browser/native_window_win.cc
@@ -246,7 +246,10 @@ NativeWindowWin::NativeWindowWin(const base::WeakPtr<content::Shell>& shell,
       menu_(NULL),
       resizable_(true),
       minimum_size_(0, 0),
-      maximum_size_() {
+      maximum_size_(),
+      initial_focus_(true) {
+  manifest->GetBoolean("focus", &initial_focus_);
+
   window_ = new views::Widget;
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
   params.delegate = this;
@@ -287,9 +290,13 @@ void NativeWindowWin::Focus(bool focus) {
 }
 
 void NativeWindowWin::Show() {
+  VLOG(1) << "NativeWindowWin::Show(); initial_focus = " << initial_focus_;
   if (is_maximized_)
     window_->native_widget_private()->ShowWithWindowState(ui::SHOW_STATE_MAXIMIZED);
-  else
+  else if (!initial_focus_) {
+    window_->set_focus_on_creation(false);
+    window_->native_widget_private()->ShowWithWindowState(ui::SHOW_STATE_INACTIVE);
+  } else
     window_->native_widget_private()->Show();
 }
 
@@ -604,6 +611,10 @@ void NativeWindowWin::OnFocus() {
   web_view_->RequestFocus();
 }
 
+void NativeWindowWin::SetInitialFocus(bool initial_focus) {
+  initial_focus_ = initial_focus;
+}
+
 bool NativeWindowWin::ExecuteWindowsCommand(int command_id) {
   // Windows uses the 4 lower order bits of |command_id| for type-specific
   // information so we must exclude this when comparing.
diff --git a/src/browser/native_window_win.h b/src/browser/native_window_win.h
@@ -79,6 +79,8 @@ class NativeWindowWin : public NativeWindow,
                                        bool enabled) OVERRIDE;
   virtual void SetToolbarUrlEntry(const std::string& url) OVERRIDE;
   virtual void SetToolbarIsLoading(bool loading) OVERRIDE;
+  virtual void SetInitialFocus(bool initial_focus) OVERRIDE;
+  virtual bool InitialFocus() OVERRIDE { return initial_focus_; }
 
   // WidgetDelegate implementation.
   virtual views::View* GetContentsView() OVERRIDE;
@@ -146,6 +148,8 @@ class NativeWindowWin : public NativeWindow,
   gfx::Size minimum_size_;
   gfx::Size maximum_size_;
 
+  bool initial_focus_;
+
   DISALLOW_COPY_AND_ASSIGN(NativeWindowWin);
 };
 
