M src/FbTk/MenuTheme.cc → src/FbTk/MenuTheme.cc

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: MenuTheme.cc,v 1.16 2004/06/07 21:02:49 fluxgen Exp $
+// $Id: MenuTheme.cc,v 1.17 2004/06/13 10:59:54 fluxgen Exp $
 
 #include "MenuTheme.hh"
 
@@ -66,9 +66,10 @@ hilite_gc(RootWindow(m_display, screen_num)),
     m_alpha(255),
     m_menumode(DELAY_OPEN),
     m_delayopen(0), // no delay as default
-    m_delayclose(0) // no delay as default
+    m_delayclose(0), // no delay as default
+    m_real_title_height(*m_title_height),
+    m_real_item_height(*m_item_height)
 { 
-
     // set default values
     *m_border_width = 0;
     *m_bevel_width = 0;
@@ -93,11 +94,13 @@ *m_bevel_width = 20;
     if (*m_border_width > 20)
         *m_border_width = 20;
 
-    int item_height = std::max(itemHeight(), frameFont().height() + bevelWidth());
+    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_bullet_pixmap->scale(item_height, item_height);
-    m_selected_pixmap->scale(item_height, item_height);
-    m_unselected_pixmap->scale(item_height, item_height);
+    m_bullet_pixmap->scale(itemHeight(), itemHeight());
+    m_selected_pixmap->scale(itemHeight(), itemHeight());
+    m_unselected_pixmap->scale(itemHeight(), itemHeight());
 
     t_text_gc.setForeground(*t_text);
     f_text_gc.setForeground(*f_text);

M src/FbTk/MenuTheme.hh → src/FbTk/MenuTheme.hh

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: MenuTheme.hh,v 1.15 2004/06/13 00:33:06 fluxgen Exp $
+// $Id: MenuTheme.hh,v 1.16 2004/06/13 10:59:24 fluxgen Exp $
 
 #ifndef FBTK_MENUTHEME_HH
 #define FBTK_MENUTHEME_HH
@@ -102,8 +102,8 @@ ///@}
     inline BulletType bullet() const { return *m_bullet; }
     inline FbTk::Justify bulletPos() const { return *bullet_pos; }
 
-    inline unsigned int titleHeight() const { return *m_title_height; }
-    inline unsigned int itemHeight() const { return *m_item_height; }
+    inline unsigned int titleHeight() const { return m_real_title_height; }
+    inline unsigned int itemHeight() const { return m_real_item_height; }
     inline unsigned int borderWidth() const { return *m_border_width; }
     inline unsigned int bevelWidth() const { return *m_bevel_width; }
 
@@ -141,7 +141,8 @@ unsigned char m_alpha;
     MenuMode m_menumode;
     unsigned int m_delayopen; ///< in msec
     unsigned int m_delayclose; ///< in msec
-    
+    int m_real_title_height; ///< the calculated item height (from font and menu.titleHeight)
+    int m_real_item_height; ///< the calculated item height (from font and menu.itemHeight)
 };
 
 } // end namespace FbTk