wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-09 17:31:47 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into custom

Browse source
This commit is contained in:
Roy Tam 2020-06-20 06:47:51 +08:00
commit ab4f78f4b7
46 changed files with 1004 additions and 604 deletions
Download patch file Download diff file Expand all files Collapse all files

4
application/palemoon/base/content/browser-menubar.inc
View file

@ -5,7 +5,11 @@
<menubar id="main-menubar"
onpopupshowing="if (event.target.parentNode.parentNode == this &amp;&amp;
#ifdef MOZ_WIDGET_GTK
document.documentElement.getAttribute('shellshowingmenubar') != 'true')
#else
!('@mozilla.org/widget/nativemenuservice;1' in Cc))
#endif
this.setAttribute('openedwithkey',
event.target.parentNode.openedWithKey);"
style="border:0px;padding:0px;margin:0px;-moz-appearance:none">

4
application/palemoon/base/content/browser.css
View file

@ -226,6 +226,10 @@ splitmenu {
#appmenu-toolbar-button > .toolbarbutton-text {
display: -moz-box;
}
window[shellshowingmenubar="true"] #appmenu-toolbar-button {
display: none;
}
%endif
#appmenu_offlineModeRecovery:not([checked=true]) {

6
application/palemoon/base/content/browser.js
View file

@ -4600,6 +4600,12 @@ function onViewToolbarsPopupShowing(aEvent, aInsertPoint) {
toolbarNodes.push(document.getElementById("addon-bar"));
for (let toolbar of toolbarNodes) {
#ifdef MOZ_WIDGET_GTK
if (toolbar.id == "toolbar-menubar" &&
document.documentElement.getAttribute("shellshowingmenubar") == "true") {
continue;
}
#endif
let toolbarName = toolbar.getAttribute("toolbarname");
if (toolbarName) {
let menuItem = document.createElement("menuitem");