From b30a5304ab7270c15cb8c6a7bb292bdea3230d1e Mon Sep 17 00:00:00 2001
From: Stuart Parmenter <stuart@mozilla.com>
Date: Fri, 7 Aug 2009 18:17:25 -0700
Subject: [PATCH] Fix right sidebar to not expand past its boundaries

---
 mobile/chrome/content/BrowserView.js | 2 +-
 mobile/chrome/content/browser.xul    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mobile/chrome/content/BrowserView.js b/mobile/chrome/content/BrowserView.js
index 5db950f38f3a..8d907155d0fc 100644
--- a/mobile/chrome/content/BrowserView.js
+++ b/mobile/chrome/content/BrowserView.js
@@ -510,7 +510,7 @@ BrowserView.prototype = {
   },
   // !!! --- RESIZE HACK END -------
 
-  handleMozAfterSizeChange: function handleMozAfterPaint(ev) {
+  handleMozAfterSizeChange: function handleMozAfterSizeChange(ev) {
     // !!! --- RESIZE HACK BEGIN -----
     // get the correct properties off of the event, these are wrong because
     // we're using a MouseEvent, as it has an X and Y prop of some sort and
diff --git a/mobile/chrome/content/browser.xul b/mobile/chrome/content/browser.xul
index 256878693db3..0788730a0853 100644
--- a/mobile/chrome/content/browser.xul
+++ b/mobile/chrome/content/browser.xul
@@ -244,7 +244,7 @@
       <vbox>
         <spacer class="sidebar-spacer"/>
 
-        <vbox id="browser-controls" class="panel-dark">
+        <vbox id="browser-controls" style="overflow: -moz-hidden-unscrollable;" class="panel-dark">
           <toolbarbutton id="tool-star" class="browser-control-button button-image" command="cmd_star"/>
           <toolbarbutton id="tool-back" class="browser-control-button button-image" command="cmd_back"/>
           <toolbarbutton id="tool-forward" class="browser-control-button button-image" command="cmd_forward"/>