From d6bf52357d781fbf21f6b17e1346a95d0c8d2f6e Mon Sep 17 00:00:00 2001
From: Blair McBride <bmcbride@mozilla.com>
Date: Tue, 7 Dec 2010 13:32:08 +1300
Subject: [PATCH] Bug 614865 - Addon about window does not handle overflow very
 well. r=dtownsend, a=blocking-final

---
 toolkit/mozapps/extensions/content/about.js           |  6 ++++--
 toolkit/mozapps/extensions/content/about.xul          | 10 ++++++----
 toolkit/themes/pinstripe/mozapps/extensions/about.css |  4 ++--
 toolkit/themes/winstripe/mozapps/extensions/about.css |  4 ++--
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/toolkit/mozapps/extensions/content/about.js b/toolkit/mozapps/extensions/content/about.js
index 030607ac8b9..3a309102f35 100644
--- a/toolkit/mozapps/extensions/content/about.js
+++ b/toolkit/mozapps/extensions/content/about.js
@@ -49,7 +49,7 @@ function init() {
 
   document.title = extensionsStrings.getFormattedString("aboutWindowTitle", [addon.name]);
   var extensionName = document.getElementById("extensionName");
-  extensionName.setAttribute("value", addon.name);
+  extensionName.textContent = addon.name;
 
   var extensionVersion = document.getElementById("extensionVersion");
   if (addon.version)
@@ -98,6 +98,8 @@ function init() {
 
   var acceptButton = document.documentElement.getButton("accept");
   acceptButton.label = extensionsStrings.getString("aboutWindowCloseButton");
+  
+  setTimeout(sizeToContent, 0);
 }
 
 function appendToList(aHeaderId, aNodeId, aItems) {
@@ -111,7 +113,7 @@ function appendToList(aHeaderId, aNodeId, aItems) {
 
   for (let i = 0; i < aItems.length; i++) {
     var label = document.createElement("label");
-    label.setAttribute("value", aItems[i]);
+    label.textContent = aItems[i];
     label.setAttribute("class", "contributor");
     node.appendChild(label);
   }
diff --git a/toolkit/mozapps/extensions/content/about.xul b/toolkit/mozapps/extensions/content/about.xul
index c503926b9fa..90ed4b0d82a 100644
--- a/toolkit/mozapps/extensions/content/about.xul
+++ b/toolkit/mozapps/extensions/content/about.xul
@@ -59,10 +59,12 @@
   </stringbundleset>
 
   <vbox id="clientBox" flex="1">
-    <hbox class="basic-info" align="center">
-      <image id="extensionIcon"/>
-      <vbox>
-        <label id="extensionName" crop="end"/>
+    <hbox class="basic-info">
+      <vbox pack="center">
+        <image id="extensionIcon"/>
+      </vbox>
+      <vbox flex="1">
+        <label id="extensionName"/>
         <label id="extensionVersion" crop="end"/>
       </vbox>
     </hbox>
diff --git a/toolkit/themes/pinstripe/mozapps/extensions/about.css b/toolkit/themes/pinstripe/mozapps/extensions/about.css
index 42b6c029297..ad150e174d1 100644
--- a/toolkit/themes/pinstripe/mozapps/extensions/about.css
+++ b/toolkit/themes/pinstripe/mozapps/extensions/about.css
@@ -16,8 +16,8 @@
 
 #extensionIcon {
   list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
-  max-width: 48px;
-  max-height: 48px;
+  max-width: 64px;
+  max-height: 64px;
   -moz-margin-end: 6px;
 }
 
diff --git a/toolkit/themes/winstripe/mozapps/extensions/about.css b/toolkit/themes/winstripe/mozapps/extensions/about.css
index ecd4e0d39b3..c605e944a9a 100644
--- a/toolkit/themes/winstripe/mozapps/extensions/about.css
+++ b/toolkit/themes/winstripe/mozapps/extensions/about.css
@@ -24,8 +24,8 @@
 
 #extensionIcon {
   list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
-  max-width: 48px;
-  max-height: 48px;
+  max-width: 64px;
+  max-height: 64px;
   -moz-margin-end: 6px;
 }