mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

win: Fix setContentSize changing window position

Browse source 
Close #1934.
This commit is contained in:
Cheng Zhao 2015-06-18 16:17:13 +08:00
parent 2cb1aa6639
commit 19436358fb
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/native_window_views.cc
View file

@ -945,6 +945,7 @@ void NativeWindowViews::RegisterAccelerators(ui::MenuModel* menu_model) {
gfx::Rect NativeWindowViews::ContentBoundsToWindowBounds( gfx::Rect NativeWindowViews::ContentBoundsToWindowBounds(
const gfx::Rect& bounds) { const gfx::Rect& bounds) {
gfx::Point origin = bounds.origin();
#if defined(OS_WIN) #if defined(OS_WIN)
gfx::Rect dpi_bounds = gfx::win::DIPToScreenRect(bounds); gfx::Rect dpi_bounds = gfx::win::DIPToScreenRect(bounds);
gfx::Rect window_bounds = gfx::win::ScreenToDIPRect( gfx::Rect window_bounds = gfx::win::ScreenToDIPRect(
@ -953,6 +954,9 @@ gfx::Rect NativeWindowViews::ContentBoundsToWindowBounds(
gfx::Rect window_bounds = gfx::Rect window_bounds =
window_->non_client_view()->GetWindowBoundsForClientBounds(bounds); window_->non_client_view()->GetWindowBoundsForClientBounds(bounds);
#endif #endif
// The window's position would also be changed, but we only want to change
// the size.
window_bounds.set_origin(origin);
if (menu_bar_ && menu_bar_visible_) if (menu_bar_ && menu_bar_visible_)
window_bounds.set_height(window_bounds.height() + kMenuBarHeight); window_bounds.set_height(window_bounds.height() + kMenuBarHeight);