diff mde/gui/widget/miscContent.d @ 131:9cff74f68b84

Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Moved Widget.AWidget to AChildWidget.AChildWidget and Widget.AParentWidget to AParentWidget.AParentWidget. Removed ASingleParentWidget to improve code sharing. AChildWidget doesn't implement IParentWidget like AWidget did. New IPopupParentWidget extending IParentWidget for the WM and some widgets to handle popups. Cut old popup management code. New underMouse() function replacing highlight(); called on all widgets. Separate menu-popup and button widgets aren't needed for menus now. Functions returning content widgets have been moved to their own module. Cleaned up jobs.txt. Switched to 80 line length for Ddoc.
author Diggory Hardy <diggory.hardy@gmail.com>
date Wed, 21 Jan 2009 13:01:40 +0000
parents c5c38eaadb64
children 9f035cd139c6
line wrap: on
line diff
--- a/mde/gui/widget/miscContent.d	Sat Jan 17 16:11:26 2009 +0000
+++ b/mde/gui/widget/miscContent.d	Wed Jan 21 13:01:40 2009 +0000
@@ -13,21 +13,16 @@
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
-/*************************************************************************************************
- * A function to return content widgets and some miscellaneous content display/editing widgets.
- *************************************************************************************************/
+/******************************************************************************
+ * Widgets using content not organised into other modules.
+ *****************************************************************************/
 module mde.gui.widget.miscContent;
 
-import mde.gui.widget.Widget;
+import mde.gui.widget.AParentWidget;
 import mde.gui.exception;
-import mde.gui.widget.TextWidget;
-import mde.gui.widget.layout;
-import mde.gui.widget.PopupMenu;
 
-import mde.gui.renderer.IRenderer;
 import mde.content.AStringContent;
 import mde.content.miscContent;
-import Items = mde.content.Items;
 
 debug {
     import tango.util.log.Log : Log, Logger;
@@ -37,42 +32,6 @@
     }
 }
 
-/*************************************************************************************************
- * A function which uses Items.get (data.strings[0]) to get a content and creates a widget from
- * data.ints[1]. The first item in each ints and strings is removed before passing data to the new
- * widget.
- * 
- * The function only takes an IContent parameter to satisfy createWidget; it's value is ignored.
- ************************************************************************************************/
-IChildWidget addContent (IWidgetManager mgr, IParentWidget parent, widgetID, WidgetData data, IContent) {
-    if (data.strings.length != 2) throw new WidgetDataException;
-    return mgr.makeWidget (parent, data.strings[1], Items.get (data.strings[0]));
-}
-
-/*************************************************************************************************
- * A function which returns the most appropriate content editing widget.
- *
- * Widgets which can be returned: BoolContentWidget (toggle button), ValueContentWidget (generic
- * text-box editor), DisplayContentWidget (generic text label).
- *************************************************************************************************/
-IChildWidget editContent (IWidgetManager mgr, IParentWidget parent, widgetID id, WidgetData data, IContent c) {
-    // Note: SAFE_RECURSION enabled
-    if (c is null) throw new ContentException;
-    if (cast(AStringContent) c) {
-        if (cast(EnumContent) c)	// can be PopupMenuWidget or ContentListWidget
-            return new ContentListWidget(mgr,parent,id,data,c);
-        if (cast(BoolContent) c)
-            return new BoolContentWidget(mgr,parent,id,data,c);
-        return new AStringContentWidget(mgr,parent,id,data,c);
-    }
-    if (cast(IContentList) c)
-        return new ContentListWidget(mgr,parent,id,data,c);
-    if (cast(EventContent) c)
-        return new ButtonContentWidget(mgr,parent,id,data,c);
-    // generic uneditable option
-    return new DisplayContentWidget(mgr,parent,id,data,c);
-}
-
 /// Editable boolean widget
 class BoolContentWidget : AButtonWidget
 {