bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Mac:

Browse Source 
- Add support for popup windows.
- Fix select list bugs.
- Add additional tests to cefclient.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@182 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2011-02-02 02:25:32 +00:00
parent 5911e7027c
commit 02bd128046
8 changed files with 147 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
libcef/browser_impl_mac.mm
View File

@ -25,9 +25,9 @@ CefWindowHandle CefBrowserImpl::GetWindowHandle()
return window_info_.m_View;
}
gfx::NativeWindow CefBrowserImpl::UIT_GetMainWndHandle() const {
gfx::NativeView CefBrowserImpl::UIT_GetMainWndHandle() const {
REQUIRE_UIT();
return (NSWindow*)window_info_.m_View;
return (NSView*)window_info_.m_View;
}
void CefBrowserImpl::UIT_CreateBrowser(const CefString& url)
@ -44,9 +44,34 @@ void CefBrowserImpl::UIT_CreateBrowser(const CefString& url)
if (!settings_.developer_tools_disabled)
dev_tools_agent_.reset(new BrowserDevToolsAgent());
NSWindow* newWnd = nil;
NSView* parentView = (NSView*)window_info_.m_ParentView;
gfx::Rect contentRect(window_info_.m_x, window_info_.m_y,
window_info_.m_nWidth, window_info_.m_nHeight);
if (parentView == nil) {
// Create a new window.
NSRect screen_rect = [[NSScreen mainScreen] visibleFrame];
NSRect window_rect = {{window_info_.m_x,
screen_rect.size.height - window_info_.m_y},
{window_info_.m_nWidth, window_info_.m_nHeight}};
if (window_rect.size.width == 0)
window_rect.size.width = 500;
if (window_rect.size.height == 0)
window_rect.size.height = 500;
contentRect.SetRect(0, 0, window_rect.size.width, window_rect.size.height);
newWnd = [[NSWindow alloc]
initWithContentRect:window_rect
styleMask:(NSTitledWindowMask |
NSClosableWindowMask |
NSMiniaturizableWindowMask |
NSResizableWindowMask )
backing:NSBackingStoreBuffered
defer:NO];
parentView = [newWnd contentView];
window_info_.m_ParentView = (void*)parentView;
}
WebPreferences prefs;
BrowserToWebSettings(settings_, prefs);
@ -66,6 +91,11 @@ void CefBrowserImpl::UIT_CreateBrowser(const CefString& url)
Unlock();
if (newWnd != nil) {
// Show the window.
[newWnd makeKeyAndOrderFront: nil];
}
if(handler_.get()) {
// Notify the handler that we're done creating the new window
handler_->HandleAfterCreated(this);