From 51d7959ccdb875ef25ba28d349ce795cffdf0c8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adomas=20Ven=C4=8Dkauskas?= <adomas.ven@gmail.com>
Date: Mon, 5 Nov 2018 14:50:18 +0200
Subject: [PATCH] Revert "Ensure the doc prefs window is smaller than screen
 height"

This reverts commit 0fd28959bf01b40544e201f83e9d87b713aa0d7c.
The change causes citation style listbox to fail displaying bottom
entries, a flexed listbox xul bug:
https://bugzilla.mozilla.org/show_bug.cgi?id=413336
---
 chrome/content/zotero/bibliography.js                     | 2 +-
 chrome/content/zotero/integration/integrationDocPrefs.xul | 6 +++---
 chrome/content/zotero/xpcom/integration.js                | 2 +-
 chrome/skin/default/zotero/bibliography.css               | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/chrome/content/zotero/bibliography.js b/chrome/content/zotero/bibliography.js
index 236e8a1ea3..b5356b0070 100644
--- a/chrome/content/zotero/bibliography.js
+++ b/chrome/content/zotero/bibliography.js
@@ -235,7 +235,7 @@ var Zotero_File_Interface_Bibliography = new function() {
 			document.getElementById("citations").label = label;
 		}
 
-		window.resizeTo(window.outerWidth, Math.min(650, window.screen.availHeight));
+		window.sizeToContent();
 	};
 
 	/*
diff --git a/chrome/content/zotero/integration/integrationDocPrefs.xul b/chrome/content/zotero/integration/integrationDocPrefs.xul
index a7c1175436..f438c2bee3 100644
--- a/chrome/content/zotero/integration/integrationDocPrefs.xul
+++ b/chrome/content/zotero/integration/integrationDocPrefs.xul
@@ -43,10 +43,10 @@
 	
 	<script src="../include.js"/>
 	<script src="../bibliography.js"/>
-	<vbox id="zotero-bibliography-container" flex="1">
-		<groupbox flex="1">
+	<vbox id="zotero-bibliography-container">
+		<groupbox>
 			<caption label="&zotero.bibliography.style.label;"/>
-			<listbox id="style-listbox" onselect="Zotero_File_Interface_Bibliography.styleChanged()" flex="1"/>
+			<listbox id="style-listbox" onselect="Zotero_File_Interface_Bibliography.styleChanged()"/>
 			<hbox align="right">
 				<label id="manage-styles" class="text-link"
 					onclick="Zotero_File_Interface_Bibliography.manageStyles()">&zotero.bibliography.manageStyles;</label>
diff --git a/chrome/content/zotero/xpcom/integration.js b/chrome/content/zotero/xpcom/integration.js
index 8da0854995..2fe1383fb9 100644
--- a/chrome/content/zotero/xpcom/integration.js
+++ b/chrome/content/zotero/xpcom/integration.js
@@ -1501,7 +1501,7 @@ Zotero.Integration.Session.prototype.setDocPrefs = Zotero.Promise.coroutine(func
 	
 	// Make sure styles are initialized for new docs
 	yield Zotero.Styles.init();
-	yield Zotero.Integration.displayDialog('chrome://zotero/content/integration/integrationDocPrefs.xul', 'resizable', io);
+	yield Zotero.Integration.displayDialog('chrome://zotero/content/integration/integrationDocPrefs.xul', '', io);
 	
 	if (!io.style || !io.fieldType) {
 		throw new Zotero.Exception.UserCancelled("document preferences window");
diff --git a/chrome/skin/default/zotero/bibliography.css b/chrome/skin/default/zotero/bibliography.css
index 1ee1ee7637..56e98e2960 100644
--- a/chrome/skin/default/zotero/bibliography.css
+++ b/chrome/skin/default/zotero/bibliography.css
@@ -1,5 +1,6 @@
 #style-listbox
 {
+	height: 19em;
 	width: 325pt;
 }