From c9d61e76cb0d0b3996a63d89440b825895ae0048 Mon Sep 17 00:00:00 2001
From: "sspitzer%netscape.com" <sspitzer%netscape.com>
Date: Thu, 2 Dec 1999 22:34:19 +0000
Subject: [PATCH] fix pref xul and window size to look nicer.  now the pref
 window is bigger and now the size is set in pref.xul.  fixes #20244 among
 other bugs

---
 .../compose/prefs/resources/content/pref-formatting.xul   | 8 ++++----
 suite/common/pref/pref.xul                                | 2 ++
 xpfe/components/prefwindow/resources/content/pref.xul     | 2 ++
 xpfe/components/prefwindow/src/nsPrefWindow.cpp           | 6 ++++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/mailnews/compose/prefs/resources/content/pref-formatting.xul b/mailnews/compose/prefs/resources/content/pref-formatting.xul
index be7135813fe3..f7dcfa01a38a 100644
--- a/mailnews/compose/prefs/resources/content/pref-formatting.xul
+++ b/mailnews/compose/prefs/resources/content/pref-formatting.xul
@@ -25,26 +25,26 @@
 		<html:div>
 			<html:input id="pref:0:int:mail.default_html_action" class="indent" name="recipients" type="radio" checked="true"/>
 			<html:label for="pref:0:int:mail.default_html_action">&askMe.label;</html:label>
-			<html:label for="pref:0:int:mail.default_html_action" class="indent-second-label">&askMe2.label;</html:label>
 		</html:div>
+		<html:label for="pref:0:int:mail.default_html_action" class="indent-second-label">&askMe2.label;</html:label>
 
 		<html:div>
 			<html:input id="pref:1:int:mail.default_html_action" class="indent" name="recipients" type="radio"/>
 			<html:label for="pref:1:int:mail.default_html_action">&convertPlain.label;</html:label>
-			<html:label for="pref:1:int:mail.default_html_action" class="indent-second-label">&convertPlain2.label;</html:label>
 		</html:div>
+		<html:label for="pref:1:int:mail.default_html_action" class="indent-second-label">&convertPlain2.label;</html:label>
 
 		<html:div>
 			<html:input id="pref:2:int:mail.default_html_action" class="indent" name="recipients" type="radio"/>
 			<html:label for="pref:2:int:mail.default_html_action">&sendHTML.label;</html:label>
-			<html:label for="pref:2:int:mail.default_html_action" class="indent-second-label">&sendHTML2.label;</html:label>
 		</html:div>
+		<html:label for="pref:2:int:mail.default_html_action" class="indent-second-label">&sendHTML2.label;</html:label>
 
 		<html:div>
 			<html:input id="pref:3:int:mail.default_html_action" class="indent" name="recipients" type="radio"/>
 			<html:label for="pref:3:int:mail.default_html_action">&sendBoth.label;</html:label>
-			<html:label for="pref:3:int:mail.default_html_action" class="indent-second-label">&sendBoth2.label;</html:label>
 		</html:div>
+		<html:label for="pref:3:int:mail.default_html_action" class="indent-second-label">&sendBoth2.label;</html:label>
 
 		<html:div class="vertical-gap">&override.label;</html:div>
 	<!--/html:fieldset-->
diff --git a/suite/common/pref/pref.xul b/suite/common/pref/pref.xul
index 6e667a1e81f8..24f7e2fe7b0b 100644
--- a/suite/common/pref/pref.xul
+++ b/suite/common/pref/pref.xul
@@ -32,6 +32,8 @@
   class="dialog"
   onload="StartUp('Top'); OnLoadPref();"
   title="&window.title;"
+  height="436"
+  width="600"
   align="vertical">
 
 <html:script language="javascript" src="PrefsWindow.js"/>
diff --git a/xpfe/components/prefwindow/resources/content/pref.xul b/xpfe/components/prefwindow/resources/content/pref.xul
index 6e667a1e81f8..24f7e2fe7b0b 100644
--- a/xpfe/components/prefwindow/resources/content/pref.xul
+++ b/xpfe/components/prefwindow/resources/content/pref.xul
@@ -32,6 +32,8 @@
   class="dialog"
   onload="StartUp('Top'); OnLoadPref();"
   title="&window.title;"
+  height="436"
+  width="600"
   align="vertical">
 
 <html:script language="javascript" src="PrefsWindow.js"/>
diff --git a/xpfe/components/prefwindow/src/nsPrefWindow.cpp b/xpfe/components/prefwindow/src/nsPrefWindow.cpp
index 5d477d136f8c..ebaf7668b009 100644
--- a/xpfe/components/prefwindow/src/nsPrefWindow.cpp
+++ b/xpfe/components/prefwindow/src/nsPrefWindow.cpp
@@ -217,13 +217,15 @@ NS_IMETHODIMP nsPrefWindow::ShowWindow(
 #if defined(MODELESS_PREF_DIALOG)||defined(DEBUG_mcafee)||defined(DEBUG_akkana)||defined(DEBUG_pavlov)
     // testing modeless pref window.  -mcafee
     nsIWebShellWindow *foo = nsnull;
+    // pass 0 for the height and width because we want to leave the size up to the xul (see prefs.xul for the window size)
     rv = appShell->CreateTopLevelWindow(parent, urlObj, PR_TRUE, PR_TRUE,
                                NS_CHROME_ALL_CHROME | NS_CHROME_OPEN_AS_DIALOG,
-                               cb, 504, 436, &foo);
+                               cb, 0, 0, &foo);
 #else
+    // pass 0 for the height and width because we want to leave the size up to the xul (see prefs.xul for the window size)
     rv = appShell->RunModalDialog(nsnull, parent, urlObj,
                                NS_CHROME_ALL_CHROME | NS_CHROME_OPEN_AS_DIALOG,
-                               cb, 504, 436);
+                               cb, 0, 0);
 #endif
     return rv;
 } // nsPrefWindow::ShowWindow()