Bug 762129 - Wrong behavior of the Participants/Previous conversations splitter when moved all the way to the top/bottom, r=mconley, a=bienvenu.
authorFlorian Quèze <florian@queze.net>
Thu, 14 Jun 2012 16:09:24 +0200
changeset 12358 4517e86cbcf6ffe7d513372f80dbd54104847855
parent 12357 be270b5d532fa5fa07111fcf26eb70791c4c2677
child 12359 30ceab95f4350d6e4a478c0fa5bbb647cb75ec48
push id599
push usermconley@mozilla.com
push dateMon, 16 Jul 2012 20:33:12 +0000
treeherdercomm-beta@c3489d5b7b65 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmconley, bienvenu
bugs762129
Bug 762129 - Wrong behavior of the Participants/Previous conversations splitter when moved all the way to the top/bottom, r=mconley, a=bienvenu.
mail/components/im/content/chat-messenger-overlay.xul
mail/components/im/content/chat.css
--- a/mail/components/im/content/chat-messenger-overlay.xul
+++ b/mail/components/im/content/chat-messenger-overlay.xul
@@ -234,34 +234,36 @@
               </deck>
               <button id="goToConversation" hidden="true"
                       oncommand="chatHandler.showCurrentConversation();"/>
             </vbox>
           </deck>
           <splitter id="contextSplitter" hidden="true" collapse="after"/>
           <vbox id="contextPane" hidden="true" width="250" persist="width">
             <toolbar class="conv-top-info" id="conv-top-info"/>
-            <vbox flex="1" class="conv-chat" width="150">
-              <hbox align="baseline" class="conv-nicklist-header">
-                <label class="conv-nicklist-header-label"
-                       id="participantLabel" control="participantCount"
-                       value="&chat.participants;"/>
-                <textbox flex="1" readonly="true" class="plain" id="participantCount"/>
-              </hbox>
-              <listbox id="nicklist" class="conv-nicklist"
-                       flex="1" seltype="multiple"
-                       tooltip="buddyTooltip"
-                       onclick="chatHandler.onNickClick(event);"
-                       onkeypress="chatHandler.onNicklistKeyPress(event);"/>
-            </vbox>
-            <splitter id="logsSplitter" class="conv-chat"/>
-            <vbox flex="1" id="previousConversations">
-              <label class="conv-logs-header-label"
-                     id="participantLabel"
-                     value="&chat.previousConversations;"/>
-              <listbox flex="1" id="logList" onselect="chatHandler.onLogSelect();"/>
+            <vbox id="contextPaneFlexibleBox" flex="1">
+              <vbox flex="1" class="conv-chat" width="150">
+                <hbox align="baseline" class="conv-nicklist-header">
+                  <label class="conv-nicklist-header-label"
+                         id="participantLabel" control="participantCount"
+                         value="&chat.participants;"/>
+                  <textbox flex="1" readonly="true" class="plain" id="participantCount"/>
+                </hbox>
+                <listbox id="nicklist" class="conv-nicklist"
+                         flex="1" seltype="multiple"
+                         tooltip="buddyTooltip"
+                         onclick="chatHandler.onNickClick(event);"
+                         onkeypress="chatHandler.onNicklistKeyPress(event);"/>
+              </vbox>
+              <splitter id="logsSplitter" class="conv-chat"/>
+              <vbox flex="1" id="previousConversations">
+                <label class="conv-logs-header-label"
+                       id="participantLabel"
+                       value="&chat.previousConversations;"/>
+                <listbox flex="1" id="logList" onselect="chatHandler.onLogSelect();"/>
+              </vbox>
             </vbox>
           </vbox>
         </hbox>
       </notificationbox>
     </vbox>
   </tabpanels>
 </overlay>
--- a/mail/components/im/content/chat.css
+++ b/mail/components/im/content/chat.css
@@ -40,17 +40,21 @@ imconv {
 tooltip[type="buddy"] {
   -moz-binding: url("chrome://messenger/content/chat/imbuddytooltip.xml#tooltip");
 }
 
 browser[type="content-conversation"] {
   -moz-binding: url("chrome://chat/content/convbrowser.xml#browser");
 }
 
-#contextPane:not([chat]) > .conv-chat {
+#contextPaneFlexibleBox {
+  overflow: hidden;
+}
+
+#contextPane:not([chat]) > vbox > .conv-chat {
   display: none;
 }
 
 .conv-top-info {
   -moz-binding: url("chrome://messenger/content/chat/imconversation.xml#conv-info-large") !important;
 }
 
 #IMSearchInput {