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

Merge pull request #7461 from electron/revert-7416-fix-windows-draggable-high-dpi

Browse source 
Revert "Fix for issues seen on frameless window (Windows) when at 200% resolution"
This commit is contained in:
Cheng Zhao 2016-10-03 20:42:44 +09:00 committed by GitHub
commit 3a4cd19226
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
atom/browser/native_window_views.cc
View file

@ -1155,6 +1155,9 @@ void NativeWindowViews::OnWidgetMove() {
gfx::Rect NativeWindowViews::ContentBoundsToWindowBounds( gfx::Rect NativeWindowViews::ContentBoundsToWindowBounds(
const gfx::Rect& bounds) { const gfx::Rect& bounds) {
if (!has_frame())
return bounds;
gfx::Rect window_bounds(bounds); gfx::Rect window_bounds(bounds);
#if defined(OS_WIN) #if defined(OS_WIN)
HWND hwnd = GetAcceleratedWidget(); HWND hwnd = GetAcceleratedWidget();
@ -1164,7 +1167,7 @@ gfx::Rect NativeWindowViews::ContentBoundsToWindowBounds(
window_->non_client_view()->GetWindowBoundsForClientBounds(dpi_bounds)); window_->non_client_view()->GetWindowBoundsForClientBounds(dpi_bounds));
#endif #endif
if (has_frame() && menu_bar_ && menu_bar_visible_) { if (menu_bar_ && menu_bar_visible_) {
window_bounds.set_y(window_bounds.y() - kMenuBarHeight); window_bounds.set_y(window_bounds.y() - kMenuBarHeight);
window_bounds.set_height(window_bounds.height() + kMenuBarHeight); window_bounds.set_height(window_bounds.height() + kMenuBarHeight);
} }
@ -1173,6 +1176,9 @@ gfx::Rect NativeWindowViews::ContentBoundsToWindowBounds(
gfx::Rect NativeWindowViews::WindowBoundsToContentBounds( gfx::Rect NativeWindowViews::WindowBoundsToContentBounds(
const gfx::Rect& bounds) { const gfx::Rect& bounds) {
if (!has_frame())
return bounds;
gfx::Rect content_bounds(bounds); gfx::Rect content_bounds(bounds);
#if defined(OS_WIN) #if defined(OS_WIN)
HWND hwnd = GetAcceleratedWidget(); HWND hwnd = GetAcceleratedWidget();
@ -1189,7 +1195,7 @@ gfx::Rect NativeWindowViews::WindowBoundsToContentBounds(
display::win::ScreenWin::ScreenToDIPSize(hwnd, content_bounds.size())); display::win::ScreenWin::ScreenToDIPSize(hwnd, content_bounds.size()));
#endif #endif
if (has_frame() && menu_bar_ && menu_bar_visible_) { if (menu_bar_ && menu_bar_visible_) {
content_bounds.set_y(content_bounds.y() + kMenuBarHeight); content_bounds.set_y(content_bounds.y() + kMenuBarHeight);
content_bounds.set_height(content_bounds.height() - kMenuBarHeight); content_bounds.set_height(content_bounds.height() - kMenuBarHeight);
} }