M src/FbTk/Menu.cc → src/FbTk/Menu.cc

@@ -22,7 +22,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: Menu.cc,v 1.65 2004/06/13 10:58:34 fluxgen Exp $
+// $Id: Menu.cc,v 1.66 2004/06/13 12:01:52 fluxgen Exp $
 
 //use GNU extensions
 #ifndef	 _GNU_SOURCE
@@ -160,7 +160,7 @@ 0, 0, width(), theme().titleHeight(), // pos and size
                                 event_mask, // mask
                                 false, // override redirect
                                 true); // save under
-                                
+
     evm.add(*this, menu.title);
 
     event_mask |= PointerMotionMask;
@@ -171,6 +171,8 @@ event_mask,  // mask
                                 false,  // override redirect
                                 true); // save under
     evm.add(*this, menu.frame);
+
+    menu.title.raise();
 
 }
 
@@ -531,7 +533,7 @@ }
 
     menu.frame.moveResize(0, ((title_vis) ? menu.title.y() + menu.title.height() + 
                               menu.title.borderWidth()*2 : 0), 
-                          menu.window.width(), menu.frame_h);
+                          width(), menu.frame_h);
 
 
     if (m_need_update && (m_frame_pm.width() != menu.frame.width() ||

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.17 2004/06/13 10:59:54 fluxgen Exp $
+// $Id: MenuTheme.cc,v 1.18 2004/06/13 12:01:15 fluxgen Exp $
 
 #include "MenuTheme.hh"
 
@@ -70,6 +70,9 @@ m_delayclose(0), // no delay as default
     m_real_title_height(*m_title_height),
     m_real_item_height(*m_item_height)
 { 
+    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;
+
     // set default values
     *m_border_width = 0;
     *m_bevel_width = 0;
@@ -97,6 +100,9 @@ 
     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;
 
     m_bullet_pixmap->scale(itemHeight(), itemHeight());
     m_selected_pixmap->scale(itemHeight(), itemHeight());