Bug 1536873 - remove grid usage from editContactPanel.inc.xul and FilterListDialog.xul. r=mkmelin
authorKhushil Mistry <khushil324@gmail.com>
Sat, 23 Mar 2019 06:55:00 +0100
changeset 26155 54ab7596b8e8
parent 26154 d1aa51f98737
child 26156 9bdd3df915fd
push id15700
push usermozilla@jorgk.com
push dateSat, 23 Mar 2019 22:07:24 +0000
treeherdercomm-central@54ab7596b8e8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmkmelin
bugs1536873
Bug 1536873 - remove grid usage from editContactPanel.inc.xul and FilterListDialog.xul. r=mkmelin
mail/base/content/FilterListDialog.xul
mail/base/content/editContactPanel.inc.xul
--- a/mail/base/content/FilterListDialog.xul
+++ b/mail/base/content/FilterListDialog.xul
@@ -50,97 +50,36 @@
     <textbox id="searchBox"
              class="searchBox"
              flex="1"
              type="search"
              oncommand="rebuildFilterList();"
              emptytext="&searchBox.emptyText;"
              isempty="true"/>
   </hbox>
-
-  <grid id="filterListGrid" flex="1">
-    <columns>
-      <column flex="1"/>
-      <column/>
-    </columns>
-    <rows>
-      <row>
-        <separator class="thin"/>
-      </row>
-      <row>
-        <hbox>
-          <label id="filterListLabel"
-                 control="filterList"
-                 flex="1">
-            &filterHeader.label;
-          </label>
-          <label id="countBox"/>
-        </hbox>
-      </row>
-
-      <row flex="1">
-        <vbox>
-          <richlistbox id="filterList" flex="1" onselect="updateButtons();"
-                       class="theme-listbox" seltype="multiple"
-                       onkeypress="onFilterListKeyPress(event);">
-            <treecols>
-              <treecol id="nameColumn" label="&nameColumn.label;" flex="1"/>
-              <treecol id="activeColumn" label="&activeColumn.label;" width="100"/>
-            </treecols>
-          </richlistbox>
-        </vbox>
-
-        <vbox>
-          <button id="newButton"
-                  type="menu-button"
-                  label="&newButton.label;"
-                  accesskey="&newButton.accesskey;"
-                  oncommand="onNewFilter();">
-            <menupopup>
-              <menuitem label="&newButton.label;"
-                        accesskey="&newButton.accesskey;"/>
-              <menuitem id="copyToNewButton"
-                        label="&newButton.popupCopy.label;"
-                        accesskey="&newButton.popupCopy.accesskey;"
-                        oncommand="onCopyToNewFilter(); event.stopPropagation();"/>
-            </menupopup>
-          </button>
-          <button id="editButton" label="&editButton.label;"
-                  accesskey="&editButton.accesskey;"
-                  oncommand="onEditFilter();"/>
-          <button id="deleteButton"
-                  label="&deleteButton.label;"
-                  accesskey="&deleteButton.accesskey;"
-                  oncommand="onDeleteFilter();"/>
-          <spacer flex="1"/>
-          <button id="reorderTopButton"
-                  label="&reorderTopButton;"
-                  accesskey="&reorderTopButton.accessKey;"
-                  tooltiptext="&reorderTopButton.toolTip;"
-                  oncommand="onTop(event);"/>
-          <button id="reorderUpButton"
-                  label="&reorderUpButton.label;"
-                  accesskey="&reorderUpButton.accesskey;"
-                  class="up"
-                  oncommand="onUp(event);"/>
-          <button id="reorderDownButton"
-                  label="&reorderDownButton.label;"
-                  accesskey="&reorderDownButton.accesskey;"
-                  class="down"
-                  oncommand="onDown(event);"/>
-          <button id="reorderBottomButton"
-                  label="&reorderBottomButton;"
-                  accesskey="&reorderBottomButton.accessKey;"
-                  tooltiptext="&reorderBottomButton.toolTip;"
-                  oncommand="onBottom(event);"/>
-          <spacer flex="1"/>
-        </vbox>
-      </row>
-      <row>
-        <vbox>
+  <separator class="thin"/>
+  <hbox id="filterListGrid" flex="1">
+    <vbox flex="1">
+      <hbox>
+        <label id="filterListLabel" control="filterList" flex="1">
+          &filterHeader.label;
+        </label>
+        <label id="countBox"/>
+      </hbox>
+      <box flex="1">
+        <richlistbox id="filterList" flex="1" onselect="updateButtons();"
+                     class="theme-listbox" seltype="multiple"
+                     onkeypress="onFilterListKeyPress(event);">
+              <treecols>
+                <treecol id="nameColumn" label="&nameColumn.label;" flex="1"/>
+                <treecol id="activeColumn" label="&activeColumn.label;" width="100"/>
+              </treecols>
+        </richlistbox>
+      </box>
+      <vbox>
           <separator class="thin"/>
           <hbox align="center">
             <label id="folderPickerPrefix" value="&folderPickerPrefix.label;"
                    accesskey="&folderPickerPrefix.accesskey;"
                    disabled="true" control="runFiltersFolder"/>
             <menulist id="runFiltersFolder" disabled="true" flex="1"
                       class="folderMenuItem"
                       displayformat="verbose">
