From 1811c77f857aca9b002d81b2f4d781d42e2ee693 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adomas=20Ven=C4=8Dkauskas?= Date: Wed, 10 Apr 2024 12:24:39 +0300 Subject: [PATCH] Advanced search: Fix window size issues - Set minimum dimensions - Make sure adding/removing conditions only resizes the window by the appropriate vertical amount https://forums.zotero.org/discussion/113523/zotero-7-beta-advanced-search-window-resized-when-pressing --- chrome/content/zotero/elements/zoteroSearch.js | 5 +++-- chrome/skin/default/zotero/zotero.css | 14 -------------- scss/_zotero.scss | 1 + scss/components/_advancedSearch.scss | 12 ++++++++++++ 4 files changed, 16 insertions(+), 16 deletions(-) create mode 100644 scss/components/_advancedSearch.scss diff --git a/chrome/content/zotero/elements/zoteroSearch.js b/chrome/content/zotero/elements/zoteroSearch.js index f3d61eed7e..9da8ec44e4 100644 --- a/chrome/content/zotero/elements/zoteroSearch.js +++ b/chrome/content/zotero/elements/zoteroSearch.js @@ -729,8 +729,9 @@ onRemoveClicked() { if (this.parent){ + window.resizeBy(0, -1 * this.getBoundingClientRect().height); + window.dispatchEvent(new CustomEvent('resize')); this.parent.removeCondition(this.conditionID); - window.sizeToContent() } } @@ -744,7 +745,7 @@ ) ) this.parent.addCondition(ref); - window.sizeToContent(); + window.resizeBy(0, this.getBoundingClientRect().height); } } diff --git a/chrome/skin/default/zotero/zotero.css b/chrome/skin/default/zotero/zotero.css index 907111c3f9..a9835fb614 100644 --- a/chrome/skin/default/zotero/zotero.css +++ b/chrome/skin/default/zotero/zotero.css @@ -141,20 +141,6 @@ label.zotero-text-link { text-align: center; } -#zotero-advanced-search-dialog #zotero-search-box-controls { - padding: 3px; -} - -#zotero-advanced-search-dialog .virtualized-table-container -{ - min-height: 250px; -} - -#zotero-advanced-search-dialog #zotero-search-buttons -{ - margin: 3px 0; -} - /* Constrain 2x collection/search icons */ zoterosearch .menulist-icon { height: 16px; diff --git a/scss/_zotero.scss b/scss/_zotero.scss index c84961e80c..3fe2b709ea 100644 --- a/scss/_zotero.scss +++ b/scss/_zotero.scss @@ -20,6 +20,7 @@ // Components // -------------------------------------------------- +@import "components/advancedSearch"; @import "components/annotation"; @import "components/autosuggest"; @import "components/button"; diff --git a/scss/components/_advancedSearch.scss b/scss/components/_advancedSearch.scss new file mode 100644 index 0000000000..e802bed9b9 --- /dev/null +++ b/scss/components/_advancedSearch.scss @@ -0,0 +1,12 @@ +#zotero-advanced-search-dialog { + min-height: 400px; + min-width: 500px; + + #zotero-search-box-controls { + padding: 3px; + } + + #zotero-search-buttons { + margin: 3px 0; + } +}