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 865356 - Restrict caret move coords within text inputs when invoking text selection. r=mbrubeck

Browse Source
This commit is contained in:
Jim Mathies 2013-05-30 10:55:36 -05:00
parent c0edb4439d
commit f0048f6c2c
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
browser/metro/base/content/contenthandlers/SelectionHandler.js
View File

@ -323,7 +323,14 @@ var SelectionHandler = {
this._onFail("Unexpected, caret position isn't supported with non-inputs.");
return;
}
let cp = this._contentWindow.document.caretPositionFromPoint(aX, aY);
// SelectionHelperUI sends text input tap coordinates and a caret move
// event at the start of a monocle drag. caretPositionFromPoint isn't
// going to give us correct info if the coord is outside the edit bounds,
// so restrict the coordinates before we call cpfp.
let containedCoords = this._restrictCoordinateToEditBounds(aX, aY);
let cp = this._contentWindow.document.caretPositionFromPoint(containedCoords.xPos,
containedCoords.yPos);
let input = cp.offsetNode;
let offset = cp.offset;
input.selectionStart = input.selectionEnd = offset;
@ -603,6 +610,24 @@ var SelectionHandler = {
this._cache.caret.yPos = bounds.bottom;
},
_restrictCoordinateToEditBounds: function _restrictCoordinateToEditBounds(aX, aY) {
let result = {
xPos: aX,
yPos: aY
};
if (!this._targetIsEditable)
return result;
let bounds = this._getTargetBrowserRect();
if (aX <= bounds.left)
result.xPos = bounds.left + 1;
if (aX >= bounds.right)
result.xPos = bounds.right - 1;
if (aY <= bounds.top)
result.yPos = bounds.top + 1;
if (aY >= bounds.bottom)
result.yPos = bounds.bottom - 1;
},
/*
* _handleSelectionPoint(aMarker, aPoint, aEndOfSelection)
*