Bug 1529295 - Add scrollbar to instant messaging account properties panel. r=Paenglab a=jorgk
authorAlessandro Castellani <alessandro@thunderbird.net>
Thu, 15 Aug 2019 14:31:25 -0700
changeset 36166 69f507411a5a5ad1e79d83672be90e2f23cbc2fd
parent 36165 fa24e6e5f4958ad34163c148c2ab77d6e2e5a4bd
child 36167 c92ef06a0a1dae58c89ac605fe38184b2b5841ef
push id392
push userclokep@gmail.com
push dateMon, 02 Sep 2019 20:17:19 +0000
reviewersPaenglab, jorgk
bugs1529295
Bug 1529295 - Add scrollbar to instant messaging account properties panel. r=Paenglab a=jorgk
mail/components/im/content/am-im.xul
--- a/mail/components/im/content/am-im.xul
+++ b/mail/components/im/content/am-im.xul
@@ -22,111 +22,110 @@
   <script src="chrome://messenger/content/am-im.js"/>
 
   <linkset>
     <html:link rel="localization" href="branding/brand.ftl"/>
     <html:link rel="localization" href="messenger/preferences/am-im.ftl"/>
     <html:link rel="localization" href="messenger/otr/am-im-otr.ftl"/>
   </linkset>
 
-  <hbox class="dialogheader">
-    <label class="dialogheader-title" defaultTitle="&accountWindow.title;"/>
-  </hbox>
-
-  <groupbox>
-    <hbox align="center">
-      <image id="protocolIcon"/>
-      <vbox flex="1">
-        <label id="accountName" crop="end" class="header"/>
-        <label id="protocolName"/>
-      </vbox>
+  <vbox flex="1" style="overflow: auto;">
+    <hbox class="dialogheader">
+      <label class="dialogheader-title" defaultTitle="&accountWindow.title;"/>
     </hbox>
-  </groupbox>
-  <groupbox>
-    <tabbox id="imTabbox" flex="1">
-      <tabs>
-          <tab id="imTabGeneral" label="&account.general;"/>
-          <tab id="imTabOTR" data-l10n-id="account-encryption" hidden="true"/>
-      </tabs>
-      <tabpanels flex="1">
-        <tabpanel orient="vertical">
-          <label class="header" data-l10n-id="account-settingsTitle" />
-          <hbox id="passwordBox" equalsize="always" align="baseline">
-            <label value="&account.password;" control="server.password" flex="1"/>
-            <textbox id="server.password" flex="1" type="password"
-                     preftype="wstring" genericattr="true"/>
-          </hbox>
-          <hbox id="aliasBox" equalsize="always" align="baseline">
-            <label value="&account.alias;" control="server.alias" flex="1"/>
-            <textbox id="server.alias" flex="1" preftype="wstring"
-                     wsm_persist="true" genericattr="true"/>
-          </hbox>
-          <separator class="thin"/>
 
