aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2007-12-21 02:25:50 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2007-12-21 02:25:50 (GMT)
commit54eda44f852e69d52e86133891be55abac479887 (patch)
tree4027c28d812bf6744ded9b399deb4980e2d243b6
parentaef3155784f11d2a7238f314049228e46080374e (diff)
downloadfluxbox-54eda44f852e69d52e86133891be55abac479887.zip
fluxbox-54eda44f852e69d52e86133891be55abac479887.tar.bz2
fix menuitem height on startup
-rw-r--r--src/FbTk/MenuTheme.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/FbTk/MenuTheme.cc b/src/FbTk/MenuTheme.cc
index 3502bb1..18e51aa 100644
--- a/src/FbTk/MenuTheme.cc
+++ b/src/FbTk/MenuTheme.cc
@@ -79,13 +79,6 @@ MenuTheme::MenuTheme(int screen_num):
79 m_real_title_height(*m_title_height), 79 m_real_title_height(*m_title_height),
80 m_real_item_height(*m_item_height) 80 m_real_item_height(*m_item_height)
81{ 81{
82 m_real_item_height = std::max(*m_item_height, frameFont().height() + 2*bevelWidth());
83 m_real_title_height = std::max(*m_title_height,
84 titleFont().height() + 2*bevelWidth());
85
86 m_real_item_height = m_real_item_height == 0 ? 1 : m_real_item_height;
87 m_real_title_height = m_real_title_height == 0 ? 1 : m_real_title_height;
88
89 // set default values 82 // set default values
90 *m_border_width = 0; 83 *m_border_width = 0;
91 *m_bevel_width = 0; 84 *m_bevel_width = 0;
@@ -93,6 +86,13 @@ MenuTheme::MenuTheme(int screen_num):
93 86
94 ThemeManager::instance().loadTheme(*this); 87 ThemeManager::instance().loadTheme(*this);
95 88
89 m_real_item_height = std::max(*m_item_height, frameFont().height() + 2*bevelWidth());
90 m_real_title_height = std::max(*m_title_height,
91 titleFont().height() + 2*bevelWidth());
92
93 m_real_item_height = m_real_item_height == 0 ? 1 : m_real_item_height;
94 m_real_title_height = m_real_title_height == 0 ? 1 : m_real_title_height;
95
96 t_text_gc.setForeground(*t_text); 96 t_text_gc.setForeground(*t_text);
97 f_text_gc.setForeground(*f_text); 97 f_text_gc.setForeground(*f_text);
98 u_text_gc.setForeground(*u_text); 98 u_text_gc.setForeground(*u_text);