@@ -156,26 +95,68 @@
                   accesskey="&runFilters.accesskey;"
                   runlabel="&runFilters.label;"
                   runaccesskey="&runFilters.accesskey;"
                   stoplabel="&stopFilters.label;"
                   stopaccesskey="&stopFilters.accesskey;"
                   oncommand="runSelectedFilters();" disabled="true"/>
           </hbox>
         </vbox>
-        <vbox>
-          <separator class="thin"/>
-            <button label="&viewLogButton.label;"
-                    accesskey="&viewLogButton.accesskey;"
-                    oncommand="viewLog();"/>
-
-        </vbox>
-      </row>
-    </rows>
-  </grid>
+    </vbox>
+    <vbox>
+      <label value=""/>
+      <button id="newButton"
+              type="menu-button"
+              label="&newButton.label;"
+              accesskey="&newButton.accesskey;"
+              oncommand="onNewFilter();">
+        <menupopup>
+          <menuitem label="&newButton.label;"
+                    accesskey="&newButton.accesskey;"/>
+          <menuitem id="copyToNewButton"
+                    label="&newButton.popupCopy.label;"
+                    accesskey="&newButton.popupCopy.accesskey;"
+                    oncommand="onCopyToNewFilter(); event.stopPropagation();"/>
+        </menupopup>
+      </button>
+      <button id="editButton" label="&editButton.label;"
+              accesskey="&editButton.accesskey;"
+              oncommand="onEditFilter();"/>
+      <button id="deleteButton"
+              label="&deleteButton.label;"
+              accesskey="&deleteButton.accesskey;"
+              oncommand="onDeleteFilter();"/>
+      <separator class="thin"/>
+      <button id="reorderTopButton"
+              label="&reorderTopButton;"
+              accesskey="&reorderTopButton.accessKey;"
+              tooltiptext="&reorderTopButton.toolTip;"
+              oncommand="onTop(event);"/>
+      <button id="reorderUpButton"
+              label="&reorderUpButton.label;"
+              accesskey="&reorderUpButton.accesskey;"
+              class="up"
+              oncommand="onUp(event);"/>
+      <button id="reorderDownButton"
+              label="&reorderDownButton.label;"
+              accesskey="&reorderDownButton.accesskey;"
+              class="down"
+              oncommand="onDown(event);"/>
+      <button id="reorderBottomButton"
+              label="&reorderBottomButton;"
+              accesskey="&reorderBottomButton.accessKey;"
+              tooltiptext="&reorderBottomButton.toolTip;"
+              oncommand="onBottom(event);"/>
+      <vbox flex="1" pack="end">
+        <button label="&viewLogButton.label;"
+                accesskey="&viewLogButton.accesskey;"
+                oncommand="viewLog();"/>
+      </vbox>
+    </vbox>
+  </hbox>
 
   <separator class="thin"/>
 
   <hbox id="status-bar" class="statusbar chromeclass-status">
     <statusbarpanel id="statusText" flex="1" crop="right"/>
     <hbox id="statusbar-progresspanel" class="statusbarpanel statusbarpanel-progress" collapsed="true">
       <html:progress class="progressmeter-statusbar" id="statusbar-icon" value="0" max="100"/>
     </hbox>
