Bug Bug 420421 Fix display of autocomplete history dropmarker on Linux r=IanN

This commit is contained in:
Neil Rashbrook 2011-03-13 21:26:48 +00:00
Родитель e3601b8790
Коммит 4c929a72fb
7 изменённых файлов: 40 добавлений и 15 удалений

Просмотреть файл

@ -87,7 +87,7 @@
<label control="hrefInput" accesskey="&LinkURLEditField.accessKey;" width="1">&LinkURLEditField.label;</label> <label control="hrefInput" accesskey="&LinkURLEditField.accessKey;" width="1">&LinkURLEditField.label;</label>
<textbox id="hrefInput" type="autocomplete" <textbox id="hrefInput" type="autocomplete"
autocompletesearch="history" timeout="50" maxrows="6" autocompletesearch="history" timeout="50" maxrows="6"
disablehistory="false" class="uri-element" enablehistory="true" class="uri-element"
oninput="ChangeLinkLocation();"> oninput="ChangeLinkLocation();">
<menupopup class="autocomplete-history-popup" <menupopup class="autocomplete-history-popup"
popupalign="topleft" popupanchor="bottomleft" popupalign="topleft" popupanchor="bottomleft"

Просмотреть файл

@ -64,7 +64,7 @@
<hbox align="center"> <hbox align="center">
<textbox id="dialog.input" flex="1" type="autocomplete" <textbox id="dialog.input" flex="1" type="autocomplete"
autocompletesearch="history" timeout="50" maxrows="6" autocompletesearch="history" timeout="50" maxrows="6"
disablehistory="false" class="uri-element" enablehistory="true" class="uri-element"
oninput="doEnabling();"> oninput="doEnabling();">
<menupopup id="ubhist-popup" class="autocomplete-history-popup" <menupopup id="ubhist-popup" class="autocomplete-history-popup"
popupalign="topleft" popupanchor="bottomleft" popupalign="topleft" popupanchor="bottomleft"

Просмотреть файл

@ -302,7 +302,7 @@
<textbox id="urlbar" class="chromeclass-location uri-element" flex="1" <textbox id="urlbar" class="chromeclass-location uri-element" flex="1"
type="autocomplete" autocompletesearch="history file" type="autocomplete" autocompletesearch="history file"
timeout="50" maxrows="6" timeout="50" maxrows="6"
disablehistory="false" accesskey="&locationBar.accesskey;" enablehistory="true" accesskey="&locationBar.accesskey;"
defaultSearchEngine="true" tabscrolling="true" defaultSearchEngine="true" tabscrolling="true"
showcommentcolumn="true" showcommentcolumn="true"
inputtooltiptext="&locationBar.tooltip;" inputtooltiptext="&locationBar.tooltip;"

Просмотреть файл

@ -7,10 +7,40 @@
<bindings id="urlbarBindings" <bindings id="urlbarBindings"
xmlns="http://www.mozilla.org/xbl" xmlns="http://www.mozilla.org/xbl"
xmlns:html="http://www.w3.org/1999/xhtml"
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:xbl="http://www.mozilla.org/xbl"> xmlns:xbl="http://www.mozilla.org/xbl">
<binding id="urlbar" extends="chrome://global/content/autocomplete.xml#autocomplete"> <binding id="urlbar" extends="chrome://global/content/autocomplete.xml#autocomplete">
<content sizetopopup="pref">
<xul:hbox class="autocomplete-textbox-container" flex="1">
<xul:hbox class="urlbar-security-level" flex="1" align="center" xbl:inherits="level">
<children includes="image|deck|stack|box">
<xul:image class="autocomplete-icon" allowevents="true"/>
</children>
<xul:hbox class="textbox-input-box" flex="1" xbl:inherits="context,tooltiptext=inputtooltiptext">
<children/>
<html:input anonid="input" class="autocomplete-textbox textbox-input"
flex="1" allowevents="true"
xbl:inherits="tooltiptext=inputtooltiptext,onfocus,onblur,value,type,maxlength,disabled,size,readonly,placeholder,tabindex,accesskey,mozactionhint,userAction"/>
</xul:hbox>
<children includes="hbox"/>
</xul:hbox>
</xul:hbox>
<xul:dropmarker class="autocomplete-history-dropmarker" allowevents="true"
xbl:inherits="open" anonid="historydropmarker"/>
<xul:popupset>
<xul:panel type="autocomplete" anonid="popup"
ignorekeys="true" noautofocus="true" level="top"
xbl:inherits="for=id,nomatch"/>
</xul:popupset>
<children includes="menupopup"/>
</content>
<implementation> <implementation>
<constructor><![CDATA[ <constructor><![CDATA[
var pbi = this.mPrefs.QueryInterface(Components.interfaces.nsIPrefBranch2); var pbi = this.mPrefs.QueryInterface(Components.interfaces.nsIPrefBranch2);

Просмотреть файл

@ -148,6 +148,10 @@ findbar {
-moz-binding: url("chrome://communicator/content/bindings/general.xml#statusbarpanel-backgroundbox"); -moz-binding: url("chrome://communicator/content/bindings/general.xml#statusbarpanel-backgroundbox");
} }
textbox[enablehistory="true"] > .autocomplete-history-dropmarker {
display: -moz-box;
}
/******* lightweight themes *******/ /******* lightweight themes *******/
window[lwtheme="true"] { window[lwtheme="true"] {
background-repeat: no-repeat; background-repeat: no-repeat;

Просмотреть файл

@ -74,7 +74,7 @@
<hbox align="center"> <hbox align="center">
<textbox id="dialog.input" flex="1" type="autocomplete" <textbox id="dialog.input" flex="1" type="autocomplete"
autocompletesearch="history file" timeout="50" maxrows="6" autocompletesearch="history file" timeout="50" maxrows="6"
disablehistory="false" class="uri-element" enablehistory="true" class="uri-element"
oninput="doEnabling();"> oninput="doEnabling();">
<menupopup id="ubhist-popup" class="autocomplete-history-popup" <menupopup id="ubhist-popup" class="autocomplete-history-popup"
popupalign="topleft" popupanchor="bottomleft" popupalign="topleft" popupanchor="bottomleft"

Просмотреть файл

@ -319,17 +319,8 @@ toolbar[mode="text"] > #window-controls > toolbarbutton > .toolbarbutton-icon {
min-width: 0px; min-width: 0px;
} }
#urlbar { .urlbar-security-level[level="high"],
border: 3px solid; .urlbar-security-level[level="low"] {
-moz-border-top-colors: transparent ThreeDShadow ThreeDDarkShadow;
-moz-border-right-colors: transparent ThreeDHighlight ThreeDDarkShadow;
-moz-border-bottom-colors: transparent ThreeDHighlight ThreeDDarkShadow;
-moz-border-left-colors: transparent ThreeDShadow ThreeDDarkShadow;
}
#urlbar[level="high"] > .autocomplete-textbox-container,
#urlbar[level="low"] > .autocomplete-textbox-container {
-moz-appearance: none;
background-color: InfoBackground; background-color: InfoBackground;
color: InfoText; color: InfoText;
} }