author | Mike Conley <mconley@mozilla.com> |
Fri, 28 Oct 2016 13:11:30 -0400 | |
changeset 320836 | 4b30232f430a14d43420fbeff8eeb076f353ed34 |
parent 320835 | 4e8e4c0bfd0b61a668911d1261b51b5083bd529e |
child 320837 | 57200c02575fb38a1f410eb1d23d241a83db0f34 |
push id | 33876 |
push user | mconley@mozilla.com |
push date | Thu, 03 Nov 2016 23:37:05 +0000 |
treeherder | autoland@4b30232f430a [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | mak |
bugs | 1313067 |
milestone | 52.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
browser/base/content/browser.xul | file | annotate | diff | comparison | revisions | |
toolkit/content/widgets/autocomplete.xml | file | annotate | diff | comparison | revisions |
--- a/browser/base/content/browser.xul +++ b/browser/base/content/browser.xul @@ -152,17 +152,18 @@ <panel type="autocomplete" id="PopupSearchAutoComplete" noautofocus="true" hidden="true"/> <!-- for url bar autocomplete --> <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true" flip="none" - level="parent"/> + level="parent" + overflowpadding="30" /> <panel id="DateTimePickerPanel" type="arrow" hidden="true" orient="vertical" noautofocus="true" consumeoutsideclicks="false" level="parent">
--- a/toolkit/content/widgets/autocomplete.xml +++ b/toolkit/content/widgets/autocomplete.xml @@ -1402,16 +1402,20 @@ extends="chrome://global/content/binding } } } return val; ]]> </setter> </property> + <property name="overflowPadding" + onget="return Number(this.getAttribute('overflowpadding'))" + readonly="true" /> + <method name="selectBy"> <parameter name="aReverse"/> <parameter name="aPage"/> <body> <![CDATA[ try { var amount = aPage ? 5 : 1; @@ -2270,24 +2274,25 @@ extends="chrome://global/content/binding let tagsRect = this._tagsText.getBoundingClientRect(); let separatorRect = this._separator.getBoundingClientRect(); let urlRect = this._urlText.getBoundingClientRect(); let actionRect = this._actionText.getBoundingClientRect(); let separatorURLActionWidth = separatorRect.width + Math.max(urlRect.width, actionRect.width); // Total width for the title and URL/action is the width of the item - // minus the start of the title text minus a little extra padding. + // minus the start of the title text minus a little optional extra padding. // This extra padding amount is basically arbitrary but keeps the text // from getting too close to the popup's edge. - let extraPadding = 30; let dir = this.getAttribute("dir"); let titleStart = dir == "rtl" ? itemRect.right - titleRect.right : titleRect.left - itemRect.left; - let itemWidth = itemRect.width - titleStart - extraPadding; + + let popup = this.parentNode.parentNode; + let itemWidth = itemRect.width - titleStart - popup.overflowPadding; if (this._tags.hasAttribute("empty")) { // The tags box is not displayed in this case. tagsRect.width = 0; } let titleTagsWidth = titleRect.width + tagsRect.width; if (titleTagsWidth + separatorURLActionWidth > itemWidth) {