Bug 714583 - Labels of inline options shouldn't get cropped; r=Unfocused
authorGeoff Lankow <geoff@darktrojan.net>
Tue, 03 Jan 2012 09:26:40 +1300
changeset 85053 57d4b43b95a442cd8cf1090513e70e6038175dda
parent 85052 4d4a6450547766b22574deaa651caa0b0f50cf98
child 85054 93fb2f8cd624ee1dec00312d95fc7c2909657ba7
push id805
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 18:17:35 +0000
treeherdermozilla-aurora@6fb3bf232436 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersUnfocused
bugs714583
milestone12.0a1
Bug 714583 - Labels of inline options shouldn't get cropped; r=Unfocused
toolkit/mozapps/extensions/content/setting.xml
--- a/toolkit/mozapps/extensions/content/setting.xml
+++ b/toolkit/mozapps/extensions/content/setting.xml
@@ -45,17 +45,17 @@
 
 <bindings xmlns="http://www.mozilla.org/xbl"
           xmlns:xbl="http://www.mozilla.org/xbl"
           xmlns:html="http://www.w3.org/1999/xhtml"
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <binding id="settings">
     <content orient="vertical">
-      <xul:label class="settings-title" xbl:inherits="value=label" crop="end" flex="1"/>
+      <xul:label class="settings-title" xbl:inherits="xbl:text=label" flex="1"/>
       <children />
     </content>
   </binding>
 
   <binding id="setting-base">
     <implementation>
       <constructor><![CDATA[
         this.preferenceChanged();
@@ -165,18 +165,18 @@
         this.parentNode.localName == "settings" ? this.parentNode : null;
       </field>
     </implementation>
   </binding>
 
   <binding id="setting-bool" extends="chrome://mozapps/content/extensions/setting.xml#setting-base">
     <content>
       <xul:vbox class="setting-label">
-        <xul:label class="preferences-title" xbl:inherits="value=title" crop="end" flex="1"/>
-        <xul:label class="preferences-description" xbl:inherits="value=desc" crop="end" flex="1">
+        <xul:label class="preferences-title" xbl:inherits="xbl:text=title" flex="1"/>
+        <xul:label class="preferences-description" xbl:inherits="xbl:text=desc" flex="1">
           <children/>
         </xul:label>
       </xul:vbox>
       <xul:hbox anonid="input-container" class="setting-input">
         <xul:checkbox anonid="input" xbl:inherits="disabled,onlabel,offlabel" oncommand="inputChanged();"/>
       </xul:hbox>
     </content>
 
@@ -202,18 +202,18 @@
       <property name="value" onget="return this.input.checked;" onset="return this.input.setChecked(val);"/>
       <property name="inverted" readonly="true" onget="return this.getAttribute('inverted');"/>
     </implementation>
   </binding>
 
   <binding id="setting-boolint" extends="chrome://mozapps/content/extensions/setting.xml#setting-base">
     <content>
       <xul:vbox class="setting-label">
-        <xul:label class="preferences-title" xbl:inherits="value=title" crop="end" flex="1"/>
-        <xul:label class="preferences-description" xbl:inherits="value=desc" crop="end" flex="1">
+        <xul:label class="preferences-title" xbl:inherits="xbl:text=title" flex="1"/>
+        <xul:label class="preferences-description" xbl:inherits="xbl:text=desc" flex="1">
           <children/>
         </xul:label>
       </xul:vbox>
       <xul:hbox anonid="input-container" class="setting-input">
         <xul:checkbox anonid="input" xbl:inherits="disabled" oncommand="inputChanged();"/>
       </xul:hbox>
     </content>
 
@@ -265,18 +265,18 @@
       </method>
 
     </implementation>
   </binding>
 
   <binding id="setting-integer" extends="chrome://mozapps/content/extensions/setting.xml#setting-base">
     <content>
       <xul:vbox class="setting-label">
-        <xul:label class="preferences-title" xbl:inherits="value=title" crop="end" flex="1"/>
-        <xul:label class="preferences-description" xbl:inherits="value=desc" crop="end" flex="1">
+        <xul:label class="preferences-title" xbl:inherits="xbl:text=title" flex="1"/>
+        <xul:label class="preferences-description" xbl:inherits="xbl:text=desc" flex="1">
           <children/>
         </xul:label>
       </xul:vbox>
       <xul:hbox anonid="input-container" class="setting-input">
         <xul:textbox type="number" anonid="input" xbl:inherits="disabled,emptytext,min,max,increment,hidespinbuttons,wraparound" oninput="inputChanged();" onchange="inputChanged();"/>
       </xul:hbox>
     </content>
 
@@ -301,32 +301,32 @@
       <property name="type" readonly="true" onget="return this.getAttribute('type');"/>
       <property name="value" onget="return this.input.value;" onset="return this.input.value = val;"/>
     </implementation>
   </binding>
 
   <binding id="setting-control" extends="chrome://mozapps/content/extensions/setting.xml#setting-base">
     <content>
       <xul:vbox class="setting-label">
-        <xul:label class="preferences-title" xbl:inherits="value=title" crop="end" flex="1"/>
-        <xul:label class="preferences-description" xbl:inherits="value=desc" crop="end" flex="1">
+        <xul:label class="preferences-title" xbl:inherits="xbl:text=title" flex="1"/>
+        <xul:label class="preferences-description" xbl:inherits="xbl:text=desc" flex="1">
           <children/>
         </xul:label>
       </xul:vbox>
       <xul:hbox anonid="input-container" class="setting-input">
         <children includes="button|menulist"/>
       </xul:hbox>
     </content>
   </binding>
 
   <binding id="setting-string" extends="chrome://mozapps/content/extensions/setting.xml#setting-base">
     <content>
       <xul:vbox class="setting-label">
-        <xul:label class="preferences-title" xbl:inherits="value=title" crop="end" flex="1"/>
-        <xul:label class="preferences-description" xbl:inherits="value=desc" crop="end" flex="1">
+        <xul:label class="preferences-title" xbl:inherits="xbl:text=title" flex="1"/>
+        <xul:label class="preferences-description" xbl:inherits="xbl:text=desc" flex="1">
           <children/>
         </xul:label>
       </xul:vbox>
       <xul:hbox anonid="input-container" class="setting-input">
         <xul:textbox xbl:inherits="disabled,emptytext,type=inputtype,min,max,increment,hidespinbuttons,decimalplaces,wraparound" anonid="input" oninput="inputChanged();"/>
       </xul:hbox>
     </content>
 
@@ -353,18 +353,18 @@
 
       <property name="value" onget="return this.input.value;" onset="return this.input.value=val;"/>
     </implementation>
   </binding>
 
   <binding id="setting-color" extends="chrome://mozapps/content/extensions/setting.xml#setting-base">
     <content>
       <xul:vbox class="setting-label">
-        <xul:label class="preferences-title" xbl:inherits="value=title" crop="end" flex="1"/>
-        <xul:label class="preferences-description" xbl:inherits="value=desc" crop="end" flex="1">
+        <xul:label class="preferences-title" xbl:inherits="xbl:text=title" flex="1"/>
+        <xul:label class="preferences-description" xbl:inherits="xbl:text=desc" flex="1">
           <children/>
         </xul:label>
       </xul:vbox>
       <xul:hbox anonid="input-container" class="setting-input">
         <xul:colorpicker type="button" anonid="input" xbl:inherits="disabled" onchange="document.getBindingParent(this).inputChanged();"/>
       </xul:hbox>
     </content>
 
@@ -390,18 +390,18 @@
 
       <property name="value" onget="return this.input.color;" onset="return this.input.color = val;"/>
     </implementation>
   </binding>
 
   <binding id="setting-path" extends="chrome://mozapps/content/extensions/setting.xml#setting-base">
     <content>
       <xul:vbox class="setting-label">
-        <xul:label class="preferences-title" xbl:inherits="value=title" crop="end" flex="1"/>
-        <xul:label class="preferences-description" xbl:inherits="value=desc" crop="end" flex="1">
+        <xul:label class="preferences-title" xbl:inherits="xbl:text=title" flex="1"/>
+        <xul:label class="preferences-description" xbl:inherits="xbl:text=desc" flex="1">
           <children/>
         </xul:label>
       </xul:vbox>
       <xul:hbox anonid="input-container" align="center" class="setting-input">
         <xul:button type="button" anonid="button" label="&settings.path.button.label;" xbl:inherits="disabled" oncommand="showPicker();" />
         <xul:label anonid="input" flex="1" crop="start" xbl:inherits="disabled" />
       </xul:hbox>
     </content>
@@ -471,18 +471,18 @@
         </setter>
       </property>
     </implementation>
   </binding>
 
   <binding id="setting-multi" extends="chrome://mozapps/content/extensions/setting.xml#setting-base">
     <content>
       <xul:vbox class="setting-label">
-        <xul:label class="preferences-title" xbl:inherits="value=title" crop="end" flex="1"/>
-        <xul:label class="preferences-description" xbl:inherits="value=desc" crop="end" flex="1">
+        <xul:label class="preferences-title" xbl:inherits="xbl:text=title" flex="1"/>
+        <xul:label class="preferences-description" xbl:inherits="xbl:text=desc" flex="1">
           <children/>
         </xul:label>
       </xul:vbox>
       <xul:hbox class="setting-input">
         <children includes="radiogroup|menulist" />
       </xul:hbox>
     </content>