fix toolbar localtion (visible when 100%)

fix menu font size when no style

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 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: MenuTheme.cc,v 1.18 2004/06/13 12:01:15 fluxgen Exp $
+// $Id: MenuTheme.cc,v 1.19 2004/08/29 12:33:55 rathnor Exp $
 
 #include "MenuTheme.hh"
 
@@ -70,6 +70,10 @@ MenuTheme::MenuTheme(int screen_num):
     m_real_title_height(*m_title_height),
     m_real_item_height(*m_item_height)
 { 
+    m_real_item_height = std::max(*m_item_height, frameFont().height() + 2*bevelWidth());
+    m_real_title_height = std::max(*m_title_height,
+                                   titleFont().height() + 2*bevelWidth());
+
     m_real_item_height = m_real_item_height == 0 ? 1 : m_real_item_height;
     m_real_title_height = m_real_title_height == 0 ? 1 : m_real_title_height;