mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 901117 - Positioned event targetting should fluff even if there are body event listeners. r=tn
This commit is contained in:
parent
c203c65d39
commit
5d78b30c42
@ -125,17 +125,20 @@ HasMouseListener(nsIContent* aContent)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static bool
|
static bool
|
||||||
IsElementClickable(nsIFrame* aFrame)
|
IsElementClickable(nsIFrame* aFrame, nsIAtom* stopAt = nullptr)
|
||||||
{
|
{
|
||||||
// Input events propagate up the content tree so we'll follow the content
|
// Input events propagate up the content tree so we'll follow the content
|
||||||
// ancestors to look for elements accepting the click.
|
// ancestors to look for elements accepting the click.
|
||||||
for (nsIContent* content = aFrame->GetContent(); content;
|
for (nsIContent* content = aFrame->GetContent(); content;
|
||||||
content = content->GetFlattenedTreeParent()) {
|
content = content->GetFlattenedTreeParent()) {
|
||||||
|
nsIAtom* tag = content->Tag();
|
||||||
|
if (content->IsHTML() && stopAt && tag == stopAt) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
if (HasMouseListener(content)) {
|
if (HasMouseListener(content)) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (content->IsHTML()) {
|
if (content->IsHTML()) {
|
||||||
nsIAtom* tag = content->Tag();
|
|
||||||
if (tag == nsGkAtoms::button ||
|
if (tag == nsGkAtoms::button ||
|
||||||
tag == nsGkAtoms::input ||
|
tag == nsGkAtoms::input ||
|
||||||
tag == nsGkAtoms::select ||
|
tag == nsGkAtoms::select ||
|
||||||
@ -305,7 +308,7 @@ FindFrameTargetedByInputEvent(const nsGUIEvent *aEvent,
|
|||||||
nsLayoutUtils::GetFrameForPoint(aRootFrame, aPointRelativeToRootFrame, flags);
|
nsLayoutUtils::GetFrameForPoint(aRootFrame, aPointRelativeToRootFrame, flags);
|
||||||
|
|
||||||
const EventRadiusPrefs* prefs = GetPrefsFor(aEvent->eventStructType);
|
const EventRadiusPrefs* prefs = GetPrefsFor(aEvent->eventStructType);
|
||||||
if (!prefs || !prefs->mEnabled || (target && IsElementClickable(target))) {
|
if (!prefs || !prefs->mEnabled || (target && IsElementClickable(target, nsGkAtoms::body))) {
|
||||||
return target;
|
return target;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user