ui/aura/window_targeter.cc - Issue 180253006: Merge 252257 "events: Fix event-targeting for transformed windows."

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/aura/window_targeter.cc

Issue 180253006: Merge 252257 "events: Fix event-targeting for transformed windows." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1847/src/

Patch Set: Created 6 years, 10 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/aura/window_targeter.cc

===================================================================

--- ui/aura/window_targeter.cc (revision 253296)

+++ ui/aura/window_targeter.cc (working copy)

@@ -37,10 +37,10 @@

bool WindowTargeter::EventLocationInsideBounds(

aura::Window* window, const ui::LocatedEvent& event) const {

- gfx::RectF bounds = window->bounds();

- if (window->layer())

- window->layer()->transform().TransformRect(&bounds);

- return bounds.Contains(event.location());

+ gfx::Point point = event.location();

+ if (window->parent())

+ aura::Window::ConvertPointToTarget(window->parent(), window, &point);

+ return gfx::Rect(window->bounds().size()).Contains(point);

}

ui::EventTarget* WindowTargeter::FindTargetForEvent(ui::EventTarget* root,

« no previous file with comments | « ash/wm/overview/window_selector_unittest.cc ('k') | ui/aura/window_targeter_unittest.cc » ('j') | no next file with comments »