diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-28 22:03:03 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-28 22:03:03 +0000 |
commit | a591a96f052fb780f164bd3301c6fef49a116298 (patch) | |
tree | 00f0f40905bc2e03dab1d0690f1d06dd91cbc26c /views | |
parent | b919e251d0b642725616ccb15874a9587a4de3c7 (diff) | |
download | chromium_src-a591a96f052fb780f164bd3301c6fef49a116298.zip chromium_src-a591a96f052fb780f164bd3301c6fef49a116298.tar.gz chromium_src-a591a96f052fb780f164bd3301c6fef49a116298.tar.bz2 |
Merge 83391 - Fix one case where default Non-client painting can occur... before a window is fully activated, WM_NCPAINT can be called and if we do not suppress default handling in that case then Windows will attempt to draw the standard border/controls resulting in an intermittent flicker.BUG=noneTEST=alt+tab quickly to and from Chrome in custom frame mode (Vista basic). Should be no non-client window flicker.Review URL: http://codereview.chromium.org/6905099
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/6904104
git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@83419 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
-rw-r--r-- | views/window/window_win.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/views/window/window_win.cc b/views/window/window_win.cc index b0698fd..9fb6e27 100644 --- a/views/window/window_win.cc +++ b/views/window/window_win.cc @@ -702,7 +702,8 @@ LRESULT WindowWin::OnNCHitTest(const CPoint& point) { void WindowWin::OnNCPaint(HRGN rgn) { // When using a custom frame, we want to avoid calling DefWindowProc() since // that may render artifacts. - SetMsgHandled(is_in_size_move_ && !delegate_->IsUsingNativeFrame()); + SetMsgHandled((!IsActive() || is_in_size_move_) && + !delegate_->IsUsingNativeFrame()); } LRESULT WindowWin::OnNCUAHDrawCaption(UINT msg, WPARAM w_param, |