Merge pull request #472 from adobe/jeff/PopupSizing-Final

Implement Sizing on Popup Windows

Author: redmunds

appshell/client_handler.cpp

@@ -15,6 +15,7 @@
 #include "appshell/appshell_extensions.h"
 #include "appshell/command_callbacks.h"
 
+
 // Custom menu command Ids.
 enum client_menu_ids {
   CLIENT_ID_SHOW_DEVTOOLS   = MENU_ID_USER_FIRST,
@@ -68,6 +69,83 @@ bool ClientHandler::OnProcessMessageReceived(
   return handled;
 }
 
+#ifndef OS_LINUX
+
+// CefWIndowInfo.height/.width aren't impelemented on Linux for some reason
+//  we'll want to revisit this when we integrate the next version of CEF
+
+static void SetValue(const std::string& name, const std::string& value, CefWindowInfo& windowInfo) {
+    if (name == "height") {
+        windowInfo.height = ::atoi(value.c_str());
+    } else if (name == "width") {
+        windowInfo.width = ::atoi(value.c_str());
+    }
+ }
+
+static void ParseParams(const std::string& params, CefWindowInfo& windowInfo) {
+    std::string name;
+    std::string value;
+    bool foundAssignmentToken = false;
+
+    for (unsigned i = 0; i < params.length(); i++) {
+        if (params[i] == '&') {
+            SetValue(name, value, windowInfo);
+            name.clear();
+            value.clear();
+            foundAssignmentToken = false;
+        } else if (params[i] == '=') {
+            foundAssignmentToken = true;
+        } else if (!foundAssignmentToken) {
+            name += params[i];
+        } else {
+            value+= params[i];
+        }
+    }
+
+    // set the last parsed value that didn't end with an &
+    SetValue(name, value, windowInfo);
+ }
+
+#endif
+
+bool ClientHandler::OnBeforePopup(CefRefPtr<CefBrowser> browser,
+                             CefRefPtr<CefFrame> frame,
+                             const CefString& target_url,
+                             const CefString& target_frame_name,
+                             const CefPopupFeatures& popupFeatures,
+                             CefWindowInfo& windowInfo,
+                             CefRefPtr<CefClient>& client,
+                             CefBrowserSettings& settings,
+                             bool* no_javascript_access) {
+#ifndef OS_LINUX
+    std::string address = target_url.ToString();
+    std::string url;
+    std::string params;
+    bool foundParamToken = false;
+
+    // make the input lower-case (easier string matching)
+    std::transform(address.begin(), address.end(), address.begin(), ::tolower);
+
+    for (unsigned i = 0; i < address.length(); i++) {
+        if (!foundParamToken) {
+            if (address[i] == L'?') {
+                foundParamToken = true;
+            } else {
+                url += address[i];
+            }
+        } else {
+            params += address[i];
+        }
+    }
+
+    if (url == "about:blank") {
+        ParseParams(params, windowInfo);
+        ComputePopupPlacement(windowInfo);
+    }
+#endif
+    return false;
+}
+
 void ClientHandler::OnAfterCreated(CefRefPtr<CefBrowser> browser) {
   REQUIRE_UI_THREAD();
 

appshell/client_handler.h

@@ -13,6 +13,10 @@
 #include "util.h"
 #include "command_callbacks.h"
 
+#include <algorithm> 
+
+
+
 // Define this value to redirect all popup URLs to the main application browser
 // window.
 // #define TEST_REDIRECT_POPUP_URLS
@@ -27,6 +31,7 @@ class ClientHandler : public CefClient,
                       public CefKeyboardHandler,
                       public CefGeolocationHandler,
                       public CefContextMenuHandler {
+ 
 public:
   // Interface for process message delegates. Do not perform work in the
   // RenderDelegate constructor.
@@ -100,6 +105,15 @@ class ClientHandler : public CefClient,
   } 
 
   // CefLifeSpanHandler methods
+  virtual bool OnBeforePopup(CefRefPtr<CefBrowser> browser,
+                             CefRefPtr<CefFrame> frame,
+                             const CefString& target_url,
+                             const CefString& target_frame_name,
+                             const CefPopupFeatures& popupFeatures,
+                             CefWindowInfo& windowInfo,
+                             CefRefPtr<CefClient>& client,
+                             CefBrowserSettings& settings,
+                             bool* no_javascript_access) OVERRIDE;
   virtual void OnAfterCreated(CefRefPtr<CefBrowser> browser) OVERRIDE;
   virtual bool DoClose(CefRefPtr<CefBrowser> browser) OVERRIDE;
   virtual void OnBeforeClose(CefRefPtr<CefBrowser> browser) OVERRIDE;
@@ -216,6 +230,7 @@ class ClientHandler : public CefClient,
   void SetLoading(bool isLoading);
   void SetNavState(bool canGoBack, bool canGoForward);
   void PopupCreated(CefRefPtr<CefBrowser> browser);
+  void ComputePopupPlacement(CefWindowInfo& windowInfo);
 
   // Create all of ProcessMessageDelegate objects.
   static void CreateProcessMessageDelegates(

appshell/client_handler_gtk.cpp

@@ -69,6 +69,11 @@ void ClientHandler::CloseMainWindow() {
   gtk_main_quit();
 }
 
+void ClientHandler::ComputePopupPlacement(CefWindowInfo& windowInfo)
+{
+  // TODO Finish this thing
+}
+
 void ClientHandler::PopupCreated(CefRefPtr<CefBrowser> browser)
 {
     // TODO Finish this thing

appshell/client_handler_mac.mm

@@ -404,9 +404,46 @@ - (void)windowDidResignKey:(NSNotification *)notification {
 }
 @end
 
+static bool centerMe = false;
+
+void ClientHandler::ComputePopupPlacement(CefWindowInfo& windowInfo)
+{
+    // CEF will transform the Y value returned here and use it to create
+    //  the window which ends up placing the window not where we want it
+    // Just set a flag to center the window using cocoa apis in PopupCreated
+    centerMe = true;
+}
+
+
 void ClientHandler::PopupCreated(CefRefPtr<CefBrowser> browser) {
   NSWindow* window = [browser->GetHost()->GetWindowHandle() window];
+    
   [window setCollectionBehavior: (1 << 7) /* NSWindowCollectionBehaviorFullScreenPrimary */];
+
+    
+  if (centerMe) {
+#ifdef _USE_COCOA_CENTERING
+      // Center on the display
+      [window center];
+#else
+      // Center within the main window
+      NSWindow* mainWindow = [m_MainHwnd window];
+      NSRect rect = [mainWindow frame];
+      NSRect windowRect = [window frame];
+      
+      float mW = rect.size.width;
+      float mH = rect.size.height;
+      float cW = windowRect.size.width;
+      float cH = windowRect.size.height;
+      
+      windowRect.origin.x = (rect.origin.x + (mW /2)) - (cW / 2);
+      windowRect.origin.y = (rect.origin.y + (mH /2)) - (cH / 2);
+
+      [window setFrame:windowRect display:YES];
+#endif
+      centerMe = false;
+  }
+
 
   // CEF3 is now using a window delegate with this revision http://code.google.com/p/chromiumembedded/source/detail?r=1149
   // And the declaration of the window delegate (CefWindowDelegate class) is in libcef/browser/browser_host_impl_mac.mm and
@@ -427,6 +464,7 @@ - (void)windowDidResignKey:(NSNotification *)notification {
       [window setDelegate:delegate];
       [delegate initUI];
   }
+
 }
 
 bool ClientHandler::OnPreKeyEvent(CefRefPtr<CefBrowser> browser,

appshell/client_handler_win.cpp

@@ -14,6 +14,10 @@
 
 #include "cef_popup_window.h"
 
+#include "cef_main_window.h"
+extern cef_main_window* gMainWnd;
+
+
 // Additional globals
 extern HACCEL hAccelTable;
 
@@ -115,3 +119,39 @@ bool ClientHandler::OnKeyEvent(CefRefPtr<CefBrowser> browser,
                                 CefEventHandle os_event) {
   return false;
 }
+
+
+ void ClientHandler::ComputePopupPlacement(CefWindowInfo& windowInfo)
+ {
+     RECT rectMainWnd;
+     gMainWnd->GetWindowRect(&rectMainWnd);
+
+     int mW = ::RectWidth(rectMainWnd);
+     int mH = ::RectHeight(rectMainWnd);
+     int cW = windowInfo.width;
+     int cH = windowInfo.height;
+
+     windowInfo.x = (rectMainWnd.left + (mW /2)) - (cW / 2);
+     windowInfo.y = (rectMainWnd.top + (mH /2)) - (cH / 2);
+
+     // don't go offscreen
+     if (windowInfo.x < 0) windowInfo.x = 0;
+     if (windowInfo.y < 0) windowInfo.y = 0;
+
+     HMONITOR hm = ::MonitorFromWindow(gMainWnd->GetSafeWnd(), MONITOR_DEFAULTTONEAREST); 
+     MONITORINFO mi = {0};
+     mi.cbSize = sizeof (mi);
+
+     GetMonitorInfo(hm, &mi);
+
+     if (windowInfo.width > ::RectWidth(mi.rcWork)) {
+         windowInfo.x = mi.rcWork.left;
+         windowInfo.width = mi.rcWork.right - windowInfo.x;
+     }
+
+     if (windowInfo.height > ::RectHeight(mi.rcWork)) {
+         windowInfo.y = mi.rcWork.top;
+         windowInfo.height = mi.rcWork.bottom - windowInfo.y;
+     }
+ }
+