-          <vbox id="autojoinBox" hidden="true">
-            <label class="header" data-l10n-id="account-channelTitle" />
-            <vbox>
-              <label value="&account.autojoin;" control="server.autojoin" flex="1"/>
-              <textbox id="server.autojoin" flex="1" preftype="wstring" genericattr="true"/>
-            </vbox>
-            <separator class="thin"/>
-          </vbox>
-          <vbox id="advanced">
-            <label class="header">&account.advanced;</label>
-            <vbox id="protoSpecific" flex="1"/>
-          </vbox>
-        </tabpanel>
-
-        <tabpanel orient="vertical">
-          <label class="header" data-l10n-id="account-otr-label" />
-          <description data-l10n-id="account-otr-description" />
-
-          <separator/>
-
-          <vbox>
-            <label class="header" data-l10n-id="otr-settings-title" />
-            <checkbox id="server.otrAllowMsgLog"
-                      data-l10n-id="otr-log"
-                      crop="end"
-                      wsm_persist="true"
-                      preftype="bool"
-                      genericattr="true"
-                      />
-            <checkbox id="server.otrRequireEncryption"
-                      data-l10n-id="otr-requireEncryption"
-                      crop="end"
-                      wsm_persist="true"
-                      preftype="bool"
-                      genericattr="true"
-                      />
-            <checkbox id="server.otrVerifyNudge"
-                      data-l10n-id="otr-verifyNudge"
-                      crop="end"
-                      wsm_persist="true"
-                      preftype="bool"
-                      genericattr="true"
-                      />
-          </vbox>
-
-          <separator/>
-
-          <vbox>
-            <label class="header" data-l10n-id="otr-encryption-title" />
-            <label data-l10n-id="otr-encryption-caption" />
-            <separator class="thin"/>
-            <hbox align="baseline">
-              <label data-l10n-id="otr-fingerprint-label" />
-              <textbox id="otrFingerprint"
-                          readonly="true"
-                          flex="1"/>
+    <groupbox>
+      <hbox align="center">
+        <image id="protocolIcon"/>
+        <vbox flex="1">
+          <label id="accountName" crop="end" class="header"/>
+          <label id="protocolName"/>
+        </vbox>
+      </hbox>
+    </groupbox>
+    <groupbox>
+      <tabbox id="imTabbox" flex="1">
+        <tabs>
+            <tab id="imTabGeneral" label="&account.general;"/>
+            <tab id="imTabOTR" data-l10n-id="account-encryption" hidden="true"/>
+        </tabs>
+        <tabpanels flex="1">
+          <tabpanel orient="vertical">
+            <label class="header" data-l10n-id="account-settingsTitle" />
+            <hbox id="passwordBox" equalsize="always" align="baseline">
+              <label value="&account.password;" control="server.password" flex="1"/>
+              <textbox id="server.password" flex="1" type="password"
+                       preftype="wstring" genericattr="true"/>
+            </hbox>
+            <hbox id="aliasBox" equalsize="always" align="baseline">
+              <label value="&account.alias;" control="server.alias" flex="1"/>
+              <textbox id="server.alias" flex="1" preftype="wstring"
+                       wsm_persist="true" genericattr="true"/>
             </hbox>
             <separator class="thin"/>
-            <hbox pack="start">
-              <button id="viewFingerprintButton"
-                      data-l10n-id="view-fingerprint-button"
-                      oncommand="account.viewFingerprintKeys();"/>
-            </hbox>
-          </vbox>
-        </tabpanel>
-      </tabpanels>
-    </tabbox>
-  </groupbox>
+
+            <vbox id="autojoinBox" hidden="true">
+              <label class="header" data-l10n-id="account-channelTitle" />
+              <vbox>
+                <label value="&account.autojoin;" control="server.autojoin" flex="1"/>
+                <textbox id="server.autojoin" flex="1" preftype="wstring" genericattr="true"/>
+              </vbox>
+              <separator class="thin"/>
+            </vbox>
+            <vbox id="advanced">
+              <label class="header">&account.advanced;</label>
+              <vbox id="protoSpecific" flex="1"/>
+            </vbox>
+          </tabpanel>
+
+          <tabpanel orient="vertical">
+            <label class="header" data-l10n-id="account-otr-label" />
+            <description data-l10n-id="account-otr-description" />
+
+            <separator/>
+
+            <vbox>
+              <label class="header" data-l10n-id="otr-settings-title" />
+              <checkbox id="server.otrAllowMsgLog"
+                        data-l10n-id="otr-log"
+                        crop="end"
+                        wsm_persist="true"
+                        preftype="bool"
+                        genericattr="true"/>
+              <checkbox id="server.otrRequireEncryption"
+                        data-l10n-id="otr-requireEncryption"
+                        crop="end"
+                        wsm_persist="true"
+                        preftype="bool"
+                        genericattr="true"/>
+              <checkbox id="server.otrVerifyNudge"
+                        data-l10n-id="otr-verifyNudge"
+                        crop="end"
+                        wsm_persist="true"
+                        preftype="bool"
+                        genericattr="true"/>
+            </vbox>
+
+            <separator/>
+
+            <vbox>
+              <label class="header" data-l10n-id="otr-encryption-title" />
+              <label data-l10n-id="otr-encryption-caption" />
+              <separator class="thin"/>
+              <hbox align="baseline">
+                <label data-l10n-id="otr-fingerprint-label" />
+                <textbox id="otrFingerprint"
+                         readonly="true"
+                         flex="1"/>
+              </hbox>
+              <separator class="thin"/>
+              <hbox pack="start">
+                <button id="viewFingerprintButton"
+                        data-l10n-id="view-fingerprint-button"
+                        oncommand="account.viewFingerprintKeys();"/>
+              </hbox>
+            </vbox>
+          </tabpanel>
+        </tabpanels>
+      </tabbox>
+    </groupbox>
+  </vbox>
 </page>