--- a/mail/base/content/editContactPanel.inc.xul
+++ b/mail/base/content/editContactPanel.inc.xul
@@ -23,59 +23,55 @@
         onpopupshown="editContactInlineUI.onPopupShown(event);"
         onkeypress="editContactInlineUI.onKeyPress(event, true);">
   <hbox id="editContactHeader"
         flex="1" align="center">
     <image id="editContactPanelIcon"/>
     <label id="editContactPanelTitle" flex="1"/>
   </hbox>
 
-  <vbox id="editContactContent">
-    <grid id="editContactGrid" flex="1">
-      <columns>
-        <column/>
-        <column flex="1"/>
-      </columns>
-      <rows>
-        <row align="center" id="editContactNameRow">
-          <label value="&editContactName.label;"
-                  class="editContactPanel_rowLabel"
-                  accesskey="&editContactName.accesskey;"
-                  control="editContactName"/>
-          <textbox id="editContactName" class="editContactTextbox"
+  <hbox id="editContactContent">
+    <vbox flex="1">
+      <hbox flex="1" align="center" pack="end">
+        <label value="&editContactName.label;"
+               class="editContactPanel_rowLabel"
+               accesskey="&editContactName.accesskey;"
+               control="editContactName"/>
+      </hbox>
+      <hbox flex="1" align="center" pack="end">
+        <label value="&editContactEmail.label;"
+               class="editContactPanel_rowLabel"
+               accesskey="&editContactEmail.accesskey;"
+               control="editContactEmail"/>
+      </hbox>
+      <hbox flex="1" align="center" pack="end">
+        <label id="editContactAddressBook"
+               class="editContactPanel_rowLabel"
+               value="&editContactAddressBook.label;"
+               accesskey="&editContactAddressBook.accesskey;"
+               control="editContactAddressBookList"/>
+      </hbox>
+      <hbox flex="1" align="center" pack="end" collapsed="true">
+        <label value=""/>
+      </hbox>
+    </vbox>
+    <vbox>
+      <textbox id="editContactName" class="editContactTextbox"
                     onkeypress="editContactInlineUI.onKeyPress(event, true);"/>
-        </row>
-        <row align="center" id="editContactEmailRow">
-          <label value="&editContactEmail.label;"
-                  class="editContactPanel_rowLabel"
-                  accesskey="&editContactEmail.accesskey;"
-                  control="editContactEmail"/>
-          <textbox id="editContactEmail" readonly="true"
-                    class="editContactTextbox"
-                    onkeypress="editContactInlineUI.onKeyPress(event, true);"/>
-        </row>
-        <row align="center" id="editContactABRow">
-          <label id="editContactAddressBook"
-                  class="editContactPanel_rowLabel"
-                  value="&editContactAddressBook.label;"
-                  accesskey="&editContactAddressBook.accesskey;"
-                  control="editContactAddressBookList"/>
-          <menulist id="editContactAddressBookList" flex="1">
+      <textbox id="editContactEmail" readonly="true"
+               class="editContactTextbox"
+               onkeypress="editContactInlineUI.onKeyPress(event, true);"/>
+      <menulist id="editContactAddressBookList" flex="1">
             <menupopup id="editContactAddressBookList-menupopup"
-                        class="addrbooksPopup"/>
-          </menulist>
-        </row>
-        <row>
-          <hbox/>
-          <description id="contactMoveDisabledText"
+                       class="addrbooksPopup"/>
+      </menulist>
+      <description id="contactMoveDisabledText"
                         collapsed="true">&contactMoveDisabledWarning.description;</description>
-        </row>
-      </rows>
-    </grid>
-  </vbox>
+    </vbox>
+  </hbox>
 
   <hbox flex="1"
         id="editContactPanelBottomButtons">
     <button id="editContactPanelEditDetailsButton"
             class="editContactPanelButton"
             flex="1"
             oncommand="editContactInlineUI.editDetails();"
             onkeypress="editContactInlineUI.onKeyPress(event, false);"/>