diff mde/gui/widget/PopupMenu.d @ 141:6f69a9c111eb

Fix for using BoolContentWidget in a menu. Made popups' widths match their parents under certain conditions. Removed dummy testing menu items.
author Diggory Hardy <diggory.hardy@gmail.com>
date Sun, 08 Feb 2009 15:49:45 +0000
parents 3468e9bfded1
children
line wrap: on
line diff
--- a/mde/gui/widget/PopupMenu.d	Sun Feb 08 15:20:11 2009 +0000
+++ b/mde/gui/widget/PopupMenu.d	Sun Feb 08 15:49:45 2009 +0000
@@ -71,6 +71,8 @@
 	    if (!pushed) {
                 parentIPPW.addChildIPPW (this);
                 parentIPPW.menuActive = true;
+                if (popup.width != w && popup.minWidth <= w)
+                    popup.setWidth (w, -1);		// neatness
                 mgr.positionPopup (this, popup);
                 pushed = true;
             } else if (!parentIPPW.parentMenuActive) {	// if not a submenu
@@ -89,8 +91,13 @@
         if (state && !pushed && parentIPPW.menuActive) {
             parentIPPW.addChildIPPW (this);
             menuActive = true;
-            mgr.positionPopup (this, popup,
-                               parentIPPW.parentMenuActive ? 1 : 0);
+            if (parentIPPW.parentMenuActive)
+                mgr.positionPopup (this, popup, 1);
+            else {
+                if (popup.width != w && popup.minWidth <= w)
+                    popup.setWidth (w, -1);		// neatness
+                mgr.positionPopup (this, popup);
+            }
             pushed = true;
         }
     }