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

Fix select items window overflow (#4747)

Browse source 
Also:

* Remove unused element in select items window
* Move and rename zotero/ingester/selectitems to scaffold/select to
   avoid confusion with selectItemsDialog
This commit is contained in:
windingwind 2024-10-19 12:33:14 +02:00 • committed by GitHub
parent 1c0c17ea47
commit eea1291314
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
chrome/content/scaffold/scaffold.js
View file

@ -1197,7 +1197,7 @@ var Scaffold = new function () {
*/
function _selectItems(obj, itemList) {
var io = { dataIn: itemList, dataOut: null };
window.openDialog("chrome://zotero/content/ingester/selectitems.xhtml",
window.openDialog("chrome://scaffold/content/select.xhtml",
"_blank", "chrome,modal,centerscreen,resizable=yes", io);
return io.dataOut;

0
chrome/content/zotero/ingester/selectitems.js → chrome/content/scaffold/select.js
View file

12
chrome/content/zotero/ingester/selectitems.xhtml → chrome/content/scaffold/select.xhtml
View file

@ -27,13 +27,14 @@
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://zotero/skin/zotero.css" type="text/css"?>
<?xml-stylesheet href="chrome://zotero-platform/content/zotero.css" type="text/css"?>
<?xml-stylesheet href="chrome://zotero/skin/scaffold.css" type="text/css"?>
<!DOCTYPE window SYSTEM "chrome://zotero/locale/zotero.dtd">
<window xmlns:html="http://www.w3.org/1999/xhtml"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
id="zotero-select-item-dialog"
class="zotero-dialog"
title="&zotero.selectitems.title;" width="400" height="330"
persist="width height screenX screenY"
title="&zotero.selectitems.title;"
persist="width height"
drawintitlebar-platforms="mac"
onload="Zotero_Ingester_Interface_SelectItems.init()">
<dialog
@ -44,16 +45,15 @@
var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
Services.scriptloader.loadSubScript("chrome://zotero/content/include.js", this);
Services.scriptloader.loadSubScript("chrome://zotero/content/titlebar.js", this);
Services.scriptloader.loadSubScript("chrome://zotero/content/ingester/selectitems.js", this);
Services.scriptloader.loadSubScript("chrome://scaffold/content/select.js", this);
Services.scriptloader.loadSubScript("chrome://zotero/content/customElements.js", this);
</script>
<vbox id="zotero-select-items-container" class="zotero-dialog" flex="1">
<caption label="&zotero.selectitems.intro.label;" id="zotero-selectitems-intro"/>
<vbox id="zotero-select-items-container" flex="1">
<box flex="1">
<richlistbox id="zotero-selectitems-links" flex="1"></richlistbox>
</box>
<hbox>
<hbox id="zotero-select-items-buttons">
<button label="Select All" oncommand="Zotero_Ingester_Interface_SelectItems.selectAll()"/>
<button label="Deselect All" oncommand="Zotero_Ingester_Interface_SelectItems.selectAll(true)"/>
</hbox>

2
scss/abstracts/_mixins.scss
View file

@ -350,7 +350,7 @@
// richlistbox elements are crazy and will expand beyond the window size
// unless all/most elements in the hierarchy that contain that
// richlistbox have a min-height: 0 set
vbox, hbox, groupbox {
vbox, hbox, box, groupbox, dialog {
min-height: 0;
}
}

11
scss/scaffold.scss
View file

@ -34,6 +34,17 @@ $scaffold-toolbarbutton-icons: (
@include contain-richlistbox;
}
#zotero-select-item-dialog {
max-width: 400px;
max-height: 330px;
@include contain-richlistbox;
}
// Prevent contain-richlistbox from squishing the buttons
#zotero-select-items-buttons {
flex-shrink: 0;
}
.menubar-container {
display: flex;
background: var(--material-sidepane);