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

rogerwang · rogerwang · commit 86e96ef0da2f · 2013-09-07T18:08:51.000+08:00
For nwjs#424
diff --git a/src/browser/native_window_mac.h b/src/browser/native_window_mac.h
@@ -70,6 +70,8 @@ class NativeWindowCocoa : public NativeWindow {
                                        bool enabled) OVERRIDE;
   virtual void SetToolbarUrlEntry(const std::string& url) OVERRIDE;
   virtual void SetToolbarIsLoading(bool loading) OVERRIDE;
+  virtual void SetInitialFocus(bool accept_focus) OVERRIDE;
+  virtual bool InitialFocus() OVERRIDE;
 
   // Called to handle a mouse event.
   void HandleMouseEvent(NSEvent* event);
@@ -128,6 +130,9 @@ class NativeWindowCocoa : public NativeWindow {
   // used in custom drag to compute the window movement.
   NSPoint last_mouse_location_;
 
+  bool initial_focus_;
+  bool first_show_;
+
   DISALLOW_COPY_AND_ASSIGN(NativeWindowCocoa);
 };
 
diff --git a/src/browser/native_window_mac.mm b/src/browser/native_window_mac.mm
@@ -287,10 +287,16 @@ - (NSRect)contentRectForFrameRect:(NSRect)frameRect {
       is_fullscreen_(false),
       is_kiosk_(false),
       attention_request_id_(0),
-      use_system_drag_(true) {
+      use_system_drag_(true),
+      initial_focus_(false),    // the initial value is different from other
+                                // platforms since osx will focus the first
+                                // window and we want to distinguish the first
+                                // window opening and Window.open case. See also #497
+      first_show_(true) {
   int width, height;
   manifest->GetInteger(switches::kmWidth, &width);
   manifest->GetInteger(switches::kmHeight, &height);
+  manifest->GetBoolean(switches::kmInitialFocus, &initial_focus_);
 
   NSRect main_screen_rect = [[[NSScreen screens] objectAtIndex:0] frame];
   NSRect cocoa_bounds = NSMakeRect(
@@ -412,15 +418,22 @@ - (NSRect)contentRectForFrameRect:(NSRect)frameRect {
   content::RenderWidgetHostView* rwhv =
       shell_->web_contents()->GetRenderWidgetHostView();
 
-  // orderFrontRegardless causes us to become the first responder. The usual
-  // Chrome assumption is that becoming the first responder = you have focus
-  // so we use this trick to refuse to become first responder during orderFrontRegardless
-
-  if (rwhv)
-    rwhv->SetTakesFocusOnlyOnMouseDown(true);
-  [window() orderFrontRegardless];
-  if (rwhv)
-    rwhv->SetTakesFocusOnlyOnMouseDown(false);
+  if (first_show_ && initial_focus_) {
+    [window() makeKeyAndOrderFront:nil];
+    // FIXME: the new window through Window.open failed
+    // the focus-on-load test
+  } else {
+    // orderFrontRegardless causes us to become the first responder. The usual
+    // Chrome assumption is that becoming the first responder = you have focus
+    // so we use this trick to refuse to become first responder during orderFrontRegardless
+
+    if (rwhv)
+      rwhv->SetTakesFocusOnlyOnMouseDown(true);
+    [window() orderFrontRegardless];
+    if (rwhv)
+      rwhv->SetTakesFocusOnlyOnMouseDown(false);
+  }
+  first_show_ = false;
 }
 
 void NativeWindowCocoa::Hide() {
@@ -618,6 +631,14 @@ - (NSRect)contentRectForFrameRect:(NSRect)frameRect {
   standard_menus.BuildWindowMenu();
 }
 
+void NativeWindowCocoa::SetInitialFocus(bool accept_focus) {
+  initial_focus_ = accept_focus;
+}
+
+bool NativeWindowCocoa::InitialFocus() {
+  return initial_focus_;
+}
+
 void NativeWindowCocoa::HandleMouseEvent(NSEvent* event) {
   if ([event type] == NSLeftMouseDown) {
     last_mouse_location_ =
