diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-31 17:47:57 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-31 17:47:57 +0000 |
| commit | 5fe3e1a25ff7790e8314c6abbcca409b8f1e3b22 (patch) | |
| tree | de0725db3a87df4181b0aba5a85573e384db44ab /ui | |
| parent | aab50a49719f0d4ad1d5f65d2cfb4d1a4fcd426a (diff) | |
| download | chromium_src-5fe3e1a25ff7790e8314c6abbcca409b8f1e3b22.zip chromium_src-5fe3e1a25ff7790e8314c6abbcca409b8f1e3b22.tar.gz chromium_src-5fe3e1a25ff7790e8314c6abbcca409b8f1e3b22.tar.bz2 | |
Fix Windows XP and Vista taskbar activation issue.
On Windows XP and Vista, new windows don't indicate activation on the taskbar.
(the window buttons should look "pressed" on launch and new window)
This regression was introduced by http://crrev.com/104051
Limit the original fix for http://crbug.com/90386 to Windows > Vista.
BUG=90386,123473
TEST=New Chrome window appear "pressed" on the taskbar on Vista and XP. No regressions (especially not of crbug.com/90386)
Review URL: https://chromiumcodereview.appspot.com/10826058
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149215 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/views/widget/native_widget_win.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ui/views/widget/native_widget_win.cc b/ui/views/widget/native_widget_win.cc index 24273dd..6c65886 100644 --- a/ui/views/widget/native_widget_win.cc +++ b/ui/views/widget/native_widget_win.cc @@ -1712,8 +1712,10 @@ LRESULT NativeWidgetWin::OnNCActivate(BOOL active) { if (IsActive()) delegate_->EnableInactiveRendering(); - // Avoid DefWindowProc non-client rendering over our custom frame. - if (!GetWidget()->ShouldUseNativeFrame()) { + // Avoid DefWindowProc non-client rendering over our custom frame on newer + // Windows versions only (breaks taskbar activation indication on XP/Vista). + if (!GetWidget()->ShouldUseNativeFrame() && + base::win::GetVersion() > base::win::VERSION_VISTA) { SetMsgHandled(TRUE); return TRUE; } |