From 99c95b14356b31d737aa9624f15831df0c5384b0 Mon Sep 17 00:00:00 2001
From: fluxgen <fluxgen>
Date: Wed, 27 Aug 2003 19:56:56 +0000
Subject: added toolbar.height item

---
 src/Toolbar.cc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 1462532..ab78f09 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Toolbar.cc,v 1.116 2003/08/27 00:11:57 fluxgen Exp $
+// $Id: Toolbar.cc,v 1.117 2003/08/27 19:56:56 fluxgen Exp $
 
 #include "Toolbar.hh"
 
@@ -584,7 +584,10 @@ void Toolbar::setPlacement(Toolbar::Placement where) {
     if (max_height < m_iconbar_theme.unfocusedText().font().height())
         max_height = m_iconbar_theme.unfocusedText().font().height();
 
-    if (*m_rc_height != 0)
+    if (theme().height() > 0)
+        max_height = theme().height();
+
+    if (*m_rc_height > 0 && *m_rc_height < 100)
         max_height = *m_rc_height;
 
     frame.height = max_height;
-- 
cgit v0.11.2