aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk
diff options
context:
space:
mode:
authorrathnor <rathnor>2004-08-29 12:33:55 (GMT)
committerrathnor <rathnor>2004-08-29 12:33:55 (GMT)
commit92dc8d745214ac4f8c81bbad6d529a19fb4fe46c (patch)
tree723892acb509d69beec5b3fb875469fa321c778d /src/FbTk
parent4d01d1b748a99f1380a582874ab46e900fc7eca2 (diff)
downloadfluxbox-92dc8d745214ac4f8c81bbad6d529a19fb4fe46c.zip
fluxbox-92dc8d745214ac4f8c81bbad6d529a19fb4fe46c.tar.bz2
fix toolbar localtion (visible when 100%)
fix menu font size when no style
Diffstat (limited to 'src/FbTk')
-rw-r--r--src/FbTk/MenuTheme.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/FbTk/MenuTheme.cc b/src/FbTk/MenuTheme.cc
index 18861ab..4d04e17 100644
--- a/src/FbTk/MenuTheme.cc
+++ b/src/FbTk/MenuTheme.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: MenuTheme.cc,v 1.18 2004/06/13 12:01:15 fluxgen Exp $ 22// $Id: MenuTheme.cc,v 1.19 2004/08/29 12:33:55 rathnor Exp $
23 23
24#include "MenuTheme.hh" 24#include "MenuTheme.hh"
25 25
@@ -70,6 +70,10 @@ MenuTheme::MenuTheme(int screen_num):
70 m_real_title_height(*m_title_height), 70 m_real_title_height(*m_title_height),
71 m_real_item_height(*m_item_height) 71 m_real_item_height(*m_item_height)
72{ 72{
73 m_real_item_height = std::max(*m_item_height, frameFont().height() + 2*bevelWidth());
74 m_real_title_height = std::max(*m_title_height,
75 titleFont().height() + 2*bevelWidth());
76
73 m_real_item_height = m_real_item_height == 0 ? 1 : m_real_item_height; 77 m_real_item_height = m_real_item_height == 0 ? 1 : m_real_item_height;
74 m_real_title_height = m_real_title_height == 0 ? 1 : m_real_title_height; 78 m_real_title_height = m_real_title_height == 0 ? 1 : m_real_title_height;
75 79