ui/views/controls/button/custom_button.cc - Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/views/controls/button/custom_button.cc

Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix new addition Created 8 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: ui/views/controls/button/custom_button.cc

diff --git a/ui/views/controls/button/custom_button.cc b/ui/views/controls/button/custom_button.cc

index 612ddd02dff6de60c5e3aaecf9778564ce795d71..6e981413a5a5861eaeddfd712ed8afa9d76b42f9 100644

--- a/ui/views/controls/button/custom_button.cc

+++ b/ui/views/controls/button/custom_button.cc

@@ -74,7 +74,8 @@ bool CustomButton::IsMouseHovered() const {

if (!GetWidget())

return false;

- gfx::Point cursor_pos(gfx::Screen::GetCursorScreenPoint());

+ gfx::Point cursor_pos(gfx::Screen::GetScreenFor(

+ GetWidget()->GetNativeView())->GetCursorScreenPoint());

ConvertPointToTarget(NULL, this, &cursor_pos);

return HitTestPoint(cursor_pos);

}

« no previous file with comments | « ui/views/bubble/bubble_frame_view.cc ('k') | ui/views/controls/menu/menu_controller.h » ('j') | no next file with comments »