diff options
| author | jianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-05 20:59:46 +0000 |
|---|---|---|
| committer | jianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-05 20:59:46 +0000 |
| commit | ef552119f1a1256cce3e9ee4a094710f60f41c2f (patch) | |
| tree | affdfa1bd2a5b66ff367c03237dd3490fbca8093 | |
| parent | 22e790fc3e17c8236ff20b30e7eacef6e3326629 (diff) | |
| download | chromium_src-ef552119f1a1256cce3e9ee4a094710f60f41c2f.zip chromium_src-ef552119f1a1256cce3e9ee4a094710f60f41c2f.tar.gz chromium_src-ef552119f1a1256cce3e9ee4a094710f60f41c2f.tar.bz2 | |
Fix bug 62037: Task manager tooltips appear behind task manager if 'Always on Top' is checked.
The fix is to ensure the tooltip window is created with WS_EX_TOPMOST style.
BUG=62037
TEST=Manual test by launching task manager or panel and verifying tooltips appear in front.
Review URL: http://codereview.chromium.org/9030036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116551 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/browser/renderer_host/render_widget_host_view_win.cc | 3 | ||||
| -rw-r--r-- | ui/views/widget/tooltip_manager_win.cc | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/content/browser/renderer_host/render_widget_host_view_win.cc b/content/browser/renderer_host/render_widget_host_view_win.cc index 6596344..8b364ab 100644 --- a/content/browser/renderer_host/render_widget_host_view_win.cc +++ b/content/browser/renderer_host/render_widget_host_view_win.cc @@ -2234,7 +2234,8 @@ void RenderWidgetHostViewWin::EnsureTooltip() { if (!::IsWindow(tooltip_hwnd_)) { message = TTM_ADDTOOL; tooltip_hwnd_ = CreateWindowEx( - WS_EX_TRANSPARENT | l10n_util::GetExtendedTooltipStyles(), + WS_EX_TRANSPARENT | WS_EX_TOPMOST | + l10n_util::GetExtendedTooltipStyles(), TOOLTIPS_CLASS, NULL, TTS_NOPREFIX, 0, 0, 0, 0, m_hWnd, NULL, NULL, NULL); if (!tooltip_hwnd_) { diff --git a/ui/views/widget/tooltip_manager_win.cc b/ui/views/widget/tooltip_manager_win.cc index f03d858..a04e032e 100644 --- a/ui/views/widget/tooltip_manager_win.cc +++ b/ui/views/widget/tooltip_manager_win.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -90,7 +90,7 @@ bool TooltipManagerWin::Init() { DCHECK(!tooltip_hwnd_); // Create the tooltip control. tooltip_hwnd_ = CreateWindowEx( - WS_EX_TRANSPARENT | l10n_util::GetExtendedTooltipStyles(), + WS_EX_TRANSPARENT | WS_EX_TOPMOST | l10n_util::GetExtendedTooltipStyles(), TOOLTIPS_CLASS, NULL, TTS_NOPREFIX, 0, 0, 0, 0, GetParent(), NULL, NULL, NULL); if (!tooltip_hwnd_) @@ -333,7 +333,7 @@ void TooltipManagerWin::ShowKeyboardTooltip(View* focused_view) { gfx::Point screen_point; focused_view->ConvertPointToScreen(focused_view, &screen_point); keyboard_tooltip_hwnd_ = CreateWindowEx( - WS_EX_TRANSPARENT | l10n_util::GetExtendedTooltipStyles(), + WS_EX_TRANSPARENT | WS_EX_TOPMOST | l10n_util::GetExtendedTooltipStyles(), TOOLTIPS_CLASS, NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL); if (!keyboard_tooltip_hwnd_) return; |