chromium/src
0
Fork 0
Code Activity

Fix window position restore

Browse Source 
During window position restore the ScreenWin::DIPToScreenRect function
is called (at least) twice. Early on it is called with nullptr for hwnd
and it does the correct calculations, using Chrome's cached copy of
monitor resolutions in DPI and screen pixels. Later on it is called with
a non-zero hwnd and it uses Windows functions and they give incorrect
results on multi-monitor setups with variable DPI. Specifically the DPI
of monitor zero is used for all of the adjustments. This may be because
our hwnd is not yet properly set up (we are, after all, calculating
where we should put it) or it may be a Windows bug or quirk.

The HWND parameter is needed in some cases, specifically when handling
Windows OS TSF IME in a window that spans monitors with different DIP
settings, however no cases were found where the
ScreenWin::DIPToScreenRectInWindow function needs to pass a non-NULL
hwnd. Therefore this function is modified to always pass nullptr which
maintains correct behavior of IME, even in the edge cases, while fixing
window-restore behavior (tested with the Chrome task manager).

Some edge case bugs around tooltips were found and separate bugs were
filed for those.

Testing: Manually tested for the window-restore fix and for correct
cross-monitor OS IME behavior.

Bug: 1224715
Change-Id: I3efc366e986d6e08df8dbffcee8d7ab8257939d7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2989185
Commit-Queue: Bruce Dawson <brucedawson@chromium.org>
Reviewed-by: Robert Liao <robliao@chromium.org>
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#902720}
This commit is contained in:
Bruce Dawson
2021-07-16 22:54:45 +00:00
committed by Chromium LUCI CQ
parent 0b4a597912
commit b61359cb40
2 changed files with 12 additions and 0 deletions
ui
display
win
screen_win.cc
views
widget
desktop_aura
desktop_window_tree_host.cc

3
ui/display/win/screen_win.cc

@ -541,6 +541,9 @@ gfx::Rect ScreenWin::ScreenToDIPRect(HWND hwnd, const gfx::Rect& pixel_bounds) {
// static
gfx::Rect ScreenWin::DIPToScreenRect(HWND hwnd, const gfx::Rect& dip_bounds) {
// The HWND parameter is needed for cases where Chrome windows span monitors
// that have different DPI settings. This is known to matter when using the OS
// IME support. See https::/crbug.com/1224715 for more details.
const ScreenWinDisplay screen_win_display = hwnd
? GetScreenWinDisplayVia(&ScreenWin::GetScreenWinDisplayNearestHWND, hwnd)
: GetScreenWinDisplayVia(

9
ui/views/widget/desktop_aura/desktop_window_tree_host.cc

@ -4,6 +4,7 @@
#include "ui/views/widget/desktop_aura/desktop_window_tree_host.h"
#include "build/build_config.h"
#include "ui/aura/window.h"
#include "ui/aura/window_tree_host.h"
#include "ui/display/screen.h"
@ -12,7 +13,15 @@
namespace views {
void DesktopWindowTreeHost::SetBoundsInDIP(const gfx::Rect& bounds) {
#if defined(OS_WIN)
// The window parameter is intentionally passed as nullptr on Windows because
// a non-null window parameter causes errors when restoring windows to saved
// positions in variable-DPI situations. See https://crbug.com/1224715 for
// details.
aura::Window* root = nullptr;
#else
aura::Window* root = AsWindowTreeHost()->window();
#endif
const gfx::Rect bounds_in_pixels =
display::Screen::GetScreen()->DIPToScreenRectInWindow(root, bounds);
AsWindowTreeHost()->SetBoundsInPixels(bounds_in_pixels);