scriptoriumadmin/zotero
1
0
Fork 0
mirror of https://github.com/zotero/zotero.git synced 2026-10-05 02:43:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fx128: hide titlebars in dialogs on win and mac

Browse source 
Use titlebar.js to hide titlebars in windows and mac
in all relevant dialogs and windows.
This commit is contained in:
Bogdan Abaev 2024-12-09 09:43:38 -08:00 • committed by Dan Stillman
parent 4d90fe72bd
commit b007bd4364
5 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
chrome/content/zotero/integration/insertNoteDialog.xhtml
View file

@ -42,7 +42,7 @@
persist="screenX screenY" persist="screenX screenY"
onkeypress="Zotero_QuickFormat.onWindowKeyPress(event)" onkeypress="Zotero_QuickFormat.onWindowKeyPress(event)"
onunload="Zotero_QuickFormat.onUnload()" onunload="Zotero_QuickFormat.onUnload()"
drawintitlebar-platforms="linux,win" drawintitlebar-platforms="win,mac"
no-titlebar-icon="true"> no-titlebar-icon="true">
<script src="../include.js"/> <script src="../include.js"/>

9
chrome/content/zotero/integration/progressBar.js
View file

@ -23,6 +23,8 @@
***** END LICENSE BLOCK ***** ***** END LICENSE BLOCK *****
*/ */
Services.scriptloader.loadSubScript("chrome://zotero/content/titlebar.js", this);
var Zotero_ProgressBar = new function () { var Zotero_ProgressBar = new function () {
var initialized, io; var initialized, io;
@ -40,13 +42,6 @@ var Zotero_ProgressBar = new function () {
if (io.isNote) { if (io.isNote) {
document.documentElement.classList.add('note-dialog'); document.documentElement.classList.add('note-dialog');
} }
// Only hide chrome on Windows or Mac
if(Zotero.isMac) {
document.documentElement.setAttribute("drawintitlebar", true);
} else if(Zotero.isWin) {
document.documentElement.setAttribute("chromemargin", '0,0,15,0');
}
} }
}; };

10
chrome/content/zotero/integration/quickFormat.js
View file

@ -23,7 +23,7 @@
***** END LICENSE BLOCK ***** ***** END LICENSE BLOCK *****
*/ */
Services.scriptloader.loadSubScript("chrome://zotero/content/customElements.js", this); Services.scriptloader.loadSubScript("chrome://zotero/content/customElements.js", this);
Services.scriptloader.loadSubScript("chrome://zotero/content/titlebar.js", this);
var Zotero_QuickFormat = new function () { var Zotero_QuickFormat = new function () {
const pixelRe = /^([0-9]+)px$/ const pixelRe = /^([0-9]+)px$/
const specifiedLocatorRe = /^(?:,? *(p{1,2})(?:\. *| *)|:)([0-9\-–]+) *$/; const specifiedLocatorRe = /^(?:,? *(p{1,2})(?:\. *| *)|:)([0-9\-–]+) *$/;
@ -66,10 +66,6 @@ var Zotero_QuickFormat = new function () {
document.getElementById('classic-view').hidden = true; document.getElementById('classic-view').hidden = true;
} }
// Only hide chrome on Windows or Mac
if(Zotero.isMac) {
document.documentElement.setAttribute("drawintitlebar", true);
}
// Hide chrome on linux // Hide chrome on linux
if (Zotero.isLinux) { if (Zotero.isLinux) {
document.documentElement.setAttribute("hidechrome", true); document.documentElement.setAttribute("hidechrome", true);
@ -1315,10 +1311,6 @@ var Zotero_QuickFormat = new function () {
// Need to wait a moment for the css change above to take effect (mainly for mac) // Need to wait a moment for the css change above to take effect (mainly for mac)
await Zotero.Promise.delay(5); await Zotero.Promise.delay(5);
window.resizeTo(width, height); window.resizeTo(width, height);
if (Zotero.isMac && Zotero.platformMajorVersion >= 60) {
document.children[0].setAttribute('drawintitlebar', 'false');
document.children[0].setAttribute('drawintitlebar', 'true');
}
// Make sure the window's width cannot be changed by dragging the edge of the window // Make sure the window's width cannot be changed by dragging the edge of the window
document.documentElement.style.maxHeight = height + "px"; document.documentElement.style.maxHeight = height + "px";
document.documentElement.style.minHeight = height + "px"; document.documentElement.style.minHeight = height + "px";

2
chrome/content/zotero/integration/quickFormat.xhtml
View file

@ -42,7 +42,7 @@
persist="screenX screenY" persist="screenX screenY"
onkeypress="Zotero_QuickFormat.onWindowKeyPress(event)" onkeypress="Zotero_QuickFormat.onWindowKeyPress(event)"
onunload="Zotero_QuickFormat.onUnload()" onunload="Zotero_QuickFormat.onUnload()"
drawintitlebar-platforms="linux,win" drawintitlebar-platforms="win,mac"
no-titlebar-icon="true" no-titlebar-icon="true"
style="width: 800px;"> style="width: 800px;">
<script src="../include.js"/> <script src="../include.js"/>

4
chrome/content/zotero/selectItemsDialog.xhtml
View file

@ -40,7 +40,7 @@
onunload="doUnload();" onunload="doUnload();"
persist="screenX screenY width height" persist="screenX screenY width height"
class="zotero-dialog" class="zotero-dialog"
drawintitlebar="true" drawintitlebar-platforms="mac,win"
> >
<dialog <dialog
id="select-items-dialog" id="select-items-dialog"
@ -54,6 +54,8 @@
// Custom elements // Custom elements
Services.scriptloader.loadSubScript("chrome://zotero/content/customElements.js", this); Services.scriptloader.loadSubScript("chrome://zotero/content/customElements.js", this);
Services.scriptloader.loadSubScript("chrome://zotero/content/selectItemsDialog.js", this); Services.scriptloader.loadSubScript("chrome://zotero/content/selectItemsDialog.js", this);
Services.scriptloader.loadSubScript("chrome://zotero/content/titlebar.js", this);
</script> </script>
<linkset> <linkset>