Bug 1315528 - Show in Image Properties dialog our own separator above the dialog-button-box. r=jorgk
authorRichard Marti <richard.marti@gmail.com>
Sun, 06 Nov 2016 12:38:33 +0100
changeset 26738 6e15a145bcd996cdffe914799a5064372acb81ea
parent 26737 b18e1af73258bb325bc90fb35a814928ca2987b5
child 26739 59ccd1a58f30b7d5b96d5877d34172e1f4afba59
push id1834
push userclokep@gmail.com
push dateMon, 23 Jan 2017 21:48:40 +0000
treeherdercomm-beta@293cffe83e59 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjorgk
bugs1315528
Bug 1315528 - Show in Image Properties dialog our own separator above the dialog-button-box. r=jorgk
editor/ui/dialogs/content/EdDialogOverlay.xul
editor/ui/dialogs/content/EdImageProps.js
editor/ui/dialogs/content/EdImageProps.xul
--- a/editor/ui/dialogs/content/EdDialogOverlay.xul
+++ b/editor/ui/dialogs/content/EdDialogOverlay.xul
@@ -11,17 +11,17 @@
 
 <vbox id="AdvancedEdit">
   <hbox flex="1" style="margin-top: 0.2em" align="center">
     <!-- This will right-align the button -->
     <spacer flex="1"/>
     <button id="AdvancedEditButton1" oncommand="onAdvancedEdit()" label="&AdvancedEditButton.label;"
             accesskey="&AdvancedEditButton.accessKey;" tooltiptext="&AdvancedEditButton.tooltip;"/>
   </hbox>
-  <separator class="groove"/>
+  <separator id="advancedSeparator" class="groove"/>
 </vbox>
 
 <!-- Extra buttons to use when just button is needed
      E.g. Image Properties Dialog switches position between 2 locations
      Placed here to use same attributes as AdvancedEditButton button
 -->
 <button
   id        = "AdvancedEditButton"
--- a/editor/ui/dialogs/content/EdImageProps.js
+++ b/editor/ui/dialogs/content/EdImageProps.js
@@ -115,16 +115,19 @@ function Startup()
   if (gDialog.linkTab && "arguments" in window && window.arguments[1])
   {
     document.getElementById("TabBox").selectedTab = gDialog.linkTab;
     SetTextboxFocus(gDialog.hrefInput);
   }
   else
     SetTextboxFocus(gDialog.srcInput);
 
+  // Hide the separator from EdDialogOverlay.xul as we show our own
+  document.getElementById("advancedSeparator").hidden = true;
+
   SetWindowLocation();
 }
 
 // Set dialog widgets with attribute data
 // We get them from globalElement copy so this can be used
 //   by AdvancedEdit(), which is shared by all property dialogs
 function InitDialog()
 {
--- a/editor/ui/dialogs/content/EdImageProps.xul
+++ b/editor/ui/dialogs/content/EdImageProps.xul
@@ -62,10 +62,11 @@
   </tabbox>
 
   <hbox align="end">
     <groupbox id="imagePreview"/>
 
     <!-- from EdDialogOverlay -->
     <vbox id="AdvancedEdit"/>
   </hbox>
+  <separator class="groove"/>
 
 </dialog>