wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 519693, <select> click and drag scrolling not working, change to get scrollable frame when capturing, r=roc

Browse Source
This commit is contained in:
Neil Deakin 2009-10-09 09:35:20 -04:00
parent d6595b02cc
commit c7fb80186c
2 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
layout/base/nsPresShell.cpp
View File

@ -6162,15 +6162,24 @@ PresShell::HandleEvent(nsIView *aView,
PRBool captureRetarget = PR_FALSE;
if (capturingContent) {
captureRetarget = gCaptureInfo.mRetargetToElement;
// special case for <select> as it needs to capture on the dropdown list,
// so get the frame for the dropdown list instead.
if (!captureRetarget && capturingContent->Tag() == nsGkAtoms::select &&
capturingContent->IsHTML()) {
nsIFrame* selectFrame = GetPrimaryFrameFor(capturingContent);
if (selectFrame) {
nsIFrame* childframe = selectFrame->GetChildList(nsGkAtoms::selectPopupList).FirstChild();
if (childframe) {
frame = childframe;
if (!captureRetarget) {
nsIFrame* captureFrame = GetPrimaryFrameFor(capturingContent);
if (captureFrame) {
if (capturingContent->Tag() == nsGkAtoms::select &&
capturingContent->IsHTML()) {
// a dropdown <select> has a child in its selectPopupList and we should
// capture on that instead.
nsIFrame* childFrame = captureFrame->GetChildList(nsGkAtoms::selectPopupList).FirstChild();
if (childFrame) {
captureFrame = childFrame;
}
}
// scrollable frames should use the scrolling container as
// the root instead of the document
nsIScrollableFrame* scrollFrame = do_QueryFrame(captureFrame);
if (scrollFrame) {
frame = scrollFrame->GetScrolledFrame();
}
}
}

19
toolkit/content/tests/widgets/test_mousecapture.xul
View File

@ -153,6 +153,12 @@ function runTests()
synthesizeMouse(frames[2].document.getElementById("input"), 8, 8, { type: "mousedown" }, frames[2]);
synthesizeMouse(frames[2].document.getElementById("input"), 8, 8, { type: "mouseup" }, frames[2]);
synthesizeMouse(document.getElementById("option3"), 2, 2, { type: "mousedown" });
synthesizeMouse(document.getElementById("option3"), 2, 1000, { type: "mousemove" });
var select = document.getElementById("select");
is(select.selectedIndex, 9, "scroll select");
synthesizeMouse(document.getElementById("select"), 2, 2, { type: "mouseup" });
// check to ensure that selection dragging scrolls the right scrollable area
otherWindow = window.open("data:text/html,<html><p style='margin-top: 4000px'>This is some text</p></html>", "_blank");
SimpleTest.waitForFocus(selectionScrollCheck, otherWindow);
@ -254,6 +260,19 @@ SimpleTest.waitForFocus(runTests);
<iframe width="100" height="100"
src="data:text/html,%3Cinput id='input' onfocus='this.style.display = &quot;none&quot;' style='float: left;'"/>
<select id="select" xmlns="http://www.w3.org/1999/xhtml" size="4">
<option id="option1">One</option>
<option id="option2">Two</option>
<option id="option3">Three</option>
<option id="option4">Four</option>
<option id="option5">Five</option>
<option id="option6">Six</option>
<option id="option7">Seven</option>
<option id="option8">Eight</option>
<option id="option9">Nine</option>
<option id="option10">Ten</option>
</select>
</hbox>
<body id="body" xmlns="http://www.w3.org/1999/xhtml">