mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

qf: fix wrong references panel position on windows

Browse source 
- use dialog as the anchor, not the document element
- after the window is resized, the panel will remain
where it was, so if it's far away from the dialog,
if gets closed and re-opened to reposition it.
This commit is contained in:
Bogdan Abaev 2024-03-15 15:18:21 -04:00 committed by Adomas Ven
parent f144f3a725
commit 3dc37183b4
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -131,7 +131,6 @@ var Zotero_QuickFormat = new function () {
} }
}); });
if (Zotero.isWin) { if (Zotero.isWin) {
referencePanel.style.marginTop = "-34px";
if (Zotero.Prefs.get('integration.keepAddCitationDialogRaised')) { if (Zotero.Prefs.get('integration.keepAddCitationDialogRaised')) {
dialog.setAttribute("square", "true"); dialog.setAttribute("square", "true");
} }
@ -1188,6 +1187,17 @@ var Zotero_QuickFormat = new function () {
// Resized so that outerHeight=contentHeight // Resized so that outerHeight=contentHeight
let outerHeightAdjustment = Math.max(window.outerHeight - window.innerHeight, 0); let outerHeightAdjustment = Math.max(window.outerHeight - window.innerHeight, 0);
window.resizeTo(WINDOW_WIDTH, contentHeight + outerHeightAdjustment); window.resizeTo(WINDOW_WIDTH, contentHeight + outerHeightAdjustment);
if (Zotero.isWin) {
// On windows, if the editor height changes, the panel will remain where it was.
// Check if the panel is not next to the dialog, and if so - close and reopen it
// to position references panel properly
let dialogBottom = dialog.getBoundingClientRect().bottom;
let panelTop = referencePanel.getBoundingClientRect().top;
if (Math.abs(dialogBottom - panelTop) > 5) {
referencePanel.hidePopup();
_openReferencePanel();
}
}
if (Zotero.isMac && Zotero.platformMajorVersion >= 60) { if (Zotero.isMac && Zotero.platformMajorVersion >= 60) {
document.children[0].setAttribute('drawintitlebar', 'false'); document.children[0].setAttribute('drawintitlebar', 'false');
document.children[0].setAttribute('drawintitlebar', 'true'); document.children[0].setAttribute('drawintitlebar', 'true');
@ -1274,8 +1284,7 @@ var Zotero_QuickFormat = new function () {
}, false); }, false);
} }
referencePanel.openPopup(document.documentElement, "after_start", 15, referencePanel.openPopup(dialog, "after_start", 15, 0, false, false, null);
dialog.clientHeight-window.clientHeight, false, false, null);
} }
/** /**