nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 544762 - Implement menuitem-with-favicon class in toolkit and use it in appropriate places. ui-r=faaborg, r=gavin

Browse source
This commit is contained in:
Dão Gottwald 2010-03-24 10:17:40 +01:00
parent 963e9a4722
commit 3c2dd7e5a9
6 changed files with 13 additions and 20 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

4
browser/base/content/browser-places.js
View file

@ -632,7 +632,7 @@ var HistoryMenu = {
iconURL = "moz-anno:favicon:" + iconURL;
m.setAttribute("image", iconURL);
}
m.setAttribute("class", "menuitem-iconic bookmark-item");
m.setAttribute("class", "menuitem-iconic bookmark-item menuitem-with-favicon");
m.setAttribute("value", i);
m.setAttribute("oncommand", "undoCloseTab(" + i + ");");
@ -714,7 +714,7 @@ var HistoryMenu = {
iconURL = "moz-anno:favicon:" + iconURL;
m.setAttribute("image", iconURL);
}
m.setAttribute("class", "menuitem-iconic bookmark-item");
m.setAttribute("class", "menuitem-iconic bookmark-item menuitem-with-favicon");
m.setAttribute("oncommand", "undoCloseWindow(" + i + ");");
// Set the targetURI attribute so it will be shown in tooltip and statusbar.

8
browser/base/content/browser.css
View file

@ -114,14 +114,6 @@ toolbarbutton.bookmark-item {
max-width: 13em;
}
%ifdef MOZ_WIDGET_GTK2
/* Bookmarks override the "images-in-menus" metric in xul.css */
.bookmark-item > .menu-iconic-left,
.searchbar-engine-menuitem > .menu-iconic-left {
visibility: inherit;
}
%endif
#editBMPanel_tagsSelector {
/* override default listbox width from xul.css */
width: auto;

4
browser/base/content/browser.js
View file

@ -3230,7 +3230,7 @@ function FillHistoryMenu(aParent) {
}
if (j < index) {
item.className = "unified-nav-back menuitem-iconic";
item.className = "unified-nav-back menuitem-iconic menuitem-with-favicon";
item.setAttribute("tooltiptext", tooltipBack);
} else if (j == index) {
item.setAttribute("type", "radio");
@ -3238,7 +3238,7 @@ function FillHistoryMenu(aParent) {
item.className = "unified-nav-current";
item.setAttribute("tooltiptext", tooltipCurrent);
} else {
item.className = "unified-nav-forward menuitem-iconic";
item.className = "unified-nav-forward menuitem-iconic menuitem-with-favicon";
item.setAttribute("tooltiptext", tooltipForward);
}

2
browser/components/places/content/utils.js
View file

@ -1021,7 +1021,7 @@ var PlacesUIUtils = {
else {
if (PlacesUtils.uriTypes.indexOf(type) != -1) {
element = document.createElement("menuitem");
element.className = "menuitem-iconic bookmark-item";
element.className = "menuitem-iconic bookmark-item menuitem-with-favicon";
element.setAttribute("scheme", this.guessUrlSchemeForUI(aNode.uri));
}
else if (PlacesUtils.containerTypes.indexOf(type) != -1) {

2
browser/components/search/content/search.xml
View file

@ -403,7 +403,7 @@
var name = engines[i].name;
menuitem.setAttribute("label", name);
menuitem.setAttribute("id", name);
menuitem.setAttribute("class", "menuitem-iconic searchbar-engine-menuitem");
menuitem.setAttribute("class", "menuitem-iconic searchbar-engine-menuitem menuitem-with-favicon");
// Since this menu is rebuilt by the observer method whenever a new
// engine is selected, the "selected" attribute does not need to be
// explicitly cleared anywhere.

13
toolkit/content/xul.css
View file

@ -349,12 +349,13 @@ menuitem.menuitem-non-iconic {
%ifdef MOZ_WIDGET_GTK2
/********* detection of system setting to use icons in menus ***********/
menuitem:not([type]):not(:-moz-system-metric(images-in-menus)) > .menu-iconic-left {
visibility: hidden;
}
menu:not(:-moz-system-metric(images-in-menus)) > .menu-iconic-left {
visibility: hidden;
@media not all and (-moz-images-in-menus) {
menuitem:not([type]):not(.menuitem-with-favicon) > .menu-iconic-left {
visibility: hidden;
}
menu > .menu-iconic-left {
visibility: hidden;
}
}
%endif