diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Toolbar.cc | 7 |
1 files 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 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Toolbar.cc,v 1.116 2003/08/27 00:11:57 fluxgen Exp $ | 25 | // $Id: Toolbar.cc,v 1.117 2003/08/27 19:56:56 fluxgen Exp $ |
26 | 26 | ||
27 | #include "Toolbar.hh" | 27 | #include "Toolbar.hh" |
28 | 28 | ||
@@ -584,7 +584,10 @@ void Toolbar::setPlacement(Toolbar::Placement where) { | |||
584 | if (max_height < m_iconbar_theme.unfocusedText().font().height()) | 584 | if (max_height < m_iconbar_theme.unfocusedText().font().height()) |
585 | max_height = m_iconbar_theme.unfocusedText().font().height(); | 585 | max_height = m_iconbar_theme.unfocusedText().font().height(); |
586 | 586 | ||
587 | if (*m_rc_height != 0) | 587 | if (theme().height() > 0) |
588 | max_height = theme().height(); | ||
589 | |||
590 | if (*m_rc_height > 0 && *m_rc_height < 100) | ||
588 | max_height = *m_rc_height; | 591 | max_height = *m_rc_height; |
589 | 592 | ||
590 | frame.height = max_height; | 593 | frame.height = max_height; |