bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Windows: cefclient: Size browser window correctly when RootWindow is initially shown as maximized (issue #1745)

This commit is contained in:
Marshall Greenblatt 2015-10-23 15:02:10 -04:00
parent 018f9b0f9a
commit b731133713
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tests/cefclient/browser/root_window_win.cc
View File

@ -643,16 +643,24 @@ void RootWindowWin::OnSize(bool minimized) {
int urloffset = rect.left + button_width * 4; int urloffset = rect.left + button_width * 4;
if (browser_window_) { // |browser_hwnd| may be NULL if the browser has not yet been created.
HWND browser_hwnd = browser_window_->GetWindowHandle(); HWND browser_hwnd = NULL;
HDWP hdwp = BeginDeferWindowPos(1); if (browser_window_)
browser_hwnd = browser_window_->GetWindowHandle();
if (browser_hwnd) {
// Resize both the browser and the URL edit field.
HDWP hdwp = BeginDeferWindowPos(2);
hdwp = DeferWindowPos(hdwp, edit_hwnd_, NULL, urloffset, hdwp = DeferWindowPos(hdwp, edit_hwnd_, NULL, urloffset,
0, rect.right - urloffset, urlbar_height, SWP_NOZORDER); 0, rect.right - urloffset, urlbar_height, SWP_NOZORDER);
hdwp = DeferWindowPos(hdwp, browser_hwnd, NULL, hdwp = DeferWindowPos(hdwp, browser_hwnd, NULL,
rect.left, rect.top, rect.right - rect.left, rect.left, rect.top, rect.right - rect.left,
rect.bottom - rect.top, SWP_NOZORDER); rect.bottom - rect.top, SWP_NOZORDER);
EndDeferWindowPos(hdwp); BOOL result = EndDeferWindowPos(hdwp);
ALLOW_UNUSED_LOCAL(result);
DCHECK(result);
} else { } else {
// Resize just the URL edit field.
SetWindowPos(edit_hwnd_, NULL, urloffset, SetWindowPos(edit_hwnd_, NULL, urloffset,
0, rect.right - urloffset, urlbar_height, SWP_NOZORDER); 0, rect.right - urloffset, urlbar_height, SWP_NOZORDER);
} }
@ -802,10 +810,14 @@ void RootWindowWin::OnDestroyed() {
void RootWindowWin::OnBrowserCreated(CefRefPtr<CefBrowser> browser) { void RootWindowWin::OnBrowserCreated(CefRefPtr<CefBrowser> browser) {
REQUIRE_MAIN_THREAD(); REQUIRE_MAIN_THREAD();
// For popup browsers create the root window once the browser has been if (is_popup_) {
// created. // For popup browsers create the root window once the browser has been
if (is_popup_) // created.
CreateRootWindow(CefBrowserSettings()); CreateRootWindow(CefBrowserSettings());
} else {
// Make sure the browser is sized correctly.
OnSize(false);
}
} }
void RootWindowWin::OnBrowserWindowDestroyed() { void RootWindowWin::OnBrowserWindowDestroyed() {