projects/mde: mde/gui/WidgetManager.d annotate

annotate mde/gui/WidgetManager.d @ 165:bb2f1a76346d

Fixed a few bugs; most notably changing the translation reloads the text on PopupMenuWidgets now.

author	Diggory Hardy <diggory.hardy@gmail.com>
date	Sun, 07 Jun 2009 16:20:16 +0200
parents	24d77c52243f
children	55667d048c31

rev	line source
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	1 /* LICENSE BLOCK
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	2 Part of mde: a Modular D game-oriented Engine
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	3 Copyright © 2007-2008 Diggory Hardy
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	4
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	5 This program is free software: you can redistribute it and/or modify it under the terms
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	6 of the GNU General Public License as published by the Free Software Foundation, either
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	7 version 2 of the License, or (at your option) any later version.
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	8
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	9 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	10 without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	11 See the GNU General Public License for more details.
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	12
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	13 You should have received a copy of the GNU General Public License
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	14 along with this program. If not, see <http://www.gnu.org/licenses/>. */
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	15
131 9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	16 /******************************************************************************
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	17 * The gui manager class base.
75 25cb7420dc91 A massive overhaul/rewrite for the gui's data management and setup code. Currently much that was working is broken. Diggory Hardy <diggory.hardy@gmail.com> parents: 74 diff changeset	18 *
131 9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	19 * This contains most of the code required by a window manager, but does not
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	20 * interact with a screen or get user input. Rendering is handled separately by
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	21 * the renderer anyway.
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	22 *
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	23 * Public non IWidget* methods should be thread-safe.
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	24 *****************************************************************************/
75 25cb7420dc91 A massive overhaul/rewrite for the gui's data management and setup code. Currently much that was working is broken. Diggory Hardy <diggory.hardy@gmail.com> parents: 74 diff changeset	25 module mde.gui.WidgetManager;
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	26
80 ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 76 diff changeset	27 import mde.gui.WidgetDataSet;
34 6b4116e6355c Work on the Gui: some of the framework for drag & drop. Also made Window an IWidget. Diggory Hardy <diggory.hardy@gmail.com> parents: 32 diff changeset	28 import mde.gui.widget.Ifaces;
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	29
36 57d000574d75 Enabled drawing on demand, and made the polling interval configurable. Diggory Hardy <diggory.hardy@gmail.com> parents: 35 diff changeset	30 import imde = mde.imde;
128 41582439a42b Added support for dynamic EnumContent loading and saving, with translation loading. Diggory Hardy <diggory.hardy@gmail.com> parents: 126 diff changeset	31 import mde.content.Content;
129 ad91de8867a0 Added a widget size printing debug function. Fixed a bug in SwitchWidget. Diggory Hardy <diggory.hardy@gmail.com> parents: 128 diff changeset	32 debug import mde.content.miscContent; // Debug menu
128 41582439a42b Added support for dynamic EnumContent loading and saving, with translation loading. Diggory Hardy <diggory.hardy@gmail.com> parents: 126 diff changeset	33
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	34 // Widgets to create:
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	35 import mde.gui.widget.layout;
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	36 import mde.gui.widget.miscWidgets;
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	37 import mde.gui.widget.TextWidget;
131 9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	38 import mde.gui.widget.contentFunctions;
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	39 import mde.gui.widget.miscContent;
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	40 import mde.gui.widget.Floating;
143 2ac3e0012788 Added a simple Slider widget. Diggory Hardy <diggory.hardy@gmail.com> parents: 138 diff changeset	41 import mde.gui.widget.ParentContent;
36 57d000574d75 Enabled drawing on demand, and made the polling interval configurable. Diggory Hardy <diggory.hardy@gmail.com> parents: 35 diff changeset	42
159 b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	43 public import tango.core.sync.Mutex;
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	44 import tango.util.log.Log : Log, Logger;
113 9824bee909fd Popup menu; works for simple menus except that clicking an item doesn't close it. Diggory Hardy <diggory.hardy@gmail.com> parents: 112 diff changeset	45 import tango.util.container.SortedMap;
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	46
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	47 private Logger logger;
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	48 static this () {
75 25cb7420dc91 A massive overhaul/rewrite for the gui's data management and setup code. Currently much that was working is broken. Diggory Hardy <diggory.hardy@gmail.com> parents: 74 diff changeset	49 logger = Log.getLogger ("mde.gui.WidgetManager");
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	50 }
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	51
131 9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	52 /******************************************************************************
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	53 * Contains the code for loading and saving an entire gui (more than one may
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	54 * exist), but not the code for drawing it or handling user input.
159 b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	55 *
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	56 * Methods in this class are only intended for use within the gui package,
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	57 * either by widgets (the IXXXWidget methods implementing from an interface in
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	58 * widgets.Ifaces.d) or by a derived class (back-end methods doing widget
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	59 * work). None of these methods are intended to be thread-safe when called
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	60 * concurrently on the same WidgetManager instance, but they should be thread-
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	61 * safe for calling on separate instances.
108 c9fc2d303178 Added capability for border-less pop-up widgets. Simple pop-up menu. Diggory Hardy <diggory.hardy@gmail.com> parents: 105 diff changeset	62 *
c9fc2d303178 Added capability for border-less pop-up widgets. Simple pop-up menu. Diggory Hardy <diggory.hardy@gmail.com> parents: 105 diff changeset	63 * This abstract class exists solely for separating out some of the functionality.
131 9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	64 *****************************************************************************/
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	65 abstract scope class AWidgetManager : IWidgetManager
80 ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 76 diff changeset	66 {
159 b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	67 /** Construct a new widget manager.
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	68 *
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	69 * Params:
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	70 * name = The file name of the config for this GUI (to identify multiple GUIs). */
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	71 protected this (char[] name) {
137 9f035cd139c6 BIG commit. Major change: old Options class is gone, all content values are loaded and saved automatically. All options updated to reflect this, some changed. Diggory Hardy <diggory.hardy@gmail.com> parents: 134 diff changeset	72 auto p = "MiscOptions.l10n" in Content.allContent;
9f035cd139c6 BIG commit. Major change: old Options class is gone, all content values are loaded and saved automatically. All options updated to reflect this, some changed. Diggory Hardy <diggory.hardy@gmail.com> parents: 134 diff changeset	73 assert (p, "MiscOptions.l10n not created!");
9f035cd139c6 BIG commit. Major change: old Options class is gone, all content values are loaded and saved automatically. All options updated to reflect this, some changed. Diggory Hardy <diggory.hardy@gmail.com> parents: 134 diff changeset	74 p.addCallback (&reloadStrings);
9f035cd139c6 BIG commit. Major change: old Options class is gone, all content values are loaded and saved automatically. All options updated to reflect this, some changed. Diggory Hardy <diggory.hardy@gmail.com> parents: 134 diff changeset	75 debug { // add a debug-mode menu
159 b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	76 auto lWS = new EventContent ("menus.debug."~name~".logWidgetSize");
129 ad91de8867a0 Added a widget size printing debug function. Fixed a bug in SwitchWidget. Diggory Hardy <diggory.hardy@gmail.com> parents: 128 diff changeset	77 lWS.addCallback (&logWidgetSize);
ad91de8867a0 Added a widget size printing debug function. Fixed a bug in SwitchWidget. Diggory Hardy <diggory.hardy@gmail.com> parents: 128 diff changeset	78 }
80 ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 76 diff changeset	79 }
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 76 diff changeset	80
159 b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	81 public:
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	82 //BEGIN IParentWidget methods
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	83 // If call reaches the widget manager there isn't any recursion.
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	84 //NOTE: should be override
133 9fd705793568 Fixed menu popup bug, improved recursion detection. Diggory Hardy <diggory.hardy@gmail.com> parents: 132 diff changeset	85 final void recursionCheck (widgetID, IContent) {}
126 c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 125 diff changeset	86
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 125 diff changeset	87 override void minWChange (IChildWidget widget, wdim nmw) {
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 125 diff changeset	88 debug assert (widget is child, "WM.mSC (code error)");
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 125 diff changeset	89 mw = nmw;
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 125 diff changeset	90 if (w < nmw) {
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 125 diff changeset	91 child.setWidth (nmw, -1);
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 125 diff changeset	92 w = nmw;
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 125 diff changeset	93 }
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 125 diff changeset	94 child.setPosition (0,0);
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 125 diff changeset	95 requestRedraw;
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 125 diff changeset	96 }
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 125 diff changeset	97 override void minHChange (IChildWidget widget, wdim nmh) {
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 125 diff changeset	98 debug assert (widget is child, "WM.mSC (code error)");
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 125 diff changeset	99 mh = nmh;
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 125 diff changeset	100 if (h < nmh) {
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 125 diff changeset	101 child.setHeight (nmh, -1);
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 125 diff changeset	102 h = nmh;
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 125 diff changeset	103 }
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 125 diff changeset	104 child.setPosition (0,0);
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 125 diff changeset	105 requestRedraw;
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 125 diff changeset	106 }
162 2476790223b8 First drag and drop support: can drag from AStringContentWidget to any content editable. No visual feedback while dragging. Diggory Hardy <diggory.hardy@gmail.com> parents: 160 diff changeset	107
2476790223b8 First drag and drop support: can drag from AStringContentWidget to any content editable. No visual feedback while dragging. Diggory Hardy <diggory.hardy@gmail.com> parents: 160 diff changeset	108 override bool dropContent (IContent content) {
2476790223b8 First drag and drop support: can drag from AStringContentWidget to any content editable. No visual feedback while dragging. Diggory Hardy <diggory.hardy@gmail.com> parents: 160 diff changeset	109 return false;
2476790223b8 First drag and drop support: can drag from AStringContentWidget to any content editable. No visual feedback while dragging. Diggory Hardy <diggory.hardy@gmail.com> parents: 160 diff changeset	110 }
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	111 //END IParentWidget methods
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	112
131 9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	113 //BEGIN IPopupParentWidget methods
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	114 override IPopupParentWidget getParentIPPW () {
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	115 return this;
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	116 }
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	117
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	118 override void addChildIPPW (IPopupParentWidget ippw) {
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	119 if (childIPPW)
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	120 childIPPW.removedIPPW;
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	121 childIPPW = ippw;
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	122 requestRedraw;
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	123 }
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	124 override bool removeChildIPPW (IPopupParentWidget ippw) {
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	125 if (childIPPW !is ippw) return false;
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	126 childIPPW.removedIPPW;
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	127 childIPPW = null;
152 c67d074a7111 Menu placement now takes into account left/right placement of parent menus. Diggory Hardy <diggory.hardy@gmail.com> parents: 147 diff changeset	128 mAIPPW = MenuPosition.INACTIVE;
131 9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	129 requestRedraw;
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	130 return false;
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	131 }
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	132
152 c67d074a7111 Menu placement now takes into account left/right placement of parent menus. Diggory Hardy <diggory.hardy@gmail.com> parents: 147 diff changeset	133 override void menuActive (MenuPosition mA) {
131 9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	134 mAIPPW = mA;
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	135 if (childIPPW)
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	136 childIPPW.menuActive = mA;
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	137 }
152 c67d074a7111 Menu placement now takes into account left/right placement of parent menus. Diggory Hardy <diggory.hardy@gmail.com> parents: 147 diff changeset	138 override MenuPosition menuActive () {
131 9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	139 return mAIPPW;
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	140 }
152 c67d074a7111 Menu placement now takes into account left/right placement of parent menus. Diggory Hardy <diggory.hardy@gmail.com> parents: 147 diff changeset	141 override MenuPosition parentMenuActive () {
c67d074a7111 Menu placement now takes into account left/right placement of parent menus. Diggory Hardy <diggory.hardy@gmail.com> parents: 147 diff changeset	142 return MenuPosition.INACTIVE;
133 9fd705793568 Fixed menu popup bug, improved recursion detection. Diggory Hardy <diggory.hardy@gmail.com> parents: 132 diff changeset	143 }
131 9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	144
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	145 // Don't do anything. E.g. can get called by non-popup buttons.
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	146 override void menuDone () {}
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	147
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	148 override IChildWidget getPopupWidget (wdabs cx, wdabs cy, bool closePopup) {
146 783969f4665c Simple, inefficient context menus (displaying content description). Diggory Hardy <diggory.hardy@gmail.com> parents: 144 diff changeset	149 if (popupContext) {
783969f4665c Simple, inefficient context menus (displaying content description). Diggory Hardy <diggory.hardy@gmail.com> parents: 144 diff changeset	150 if (popupContext.onSelf (cx, cy))
783969f4665c Simple, inefficient context menus (displaying content description). Diggory Hardy <diggory.hardy@gmail.com> parents: 144 diff changeset	151 return popupContext;
783969f4665c Simple, inefficient context menus (displaying content description). Diggory Hardy <diggory.hardy@gmail.com> parents: 144 diff changeset	152 if (closePopup) {
152 c67d074a7111 Menu placement now takes into account left/right placement of parent menus. Diggory Hardy <diggory.hardy@gmail.com> parents: 147 diff changeset	153 if (childIPPW is null)
c67d074a7111 Menu placement now takes into account left/right placement of parent menus. Diggory Hardy <diggory.hardy@gmail.com> parents: 147 diff changeset	154 menuActive = MenuPosition.INACTIVE;
146 783969f4665c Simple, inefficient context menus (displaying content description). Diggory Hardy <diggory.hardy@gmail.com> parents: 144 diff changeset	155 popupContext = null;
783969f4665c Simple, inefficient context menus (displaying content description). Diggory Hardy <diggory.hardy@gmail.com> parents: 144 diff changeset	156 requestRedraw;
783969f4665c Simple, inefficient context menus (displaying content description). Diggory Hardy <diggory.hardy@gmail.com> parents: 144 diff changeset	157 }
783969f4665c Simple, inefficient context menus (displaying content description). Diggory Hardy <diggory.hardy@gmail.com> parents: 144 diff changeset	158 }
131 9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	159 if (childIPPW) {
146 783969f4665c Simple, inefficient context menus (displaying content description). Diggory Hardy <diggory.hardy@gmail.com> parents: 144 diff changeset	160 IChildWidget ret =
783969f4665c Simple, inefficient context menus (displaying content description). Diggory Hardy <diggory.hardy@gmail.com> parents: 144 diff changeset	161 childIPPW.getPopupWidget (cx, cy, closePopup);
783969f4665c Simple, inefficient context menus (displaying content description). Diggory Hardy <diggory.hardy@gmail.com> parents: 144 diff changeset	162 if (ret) return ret;
783969f4665c Simple, inefficient context menus (displaying content description). Diggory Hardy <diggory.hardy@gmail.com> parents: 144 diff changeset	163 if (closePopup) {
152 c67d074a7111 Menu placement now takes into account left/right placement of parent menus. Diggory Hardy <diggory.hardy@gmail.com> parents: 147 diff changeset	164 menuActive = MenuPosition.INACTIVE;
131 9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	165 removeChildIPPW (childIPPW);
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	166 }
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	167 }
146 783969f4665c Simple, inefficient context menus (displaying content description). Diggory Hardy <diggory.hardy@gmail.com> parents: 144 diff changeset	168 return null;
783969f4665c Simple, inefficient context menus (displaying content description). Diggory Hardy <diggory.hardy@gmail.com> parents: 144 diff changeset	169 }
783969f4665c Simple, inefficient context menus (displaying content description). Diggory Hardy <diggory.hardy@gmail.com> parents: 144 diff changeset	170
783969f4665c Simple, inefficient context menus (displaying content description). Diggory Hardy <diggory.hardy@gmail.com> parents: 144 diff changeset	171 override void drawPopup () {
783969f4665c Simple, inefficient context menus (displaying content description). Diggory Hardy <diggory.hardy@gmail.com> parents: 144 diff changeset	172 if (popupContext)
783969f4665c Simple, inefficient context menus (displaying content description). Diggory Hardy <diggory.hardy@gmail.com> parents: 144 diff changeset	173 popupContext.draw();
131 9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	174 }
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	175
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	176 debug protected override bool isChild (IPopupParentWidget ippw) {
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	177 return ippw is childIPPW;
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	178 }
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	179
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	180 override void removedIPPW () {} // irrelevant
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	181 //END IPopupParentWidget methods
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	182
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	183 //BEGIN IWidgetManager methods
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	184 override IChildWidget makeWidget (IParentWidget parent, widgetID id, IContent content = null)
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	185 {
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	186 debug assert (parent, "makeWidget: parent is null (code error)");
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	187 debug scope (failure)
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	188 logger.warn ("Creating widget \""~id~"\" failed.");
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	189
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	190 WidgetData data = curData[id];
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	191 if (data.ints.length < 1) {
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	192 logger.error ("No int data; creating a debug widget");
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	193 data.ints = [WIDGET_TYPE.Debug];
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	194 }
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	195 int type = data.ints[0]; // type is first element of data
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	196
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	197 try {
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	198 // Statically programmed binary search on type, returning a new widget or calling a
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	199 // function:
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	200 //pragma (msg, binarySearch ("type", WIDGETS));
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	201 mixin (binarySearch ("type", WIDGETS));
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	202 // Not returned a new widget:
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	203 logger.error ("Bad widget type: {}; creating a debug widget instead",type);
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	204 } catch (Exception e) {
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	205 logger.error ("Error creating widget: {}; creating a debug widget instead.", e.msg);
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	206 }
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	207
137 9f035cd139c6 BIG commit. Major change: old Options class is gone, all content values are loaded and saved automatically. All options updated to reflect this, some changed. Diggory Hardy <diggory.hardy@gmail.com> parents: 134 diff changeset	208 return new DebugWidget (this, this, id, data, content);
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	209 }
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	210
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	211 override WidgetData widgetData (widgetID id) {
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	212 return curData[id];
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	213 }
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	214 override void widgetData (widgetID id, WidgetData d) {
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	215 changes[id] = d; // also updates WidgetDataSet in data.
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	216 }
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	217
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	218 override wdims dimData (widgetID id) {
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	219 return curData.dims (id);
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	220 }
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	221 override void dimData (widgetID id, wdims d) {
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	222 changes.setDims(id, d); // also updates WidgetDataSet in data.
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	223 }
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	224
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	225 IRenderer renderer () {
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	226 assert (rend !is null, "WidgetManager.renderer: rend is null");
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	227 return rend;
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	228 }
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	229
152 c67d074a7111 Menu placement now takes into account left/right placement of parent menus. Diggory Hardy <diggory.hardy@gmail.com> parents: 147 diff changeset	230 MenuPosition positionPopup (IChildWidget parent, IChildWidget popup, MenuPosition position = MenuPosition.INACTIVE) {
131 9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	231 debug assert (parent && popup, "positionPopup: null widget");
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	232 wdim w = popup.width,
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	233 h = popup.height,
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	234 x, y;
152 c67d074a7111 Menu placement now takes into account left/right placement of parent menus. Diggory Hardy <diggory.hardy@gmail.com> parents: 147 diff changeset	235 if (position & MenuPosition.ACTIVE) {
c67d074a7111 Menu placement now takes into account left/right placement of parent menus. Diggory Hardy <diggory.hardy@gmail.com> parents: 147 diff changeset	236 y = parent.yPos; // height flush with top
146 783969f4665c Simple, inefficient context menus (displaying content description). Diggory Hardy <diggory.hardy@gmail.com> parents: 144 diff changeset	237 if (y+h > this.h) y += parent.height - h; // or bottom
152 c67d074a7111 Menu placement now takes into account left/right placement of parent menus. Diggory Hardy <diggory.hardy@gmail.com> parents: 147 diff changeset	238 if (position & MenuPosition.LEFT) { // previously left
c67d074a7111 Menu placement now takes into account left/right placement of parent menus. Diggory Hardy <diggory.hardy@gmail.com> parents: 147 diff changeset	239 x = parent.xPos - w; // on left
c67d074a7111 Menu placement now takes into account left/right placement of parent menus. Diggory Hardy <diggory.hardy@gmail.com> parents: 147 diff changeset	240 if (x < 0) {
c67d074a7111 Menu placement now takes into account left/right placement of parent menus. Diggory Hardy <diggory.hardy@gmail.com> parents: 147 diff changeset	241 x = parent.xPos + parent.width; // on right
c67d074a7111 Menu placement now takes into account left/right placement of parent menus. Diggory Hardy <diggory.hardy@gmail.com> parents: 147 diff changeset	242 position = MenuPosition.RIGHT;
c67d074a7111 Menu placement now takes into account left/right placement of parent menus. Diggory Hardy <diggory.hardy@gmail.com> parents: 147 diff changeset	243 }
c67d074a7111 Menu placement now takes into account left/right placement of parent menus. Diggory Hardy <diggory.hardy@gmail.com> parents: 147 diff changeset	244 } else { // previously right or above/below
c67d074a7111 Menu placement now takes into account left/right placement of parent menus. Diggory Hardy <diggory.hardy@gmail.com> parents: 147 diff changeset	245 x = parent.xPos + parent.width; // on right
c67d074a7111 Menu placement now takes into account left/right placement of parent menus. Diggory Hardy <diggory.hardy@gmail.com> parents: 147 diff changeset	246 position = MenuPosition.RIGHT;
c67d074a7111 Menu placement now takes into account left/right placement of parent menus. Diggory Hardy <diggory.hardy@gmail.com> parents: 147 diff changeset	247 if (x+w > this.w) {
c67d074a7111 Menu placement now takes into account left/right placement of parent menus. Diggory Hardy <diggory.hardy@gmail.com> parents: 147 diff changeset	248 x = parent.xPos - w; // or left
c67d074a7111 Menu placement now takes into account left/right placement of parent menus. Diggory Hardy <diggory.hardy@gmail.com> parents: 147 diff changeset	249 position = MenuPosition.LEFT;
c67d074a7111 Menu placement now takes into account left/right placement of parent menus. Diggory Hardy <diggory.hardy@gmail.com> parents: 147 diff changeset	250 }
c67d074a7111 Menu placement now takes into account left/right placement of parent menus. Diggory Hardy <diggory.hardy@gmail.com> parents: 147 diff changeset	251 }
131 9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	252 } else {
152 c67d074a7111 Menu placement now takes into account left/right placement of parent menus. Diggory Hardy <diggory.hardy@gmail.com> parents: 147 diff changeset	253 wdim pw = parent.width;
165 bb2f1a76346d Fixed a few bugs; most notably changing the translation reloads the text on PopupMenuWidgets now. Diggory Hardy <diggory.hardy@gmail.com> parents: 163 diff changeset	254 if (popup.minWidth <= pw)
152 c67d074a7111 Menu placement now takes into account left/right placement of parent menus. Diggory Hardy <diggory.hardy@gmail.com> parents: 147 diff changeset	255 popup.setWidth (pw, -1); // neatness
c67d074a7111 Menu placement now takes into account left/right placement of parent menus. Diggory Hardy <diggory.hardy@gmail.com> parents: 147 diff changeset	256 x = parent.xPos; // align on left edge
c67d074a7111 Menu placement now takes into account left/right placement of parent menus. Diggory Hardy <diggory.hardy@gmail.com> parents: 147 diff changeset	257 if (x+w > this.w) x += pw - w; // align on right edge
131 9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	258 y = parent.yPos + parent.height; // place below
146 783969f4665c Simple, inefficient context menus (displaying content description). Diggory Hardy <diggory.hardy@gmail.com> parents: 144 diff changeset	259 if (y+h > this.h) y = parent.yPos - h; // or above
152 c67d074a7111 Menu placement now takes into account left/right placement of parent menus. Diggory Hardy <diggory.hardy@gmail.com> parents: 147 diff changeset	260 position = MenuPosition.ACTIVE;
131 9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	261 }
146 783969f4665c Simple, inefficient context menus (displaying content description). Diggory Hardy <diggory.hardy@gmail.com> parents: 144 diff changeset	262 if (x < 0) x = 0; // may be placed partially off-screen
783969f4665c Simple, inefficient context menus (displaying content description). Diggory Hardy <diggory.hardy@gmail.com> parents: 144 diff changeset	263 if (y < 0) y = 0;
131 9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	264 popup.setPosition (x, y);
146 783969f4665c Simple, inefficient context menus (displaying content description). Diggory Hardy <diggory.hardy@gmail.com> parents: 144 diff changeset	265 //debug logger.trace ("placed popup at {},{}; size: {},{}", x,y, w,h);
152 c67d074a7111 Menu placement now takes into account left/right placement of parent menus. Diggory Hardy <diggory.hardy@gmail.com> parents: 147 diff changeset	266 return position;
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	267 }
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	268
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	269 void requestRedraw () {
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	270 imde.mainSchedule.request(imde.SCHEDULE.DRAW);
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	271 }
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	272 //END IWidgetManager methods
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	273
129 ad91de8867a0 Added a widget size printing debug function. Fixed a bug in SwitchWidget. Diggory Hardy <diggory.hardy@gmail.com> parents: 128 diff changeset	274 debug void logWidgetSize (Content) {
131 9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	275 logger.trace ("size: {,4},{,4}; minimal: {,4},{,4} - WidgetManager", w,h, mw,mh);
129 ad91de8867a0 Added a widget size printing debug function. Fixed a bug in SwitchWidget. Diggory Hardy <diggory.hardy@gmail.com> parents: 128 diff changeset	276 child.logWidgetSize;
ad91de8867a0 Added a widget size printing debug function. Fixed a bug in SwitchWidget. Diggory Hardy <diggory.hardy@gmail.com> parents: 128 diff changeset	277 }
ad91de8867a0 Added a widget size printing debug function. Fixed a bug in SwitchWidget. Diggory Hardy <diggory.hardy@gmail.com> parents: 128 diff changeset	278
110 6acd96f8685f Translation reloading as far as AContent name/desc supported. Limited & crude support for updating gui. Diggory Hardy <diggory.hardy@gmail.com> parents: 108 diff changeset	279 protected:
159 b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	280 // These methods are called by derived classes to do the widget-management work
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	281 //BEGIN WidgetManagement methods
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	282 /** Draw all widgets */
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	283 void wmDrawWidgets() {
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	284 if (child)
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	285 child.draw;
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	286 if (childIPPW)
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	287 childIPPW.drawPopup;
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	288 drawPopup;
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	289 }
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	290
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	291 /** For mouse click events.
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	292 *
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	293 * Sends the event on to the relevant windows and all click callbacks. */
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	294 void wmMouseClick (wdabs cx, wdabs cy, ubyte b, bool state) {
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	295 if (child is null) return;
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	296
160 ccd01fde535e Replaced WidgetManager's click and motion callbacks with a drag event system. Diggory Hardy <diggory.hardy@gmail.com> parents: 159 diff changeset	297 // Update underMouse to get the widget clicked on
ccd01fde535e Replaced WidgetManager's click and motion callbacks with a drag event system. Diggory Hardy <diggory.hardy@gmail.com> parents: 159 diff changeset	298 updateUnderMouse (cx, cy, state);
ccd01fde535e Replaced WidgetManager's click and motion callbacks with a drag event system. Diggory Hardy <diggory.hardy@gmail.com> parents: 159 diff changeset	299
ccd01fde535e Replaced WidgetManager's click and motion callbacks with a drag event system. Diggory Hardy <diggory.hardy@gmail.com> parents: 159 diff changeset	300 // end of a drag?
163 24d77c52243f Provided sensible conversions for setting the value of one AStringContent from another, along with unittest. Diggory Hardy <diggory.hardy@gmail.com> parents: 162 diff changeset	301 if (dragStart !is null && b == dragButton && state == false) {
160 ccd01fde535e Replaced WidgetManager's click and motion callbacks with a drag event system. Diggory Hardy <diggory.hardy@gmail.com> parents: 159 diff changeset	302 if (dragStart.dragRelease (cx, cy, underMouse)) {
ccd01fde535e Replaced WidgetManager's click and motion callbacks with a drag event system. Diggory Hardy <diggory.hardy@gmail.com> parents: 159 diff changeset	303 dragStart = null;
ccd01fde535e Replaced WidgetManager's click and motion callbacks with a drag event system. Diggory Hardy <diggory.hardy@gmail.com> parents: 159 diff changeset	304 return;
ccd01fde535e Replaced WidgetManager's click and motion callbacks with a drag event system. Diggory Hardy <diggory.hardy@gmail.com> parents: 159 diff changeset	305 }
ccd01fde535e Replaced WidgetManager's click and motion callbacks with a drag event system. Diggory Hardy <diggory.hardy@gmail.com> parents: 159 diff changeset	306 dragStart = null;
ccd01fde535e Replaced WidgetManager's click and motion callbacks with a drag event system. Diggory Hardy <diggory.hardy@gmail.com> parents: 159 diff changeset	307 }
159 b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	308
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	309 // Disable keyboard input if on another widget:
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	310 if (keyFocus && keyFocus !is underMouse) {
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	311 keyFocus.keyFocusLost;
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	312 keyFocus = null;
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	313 setLetterCallback (null);
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	314 }
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	315
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	316 // Finally, post the actual event:
163 24d77c52243f Provided sensible conversions for setting the value of one AStringContent from another, along with unittest. Diggory Hardy <diggory.hardy@gmail.com> parents: 162 diff changeset	317 if (b == 3 && !state) { // right click - open context menu
159 b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	318 IContent contextContent = underMouse.content;
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	319 if (contextContent is null) return;
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	320 // NOTE: Creates new widgets every time; not optimal
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	321 popupContext = makeWidget (this, "context", contextContent);
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	322 popupContext.setup (0, 3);
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	323 positionPopup (underMouse, popupContext);
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	324 requestRedraw;
160 ccd01fde535e Replaced WidgetManager's click and motion callbacks with a drag event system. Diggory Hardy <diggory.hardy@gmail.com> parents: 159 diff changeset	325 } else { // post other button presses to clickEvent
ccd01fde535e Replaced WidgetManager's click and motion callbacks with a drag event system. Diggory Hardy <diggory.hardy@gmail.com> parents: 159 diff changeset	326 int ret = underMouse.clickEvent (cast(wdabs)cx,cast(wdabs)cy,b,state);
ccd01fde535e Replaced WidgetManager's click and motion callbacks with a drag event system. Diggory Hardy <diggory.hardy@gmail.com> parents: 159 diff changeset	327 if (ret & 1) { // keyboard input requested
159 b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	328 keyFocus = underMouse;
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	329 setLetterCallback (&underMouse.keyEvent);
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	330 }
163 24d77c52243f Provided sensible conversions for setting the value of one AStringContent from another, along with unittest. Diggory Hardy <diggory.hardy@gmail.com> parents: 162 diff changeset	331 if (ret & 2 && dragStart is null) { // drag events requested
160 ccd01fde535e Replaced WidgetManager's click and motion callbacks with a drag event system. Diggory Hardy <diggory.hardy@gmail.com> parents: 159 diff changeset	332 dragStart = underMouse;
163 24d77c52243f Provided sensible conversions for setting the value of one AStringContent from another, along with unittest. Diggory Hardy <diggory.hardy@gmail.com> parents: 162 diff changeset	333 dragButton = b; // currently we allow any button to be used for a drag, but.. ?
24d77c52243f Provided sensible conversions for setting the value of one AStringContent from another, along with unittest. Diggory Hardy <diggory.hardy@gmail.com> parents: 162 diff changeset	334 }
160 ccd01fde535e Replaced WidgetManager's click and motion callbacks with a drag event system. Diggory Hardy <diggory.hardy@gmail.com> parents: 159 diff changeset	335 }
159 b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	336 }
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	337
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	338 /** For mouse motion events.
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	339 *
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	340 * Lock on mutex before calling. Pass new mouse coordinates. */
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	341 void wmMouseMotion (wdabs cx, wdabs cy) {
160 ccd01fde535e Replaced WidgetManager's click and motion callbacks with a drag event system. Diggory Hardy <diggory.hardy@gmail.com> parents: 159 diff changeset	342 updateUnderMouse (cx, cy, false);
159 b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	343
160 ccd01fde535e Replaced WidgetManager's click and motion callbacks with a drag event system. Diggory Hardy <diggory.hardy@gmail.com> parents: 159 diff changeset	344 if (dragStart !is null)
ccd01fde535e Replaced WidgetManager's click and motion callbacks with a drag event system. Diggory Hardy <diggory.hardy@gmail.com> parents: 159 diff changeset	345 dragStart.dragMotion (cx, cy, underMouse);
159 b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	346 }
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	347
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	348
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	349 /** A change callback on MiscOptions.l10n content to update widgets.
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	350 *
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	351 * Relies on another callback reloading translations to content first! */
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	352 void reloadStrings (Content) {
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	353 synchronized(mutex) {
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	354 if (child is null) return;
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	355 child.setup (++setupN, 2);
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	356 child.setWidth (w, -1);
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	357 child.setHeight (h, -1);
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	358 child.setPosition (0,0);
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	359 requestRedraw;
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	360 }
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	361 }
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	362 // for internal use
131 9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	363 void updateUnderMouse (wdabs cx, wdabs cy, bool closePopup) {
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	364 auto oUM = underMouse;
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	365 underMouse = getPopupWidget (cx, cy, closePopup);
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	366 if (underMouse is null) {
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	367 debug assert (child.onSelf (cx, cy), "WidgetManager: child doesn't cover whole area");
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	368 underMouse = child.getWidget (cx, cy);
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	369 }
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	370 if (underMouse !is oUM) {
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	371 debug assert (oUM && underMouse, "no widget under mouse: error");
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	372 oUM.underMouse (false);
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	373 underMouse.underMouse (true);
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	374 }
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	375 }
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	376
159 b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	377 /// This should be overloaded to set a callback receiving keyboard input.
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	378 abstract void setLetterCallback(void delegate(ushort, char[]));
b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	379 //END WidgetManagement methods
99 5de5810e3516 Implemented an editable TextContent widget; it's now possible to edit text options using the GUI. Diggory Hardy <diggory.hardy@gmail.com> parents: 97 diff changeset	380
110 6acd96f8685f Translation reloading as far as AContent name/desc supported. Limited & crude support for updating gui. Diggory Hardy <diggory.hardy@gmail.com> parents: 108 diff changeset	381 public:
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	382 //BEGIN makeWidget metacode
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	383 private static {
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	384 /// Widget types. Items match widget names without the "Widget" suffix.
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	385 enum WIDGET_TYPE : int {
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	386 FUNCTION = 0x2000, // Function called instead of widget created (no "Widget" appended to fct name)
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	387 TAKES_CONTENT = 0x4000, // Flag indicates widget's this should be passed an IContent reference.
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	388
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	389 // Use widget names rather than usual capitals convention
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	390 Unnamed = 0x0, // Only for use by widgets not created with createWidget
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	391
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	392 // blank: 0x1
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	393 FixedBlank = 0x1,
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	394 SizableBlank = 0x2,
137 9f035cd139c6 BIG commit. Major change: old Options class is gone, all content values are loaded and saved automatically. All options updated to reflect this, some changed. Diggory Hardy <diggory.hardy@gmail.com> parents: 134 diff changeset	395 Debug = TAKES_CONTENT \| 0xF,
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	396
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	397 // popup widgets: 0x10
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	398 PopupMenu = TAKES_CONTENT \| 0x11,
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	399
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	400 // labels: 0x20
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	401 TextLabel = 0x21,
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	402
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	403 // content functions: 0x30
133 9fd705793568 Fixed menu popup bug, improved recursion detection. Diggory Hardy <diggory.hardy@gmail.com> parents: 132 diff changeset	404 editContent = FUNCTION \| TAKES_CONTENT \| 0x30,
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	405 addContent = FUNCTION \| 0x31,
132 264028f4115a Cleaned up mde.imde and a couple of widget functions. Diggory Hardy <diggory.hardy@gmail.com> parents: 131 diff changeset	406 popupListContent = FUNCTION \| TAKES_CONTENT \| 0x33,
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	407
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	408 // content widgets: 0x40
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	409 DisplayContent = TAKES_CONTENT \| 0x40,
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	410 BoolContent = TAKES_CONTENT \| 0x41,
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	411 AStringContent = TAKES_CONTENT \| 0x42,
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	412 ButtonContent = TAKES_CONTENT \| 0x43,
143 2ac3e0012788 Added a simple Slider widget. Diggory Hardy <diggory.hardy@gmail.com> parents: 138 diff changeset	413 SliderContent = TAKES_CONTENT \| 0x44,
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	414
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	415 GridLayout = TAKES_CONTENT \| 0x100,
133 9fd705793568 Fixed menu popup bug, improved recursion detection. Diggory Hardy <diggory.hardy@gmail.com> parents: 132 diff changeset	416 ContentList = TAKES_CONTENT \| 0x110,
108 c9fc2d303178 Added capability for border-less pop-up widgets. Simple pop-up menu. Diggory Hardy <diggory.hardy@gmail.com> parents: 105 diff changeset	417
123 d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	418 FloatingArea = TAKES_CONTENT \| 0x200,
147 075705ad664a Added a border widget. Diggory Hardy <diggory.hardy@gmail.com> parents: 146 diff changeset	419 Border = TAKES_CONTENT \| 0x204,
125 3e648bc53bde Added a simple switch/tab widget (depends on existing EnumContent). Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	420 Switch = TAKES_CONTENT \| 0x210,
144 66c58e5b0062 Added a BoolContent-based collapsible widget. Diggory Hardy <diggory.hardy@gmail.com> parents: 143 diff changeset	421 Collapsible = TAKES_CONTENT \| 0x214,
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	422 }
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	423
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	424 // Only used for binarySearch algorithm generation; must be ordered by numerical values.
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	425 const char[][] WIDGETS = [
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	426 "FixedBlank",
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	427 "SizableBlank",
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	428 "TextLabel",
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	429 "addContent",
137 9f035cd139c6 BIG commit. Major change: old Options class is gone, all content values are loaded and saved automatically. All options updated to reflect this, some changed. Diggory Hardy <diggory.hardy@gmail.com> parents: 134 diff changeset	430 "Debug",
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	431 "PopupMenu",
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	432 "DisplayContent",
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	433 "BoolContent",
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	434 "AStringContent",
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	435 "ButtonContent",
143 2ac3e0012788 Added a simple Slider widget. Diggory Hardy <diggory.hardy@gmail.com> parents: 138 diff changeset	436 "SliderContent",
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	437 "GridLayout",
133 9fd705793568 Fixed menu popup bug, improved recursion detection. Diggory Hardy <diggory.hardy@gmail.com> parents: 132 diff changeset	438 "ContentList",
123 d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	439 "FloatingArea",
147 075705ad664a Added a border widget. Diggory Hardy <diggory.hardy@gmail.com> parents: 146 diff changeset	440 "Border",
125 3e648bc53bde Added a simple switch/tab widget (depends on existing EnumContent). Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	441 "Switch",
144 66c58e5b0062 Added a BoolContent-based collapsible widget. Diggory Hardy <diggory.hardy@gmail.com> parents: 143 diff changeset	442 "Collapsible",
133 9fd705793568 Fixed menu popup bug, improved recursion detection. Diggory Hardy <diggory.hardy@gmail.com> parents: 132 diff changeset	443 "editContent",
9fd705793568 Fixed menu popup bug, improved recursion detection. Diggory Hardy <diggory.hardy@gmail.com> parents: 132 diff changeset	444 "popupListContent"];
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	445
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	446 /* Generates a binary search algorithm for makeWidget. */
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	447 char[] binarySearch (char[] var, char[][] consts) {
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	448 if (consts.length > 3) {
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	449 return `if (`~var~` <= WIDGET_TYPE.`~consts[$/2 - 1]~`) {` ~
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	450 binarySearch (var, consts[0 .. $/2]) ~
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	451 `} else {` ~
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	452 binarySearch (var, consts[$/2 .. $]) ~
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	453 `}`;
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	454 } else {
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	455 char[] ret;
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	456 foreach (c; consts) {
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	457 ret ~= `if (` ~ var ~ ` == WIDGET_TYPE.` ~ c ~ `) {
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	458 debug (mdeWidgets) logger.trace ("Creating new `~c~`.");
133 9fd705793568 Fixed menu popup bug, improved recursion detection. Diggory Hardy <diggory.hardy@gmail.com> parents: 132 diff changeset	459 parent.recursionCheck (id, content);
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	460 static if (WIDGET_TYPE.`~c~` & WIDGET_TYPE.FUNCTION)
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	461 return `~c~` (this, parent, id, data, content);
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	462 else static if (WIDGET_TYPE.`~c~` & WIDGET_TYPE.TAKES_CONTENT)
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	463 return new `~c~`Widget (this, parent, id, data, content);
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	464 else
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	465 return new `~c~`Widget (this, parent, id, data);
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	466 } else `;
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	467 }
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	468 ret = ret[0..$-6]; // remove last else
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	469 return ret;
108 c9fc2d303178 Added capability for border-less pop-up widgets. Simple pop-up menu. Diggory Hardy <diggory.hardy@gmail.com> parents: 105 diff changeset	470 }
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	471 }
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	472
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	473 debug { // check items in WIDGETS are listed in order
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	474 char[] WIDGETS_check () {
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	475 char[] ret;
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	476 for (int i = WIDGETS.length-2; i > 0; --i) {
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	477 ret ~= "WIDGET_TYPE."~WIDGETS[i] ~" >= WIDGET_TYPE."~ WIDGETS[i+1];
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	478 if (i>1) ret ~= " \|\| ";
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	479 }
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	480 return ret;
108 c9fc2d303178 Added capability for border-less pop-up widgets. Simple pop-up menu. Diggory Hardy <diggory.hardy@gmail.com> parents: 105 diff changeset	481 }
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	482 mixin ("static if ("~WIDGETS_check~")
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	483 static assert (false, \"WIDGETS is not in order!\");");
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	484 }
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	485 }
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	486 //END makeWidget metacode
108 c9fc2d303178 Added capability for border-less pop-up widgets. Simple pop-up menu. Diggory Hardy <diggory.hardy@gmail.com> parents: 105 diff changeset	487
99 5de5810e3516 Implemented an editable TextContent widget; it's now possible to edit text options using the GUI. Diggory Hardy <diggory.hardy@gmail.com> parents: 97 diff changeset	488 protected:
5de5810e3516 Implemented an editable TextContent widget; it's now possible to edit text options using the GUI. Diggory Hardy <diggory.hardy@gmail.com> parents: 97 diff changeset	489 WidgetDataSet curData; // Current data
5de5810e3516 Implemented an editable TextContent widget; it's now possible to edit text options using the GUI. Diggory Hardy <diggory.hardy@gmail.com> parents: 97 diff changeset	490 WidgetDataChanges changes; // Changes for the current design.
5de5810e3516 Implemented an editable TextContent widget; it's now possible to edit text options using the GUI. Diggory Hardy <diggory.hardy@gmail.com> parents: 97 diff changeset	491
159 b06b04c75e86 Finished last commit, rearranged code for the WidgetManager class. Diggory Hardy <diggory.hardy@gmail.com> parents: 152 diff changeset	492 char[] rendName; // Name of renderer; for saving and creating renderers
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	493 IRenderer rend;
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	494
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	495 // Widgets:
126 c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 125 diff changeset	496 wdim w,h; // current widget size; should be at least (mw,mh) even if not displayable
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 125 diff changeset	497 wdim mw,mh; // minimal area required by widgets
99 5de5810e3516 Implemented an editable TextContent widget; it's now possible to edit text options using the GUI. Diggory Hardy <diggory.hardy@gmail.com> parents: 97 diff changeset	498 scope IChildWidget child; // The primary widget.
111 1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 110 diff changeset	499 uint setupN; // n to pass to IChildWidget.setup
99 5de5810e3516 Implemented an editable TextContent widget; it's now possible to edit text options using the GUI. Diggory Hardy <diggory.hardy@gmail.com> parents: 97 diff changeset	500
152 c67d074a7111 Menu placement now takes into account left/right placement of parent menus. Diggory Hardy <diggory.hardy@gmail.com> parents: 147 diff changeset	501 MenuPosition mAIPPW; // IPPW variable
131 9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	502 IPopupParentWidget childIPPW; // child IPPW, if any active
9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	503
146 783969f4665c Simple, inefficient context menus (displaying content description). Diggory Hardy <diggory.hardy@gmail.com> parents: 144 diff changeset	504 // Popup(s) handled directly by AWidgetManager:
783969f4665c Simple, inefficient context menus (displaying content description). Diggory Hardy <diggory.hardy@gmail.com> parents: 144 diff changeset	505 IChildWidget popupContext; // context menu (active if not null)
783969f4665c Simple, inefficient context menus (displaying content description). Diggory Hardy <diggory.hardy@gmail.com> parents: 144 diff changeset	506
160 ccd01fde535e Replaced WidgetManager's click and motion callbacks with a drag event system. Diggory Hardy <diggory.hardy@gmail.com> parents: 159 diff changeset	507 IChildWidget dragStart; // if non-null, this widget should receive motion and click-release events
163 24d77c52243f Provided sensible conversions for setting the value of one AStringContent from another, along with unittest. Diggory Hardy <diggory.hardy@gmail.com> parents: 162 diff changeset	508 int dragButton; // index of button in use for drag
160 ccd01fde535e Replaced WidgetManager's click and motion callbacks with a drag event system. Diggory Hardy <diggory.hardy@gmail.com> parents: 159 diff changeset	509 IChildWidget keyFocus; // widget receiving keyboard input
ccd01fde535e Replaced WidgetManager's click and motion callbacks with a drag event system. Diggory Hardy <diggory.hardy@gmail.com> parents: 159 diff changeset	510 IChildWidget underMouse; // widget under the mouse pointer
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 117 diff changeset	511
99 5de5810e3516 Implemented an editable TextContent widget; it's now possible to edit text options using the GUI. Diggory Hardy <diggory.hardy@gmail.com> parents: 97 diff changeset	512 Mutex mutex; // lock on methods for use outside the package.
80 ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 76 diff changeset	513 }

Mercurial > projects > mde

annotate mde/gui/WidgetManager.d @ 165:bb2f1a76346d