projects/mde: mde/gui/widget/layout.d annotate

annotate mde/gui/widget/layout.d @ 144:66c58e5b0062

Added a BoolContent-based collapsible widget.

author	Diggory Hardy <diggory.hardy@gmail.com>
date	Tue, 10 Feb 2009 12:57:09 +0000
parents	9dabcc44f515
children	783969f4665c

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
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	16 /// Gui layout widgets.
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	17 module mde.gui.widget.layout;
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: 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: 130 diff changeset	19 import mde.gui.widget.AParentWidget;
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	20 import mde.gui.exception;
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	21
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: 136 diff changeset	22 import mde.content.Content;
72 159775502bb4 The first dynamically generated widget lists, based on Options, are here! Diggory Hardy <diggory.hardy@gmail.com> parents: 71 diff changeset	23
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	24 import tango.util.container.HashMap;
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	25
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	26 debug {
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	27 import tango.util.log.Log : Log, Logger;
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	28 private Logger logger;
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	29 static this () {
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	30 logger = Log.getLogger ("mde.gui.widget.layout");
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	31 }
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	32 }
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	33
71 77c7d3235114 Separated the grid layout widget's implementation into a base and a derived class, to allow other uses of layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 66 diff changeset	34 /*************************************************************************************************
77c7d3235114 Separated the grid layout widget's implementation into a base and a derived class, to allow other uses of layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 66 diff changeset	35 * Encapsulates a grid of Widgets.
77c7d3235114 Separated the grid layout widget's implementation into a base and a derived class, to allow other uses of layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 66 diff changeset	36 *
77c7d3235114 Separated the grid layout widget's implementation into a base and a derived class, to allow other uses of layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 66 diff changeset	37 * Currently there is no support for changing number of cells, sub-widgets or sub-widget properties
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: 130 diff changeset	38 * (namely isW/HSizable) after this() has run.
71 77c7d3235114 Separated the grid layout widget's implementation into a base and a derived class, to allow other uses of layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 66 diff changeset	39 *************************************************************************************************/
77c7d3235114 Separated the grid layout widget's implementation into a base and a derived class, to allow other uses of layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 66 diff changeset	40 class GridLayoutWidget : GridWidget
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	41 {
65 891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	42 /** Constructor for a grid layout widget.
891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	43 *
891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	44 * Widget uses the initialisation data:
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	45 * ---
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	46 * ints = [widget_type, align_flags, rows, cols]
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	47 * strings = [w11, w12, ..., w1C, ..., wR1, ..., wRC]
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: 130 diff changeset	48 * // dimData may be:
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: 130 diff changeset	49 * dimData = [col1width, ..., colCwidth, row1height, ..., rowRheight]
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	50 * ---
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	51 * where R and C are the number of rows and columns, and wij is the ID (from parent Window's
90 b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	52 * list) for the widget in row i and column j. The number of parameters must be r*c + 3.
b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	53 *
b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	54 * The content parameter is passed on to all children accepting an IContent. */
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 118 diff changeset	55 this (IWidgetManager mgr, IParentWidget parent, widgetID id, WidgetData data, IContent content) {
37 052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	56 // Get grid size and check data
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	57 // Check sufficient data for type, align-flags, rows, cols, and possibly row/col widths.
93 08a4ae11454b Widgets now save dimensions without preventing structural changes in the base config file from applying. Diggory Hardy <diggory.hardy@gmail.com> parents: 92 diff changeset	58 if (data.ints.length != 4) throw new WidgetDataException (this);
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	59
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	60 rows = data.ints[2];
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	61 cols = data.ints[3];
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 118 diff changeset	62 // Check: at least one sub-widget and strings's length is correct:
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 118 diff changeset	63 if (rows < 1 \|\| cols < 1 \|\| data.strings.length != rows * cols)
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	64 throw new WidgetDataException (this);
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 118 diff changeset	65 super (mgr, parent, id, data);
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	66
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	67 // Get all sub-widgets
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	68 subWidgets.length = rows*cols;
41 b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	69 foreach (i, ref subWidget; subWidgets) {
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 118 diff changeset	70 subWidget = mgr.makeWidget (this, data.strings[i], content);
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	71 }
77 3dfd934100f7 Continuing widget data changes started in last commit: all previous widgets work again now (but lacking saving). Diggory Hardy <diggory.hardy@gmail.com> parents: 72 diff changeset	72
93 08a4ae11454b Widgets now save dimensions without preventing structural changes in the base config file from applying. Diggory Hardy <diggory.hardy@gmail.com> parents: 92 diff changeset	73 initWidths = mgr.dimData (id); // may be null, tested later
71 77c7d3235114 Separated the grid layout widget's implementation into a base and a derived class, to allow other uses of layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 66 diff changeset	74 }
78 79a1809421aa Widget data saving reimplemented for the new data system. (Now grid layout widgets remember their row & column sizes.) Diggory Hardy <diggory.hardy@gmail.com> parents: 77 diff changeset	75
79a1809421aa Widget data saving reimplemented for the new data system. (Now grid layout widgets remember their row & column sizes.) Diggory Hardy <diggory.hardy@gmail.com> parents: 77 diff changeset	76 // Save column/row sizes. Currently always do so.
114 b16a534f5302 Changes for tango r4201. Added override keyword in a lot of places. Diggory Hardy <diggory.hardy@gmail.com> parents: 113 diff changeset	77 override bool saveChanges () {
93 08a4ae11454b Widgets now save dimensions without preventing structural changes in the base config file from applying. Diggory Hardy <diggory.hardy@gmail.com> parents: 92 diff changeset	78 foreach (widget; subWidgets) // recurse on subwidgets
08a4ae11454b Widgets now save dimensions without preventing structural changes in the base config file from applying. Diggory Hardy <diggory.hardy@gmail.com> parents: 92 diff changeset	79 widget.saveChanges ();
08a4ae11454b Widgets now save dimensions without preventing structural changes in the base config file from applying. Diggory Hardy <diggory.hardy@gmail.com> parents: 92 diff changeset	80
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 118 diff changeset	81 mgr.dimData (id, col.width ~ row.width);
78 79a1809421aa Widget data saving reimplemented for the new data system. (Now grid layout widgets remember their row & column sizes.) Diggory Hardy <diggory.hardy@gmail.com> parents: 77 diff changeset	82 return true;
79a1809421aa Widget data saving reimplemented for the new data system. (Now grid layout widgets remember their row & column sizes.) Diggory Hardy <diggory.hardy@gmail.com> parents: 77 diff changeset	83 }
79a1809421aa Widget data saving reimplemented for the new data system. (Now grid layout widgets remember their row & column sizes.) Diggory Hardy <diggory.hardy@gmail.com> parents: 77 diff changeset	84 protected:
71 77c7d3235114 Separated the grid layout widget's implementation into a base and a derived class, to allow other uses of layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 66 diff changeset	85 }
77c7d3235114 Separated the grid layout widget's implementation into a base and a derived class, to allow other uses of layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 66 diff changeset	86
77c7d3235114 Separated the grid layout widget's implementation into a base and a derived class, to allow other uses of layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 66 diff changeset	87
77c7d3235114 Separated the grid layout widget's implementation into a base and a derived class, to allow other uses of layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 66 diff changeset	88 /*************************************************************************************************
103 42e241e7be3e ContentList content type; getting content items/lists from Options generically via content.Items, and a new addContent widget function. Several improvements to generic handling of content. New button-with-text widget. Diggory Hardy <diggory.hardy@gmail.com> parents: 99 diff changeset	89 * Iterates on an ContentList to produce a list of widgets, each of which is created with widgetID
42e241e7be3e ContentList content type; getting content items/lists from Options generically via content.Items, and a new addContent widget function. Several improvements to generic handling of content. New button-with-text widget. Diggory Hardy <diggory.hardy@gmail.com> parents: 99 diff changeset	90 * data.strings[0]. If an IContent is passed, this is cast to a ContentList, otherwise
42e241e7be3e ContentList content type; getting content items/lists from Options generically via content.Items, and a new addContent widget function. Several improvements to generic handling of content. New button-with-text widget. Diggory Hardy <diggory.hardy@gmail.com> parents: 99 diff changeset	91 * content.Items is used to get an IContent. It is an error if the content fails to cast to
42e241e7be3e ContentList content type; getting content items/lists from Options generically via content.Items, and a new addContent widget function. Several improvements to generic handling of content. New button-with-text widget. Diggory Hardy <diggory.hardy@gmail.com> parents: 99 diff changeset	92 * ContentList.
71 77c7d3235114 Separated the grid layout widget's implementation into a base and a derived class, to allow other uses of layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 66 diff changeset	93 *************************************************************************************************/
103 42e241e7be3e ContentList content type; getting content items/lists from Options generically via content.Items, and a new addContent widget function. Several improvements to generic handling of content. New button-with-text widget. Diggory Hardy <diggory.hardy@gmail.com> parents: 99 diff changeset	94 class ContentListWidget : GridWidget
71 77c7d3235114 Separated the grid layout widget's implementation into a base and a derived class, to allow other uses of layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 66 diff changeset	95 {
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 118 diff changeset	96 this (IWidgetManager mgr, IParentWidget parent, widgetID id, WidgetData data, IContent content) {
115 1b1e2297e2fc Enums handled more generically now via either a popup list or flat list of BoolContentWidgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 114 diff changeset	97 cList = cast(IContentList) content;
138 3468e9bfded1 Popup widgets: are simpler to use and can show content fields like DisplayContentWidget. Diggory Hardy <diggory.hardy@gmail.com> parents: 137 diff changeset	98 WDCMinCheck (data, 2, 1, cList);
72 159775502bb4 The first dynamically generated widget lists, based on Options, are here! Diggory Hardy <diggory.hardy@gmail.com> parents: 71 diff changeset	99 cols = 1;
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 118 diff changeset	100 rows = cList.list.length;
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 118 diff changeset	101 subWidgets.length = rows;
115 1b1e2297e2fc Enums handled more generically now via either a popup list or flat list of BoolContentWidgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 114 diff changeset	102 if (data.ints[1] & 8) { // orient horizontally
1b1e2297e2fc Enums handled more generically now via either a popup list or flat list of BoolContentWidgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 114 diff changeset	103 cols = rows;
1b1e2297e2fc Enums handled more generically now via either a popup list or flat list of BoolContentWidgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 114 diff changeset	104 rows = 1;
1b1e2297e2fc Enums handled more generically now via either a popup list or flat list of BoolContentWidgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 114 diff changeset	105 }
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 118 diff changeset	106 super (mgr, 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: 118 diff changeset	107
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 118 diff changeset	108 if (subWidgets) { // i.e. rows*cols > 0
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 118 diff changeset	109 foreach (i, c; cList.list) {
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 118 diff changeset	110 subWidgets[i] = mgr.makeWidget (this, data.strings[0], c);
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 118 diff changeset	111 }
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 118 diff changeset	112 } else {
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 118 diff changeset	113 rows = cols = 1;
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	114 subWidgets = [mgr.makeWidget (this, data.strings[0],
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	115 new ErrorContent ("<empty list>",null)) ];
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 118 diff changeset	116 }
71 77c7d3235114 Separated the grid layout widget's implementation into a base and a derived class, to allow other uses of layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 66 diff changeset	117 }
77c7d3235114 Separated the grid layout widget's implementation into a base and a derived class, to allow other uses of layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 66 diff changeset	118
133 9fd705793568 Fixed menu popup bug, improved recursion detection. Diggory Hardy <diggory.hardy@gmail.com> parents: 131 diff changeset	119 override void recursionCheck (widgetID wID, IContent c) {
9fd705793568 Fixed menu popup bug, improved recursion detection. Diggory Hardy <diggory.hardy@gmail.com> parents: 131 diff changeset	120 if (wID is id && c is cList)
9fd705793568 Fixed menu popup bug, improved recursion detection. Diggory Hardy <diggory.hardy@gmail.com> parents: 131 diff changeset	121 throw new WidgetRecursionException (wID);
9fd705793568 Fixed menu popup bug, improved recursion detection. Diggory Hardy <diggory.hardy@gmail.com> parents: 131 diff changeset	122 parent.recursionCheck (wID, c);
9fd705793568 Fixed menu popup bug, improved recursion detection. Diggory Hardy <diggory.hardy@gmail.com> parents: 131 diff changeset	123 }
9fd705793568 Fixed menu popup bug, improved recursion detection. Diggory Hardy <diggory.hardy@gmail.com> parents: 131 diff changeset	124
114 b16a534f5302 Changes for tango r4201. Added override keyword in a lot of places. Diggory Hardy <diggory.hardy@gmail.com> parents: 113 diff changeset	125 override bool saveChanges () {
92 085f2ca31914 Shared alignments supported in more complex cases. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	126 // Since all sub-widgets have the same id, it only makes sense to call on one
085f2ca31914 Shared alignments supported in more complex cases. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	127 if (subWidgets is null)
085f2ca31914 Shared alignments supported in more complex cases. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	128 return false;
93 08a4ae11454b Widgets now save dimensions without preventing structural changes in the base config file from applying. Diggory Hardy <diggory.hardy@gmail.com> parents: 92 diff changeset	129 return subWidgets[0].saveChanges;
92 085f2ca31914 Shared alignments supported in more complex cases. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	130 }
085f2ca31914 Shared alignments supported in more complex cases. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	131
72 159775502bb4 The first dynamically generated widget lists, based on Options, are here! Diggory Hardy <diggory.hardy@gmail.com> parents: 71 diff changeset	132 private:
115 1b1e2297e2fc Enums handled more generically now via either a popup list or flat list of BoolContentWidgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 114 diff changeset	133 IContentList cList;
71 77c7d3235114 Separated the grid layout widget's implementation into a base and a derived class, to allow other uses of layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 66 diff changeset	134 }
77c7d3235114 Separated the grid layout widget's implementation into a base and a derived class, to allow other uses of layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 66 diff changeset	135
77c7d3235114 Separated the grid layout widget's implementation into a base and a derived class, to allow other uses of layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 66 diff changeset	136
77c7d3235114 Separated the grid layout widget's implementation into a base and a derived class, to allow other uses of layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 66 diff changeset	137 /*************************************************************************************************
77c7d3235114 Separated the grid layout widget's implementation into a base and a derived class, to allow other uses of layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 66 diff changeset	138 * Backend for grid-based (includes column/row) layout widgets.
77c7d3235114 Separated the grid layout widget's implementation into a base and a derived class, to allow other uses of layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 66 diff changeset	139 *
77c7d3235114 Separated the grid layout widget's implementation into a base and a derived class, to allow other uses of layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 66 diff changeset	140 * A deriving class must at least do some work in it's constructor (see Ddoc for this() below)
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: 130 diff changeset	141 * and provide an implementation of saveChanges() (unless Widget's version is sufficient).
71 77c7d3235114 Separated the grid layout widget's implementation into a base and a derived class, to allow other uses of layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 66 diff changeset	142 *
77c7d3235114 Separated the grid layout widget's implementation into a base and a derived class, to allow other uses of layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 66 diff changeset	143 * Since a grid with either dimension zero is not useful, there must be at least one sub-widget.
77c7d3235114 Separated the grid layout widget's implementation into a base and a derived class, to allow other uses of layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 66 diff changeset	144 *
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: 130 diff changeset	145 * The grid has no border but optionally has spacing between widgets.
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: 130 diff changeset	146 *
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: 130 diff changeset	147 * Several flags are tested against ints[1]:
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: 130 diff changeset	148 * $(TABLE
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: 130 diff changeset	149 * $(TR $(TD 1) $(TD Column alignment is shared against other instances of thes widget id))
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: 130 diff changeset	150 * $(TR $(TD 2) $(TD Row alignment is shared against other instances of thes widget id))
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: 130 diff changeset	151 * $(TR $(TD 4) $(TD Spacing is inserted between elements; the renderer may draw 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: 130 diff changeset	152 * $(TR $(TD 8) $(TD For ContentListWidget only, list is horizontal instead of vertical))
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: 130 diff changeset	153 * )
71 77c7d3235114 Separated the grid layout widget's implementation into a base and a derived class, to allow other uses of layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 66 diff changeset	154 *************************************************************************************************/
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	155 // Note: mw, mh inherited from AWidget are not used; use col.mw, row.mw instead.
95 2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	156 abstract class GridWidget : AParentWidget
71 77c7d3235114 Separated the grid layout widget's implementation into a base and a derived class, to allow other uses of layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 66 diff changeset	157 {
77c7d3235114 Separated the grid layout widget's implementation into a base and a derived class, to allow other uses of layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 66 diff changeset	158 //BEGIN Creation & saving
77c7d3235114 Separated the grid layout widget's implementation into a base and a derived class, to allow other uses of layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 66 diff changeset	159 /** Partial constructor for a grid layout widget.
77c7d3235114 Separated the grid layout widget's implementation into a base and a derived class, to allow other uses of layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 66 diff changeset	160 *
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 118 diff changeset	161 * Deriving classes should check data lengths, and set rows and cols
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 118 diff changeset	162 * before calling this super constructor.
77 3dfd934100f7 Continuing widget data changes started in last commit: all previous widgets work again now (but lacking saving). Diggory Hardy <diggory.hardy@gmail.com> parents: 72 diff changeset	163 *
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	164 * Derived constructors may also set initWidths to the array of column widths followed by
111 1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	165 * row heights used to initially set the row/column dimensions. */
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 118 diff changeset	166 protected this (IWidgetManager mgr, IParentWidget parent, widgetID id, WidgetData data) {
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 118 diff changeset	167 super (mgr, parent, id);
71 77c7d3235114 Separated the grid layout widget's implementation into a base and a derived class, to allow other uses of layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 66 diff changeset	168
142 9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	169 // Create cell aligners, potentially sharing
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	170 if (data.ints[1] & 1)
142 9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	171 col = AlignColumns.getInstance (id, parent, cols, false);
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	172 else
142 9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	173 col = (new AlignColumns (cols,null));
111 1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	174 if (data.ints[1] & 2)
142 9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	175 row = AlignColumns.getInstance (id, parent, rows, true);
111 1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	176 else
142 9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	177 row = (new AlignColumns (rows,null));
126 c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 124 diff changeset	178
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 124 diff changeset	179 AlignColumns.CallbackStruct cbS;
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 124 diff changeset	180 cbS.setWidth = &setColWidth;
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 124 diff changeset	181 cbS.sADD = &setupAlignDimData;
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 124 diff changeset	182 cbS.newMW = &colNewMW;
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 124 diff changeset	183 col.cbs ~= cbS;
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 124 diff changeset	184 cbS.setWidth = &setRowHeight;
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 124 diff changeset	185 cbS.newMW = &rowNewMW;
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 124 diff changeset	186 row.cbs ~= cbS;
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 124 diff changeset	187
109 2a1428ec5344 Optional, visible spacing in grid layouts. Diggory Hardy <diggory.hardy@gmail.com> parents: 105 diff changeset	188 useSpacing = (data.ints[1] & 4) != 0;
92 085f2ca31914 Shared alignments supported in more complex cases. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	189 }
085f2ca31914 Shared alignments supported in more complex cases. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	190
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	191 /** Responsible for calculating the minimal size and initializing some stuff.
71 77c7d3235114 Separated the grid layout widget's implementation into a base and a derived class, to allow other uses of layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 66 diff changeset	192 *
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	193 * As such, this must be the first function called after this(). */
114 b16a534f5302 Changes for tango r4201. Added override keyword in a lot of places. Diggory Hardy <diggory.hardy@gmail.com> parents: 113 diff changeset	194 override bool setup (uint n, uint flags) {
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 118 diff changeset	195 debug (mdeWidgets) logger.trace ("GridWidget.setup");
5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 118 diff changeset	196 // Run all internal calculations regardless of changes, then check dimensions for changes.
111 1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	197 // Don't try shortcutting internal calculations when there are no changes - I've tried, and
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	198 // doing so adds enough overhead to make doing so almost(?) worthless (or at least large
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	199 // increases in complexity).
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	200 wdim ow = w, oh = h;
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	201
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	202 col.setup (n, flags);
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	203 row.setup (n, flags);
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	204
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	205 if (initWidths.length == cols + rows) {
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	206 col.setWidths (initWidths[0..cols]);
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	207 row.setWidths (initWidths[cols..$]);
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	208 } else {
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	209 col.setWidths;
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	210 row.setWidths;
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	211 }
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	212 initWidths = null; // free
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	213
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	214 w = col.w;
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	215 h = row.w;
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	216
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	217 // Tell subwidgets their new sizes. Positions are given by a later call to setPosition.
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	218 foreach (i,widget; subWidgets) {
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	219 // Resizing direction is arbitrarily set to negative:
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	220 widget.setWidth (col.width[i % cols], -1);
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	221 widget.setHeight (row.width[i / cols], -1);
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	222 }
144 66c58e5b0062 Added a BoolContent-based collapsible widget. Diggory Hardy <diggory.hardy@gmail.com> parents: 142 diff changeset	223 return (ow != w \|\| oh != h \|\| n == 0);
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	224 }
46 03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	225 //END Creation & saving
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	226
46 03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	227 //BEGIN Size & position
114 b16a534f5302 Changes for tango r4201. Added override keyword in a lot of places. Diggory Hardy <diggory.hardy@gmail.com> parents: 113 diff changeset	228 override bool isWSizable () {
45 0fd51d2c6c8a Several changes to resising windows and layout widgets. This commit still has some bugs. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	229 return col.firstSizable >= 0;
37 052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	230 }
114 b16a534f5302 Changes for tango r4201. Added override keyword in a lot of places. Diggory Hardy <diggory.hardy@gmail.com> parents: 113 diff changeset	231 override bool isHSizable () {
45 0fd51d2c6c8a Several changes to resising windows and layout widgets. This commit still has some bugs. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	232 return row.firstSizable >= 0;
37 052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	233 }
052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	234
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	235 // mw, mh not used
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	236 override wdim minWidth () {
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	237 return col.mw;
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	238 }
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	239 override wdim minHeight () {
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	240 return row.mw;
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	241 }
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	242
114 b16a534f5302 Changes for tango r4201. Added override keyword in a lot of places. Diggory Hardy <diggory.hardy@gmail.com> parents: 113 diff changeset	243 override void setWidth (wdim nw, int dir) {
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	244 w = col.resizeWidth (nw, dir);
46 03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	245 // Note: setPosition must be called after!
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	246 }
114 b16a534f5302 Changes for tango r4201. Added override keyword in a lot of places. Diggory Hardy <diggory.hardy@gmail.com> parents: 113 diff changeset	247 override void setHeight (wdim nh, int dir) {
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	248 h = row.resizeWidth (nh, dir);
46 03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	249 // Note: setPosition must be called after!
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	250 }
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	251
114 b16a534f5302 Changes for tango r4201. Added override keyword in a lot of places. Diggory Hardy <diggory.hardy@gmail.com> parents: 113 diff changeset	252 override void setPosition (wdim x, wdim y) {
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	253 this.x = x;
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	254 this.y = y;
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	255
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	256 debug assert (col.pos && row.pos, "setPosition: col/row.pos not set (code error)");
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	257 foreach (i,widget; subWidgets)
45 0fd51d2c6c8a Several changes to resising windows and layout widgets. This commit still has some bugs. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	258 widget.setPosition (x + col.pos[i % cols], y + row.pos[i / cols]);
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	259 }
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	260
126 c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 124 diff changeset	261 // Unlike for most widgets, these actually resize self and sub-widgets, since the parent
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 124 diff changeset	262 // simply calling setWidth/setHeight wouldn't work.
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 124 diff changeset	263 override void minWChange (IChildWidget widg, wdim nmw) {
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 124 diff changeset	264 size_t i = getWidgetIndex(widg);
140 c94ec5594449 Fixed a bug with changing the minimal size and optimised it slightly. Diggory Hardy <diggory.hardy@gmail.com> parents: 139 diff changeset	265 if (!col.newMinWidth (i%cols, i/cols + colR, nmw)) {
c94ec5594449 Fixed a bug with changing the minimal size and optimised it slightly. Diggory Hardy <diggory.hardy@gmail.com> parents: 139 diff changeset	266 // don't propegate call to parent; set position as required
c94ec5594449 Fixed a bug with changing the minimal size and optimised it slightly. Diggory Hardy <diggory.hardy@gmail.com> parents: 139 diff changeset	267 widg.setPosition (x + col.pos[i % cols], y + row.pos[i / cols]);
c94ec5594449 Fixed a bug with changing the minimal size and optimised it slightly. Diggory Hardy <diggory.hardy@gmail.com> parents: 139 diff changeset	268 mgr.requestRedraw;
c94ec5594449 Fixed a bug with changing the minimal size and optimised it slightly. Diggory Hardy <diggory.hardy@gmail.com> parents: 139 diff changeset	269 } // else callbacks to all sharing layouts do the rest
126 c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 124 diff changeset	270 }
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 124 diff changeset	271 override void minHChange (IChildWidget widg, wdim nmh) {
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 124 diff changeset	272 size_t i = getWidgetIndex(widg);
140 c94ec5594449 Fixed a bug with changing the minimal size and optimised it slightly. Diggory Hardy <diggory.hardy@gmail.com> parents: 139 diff changeset	273 if (!row.newMinWidth (i/cols, i%cols + rowR, nmh)) {
c94ec5594449 Fixed a bug with changing the minimal size and optimised it slightly. Diggory Hardy <diggory.hardy@gmail.com> parents: 139 diff changeset	274 widg.setPosition (x + col.pos[i % cols], y + row.pos[i / cols]);
c94ec5594449 Fixed a bug with changing the minimal size and optimised it slightly. Diggory Hardy <diggory.hardy@gmail.com> parents: 139 diff changeset	275 mgr.requestRedraw;
c94ec5594449 Fixed a bug with changing the minimal size and optimised it slightly. Diggory Hardy <diggory.hardy@gmail.com> parents: 139 diff changeset	276 }
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	277 }
46 03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	278 //END Size & position
126 c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 124 diff changeset	279
37 052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	280
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	281 // Find the relevant widget.
114 b16a534f5302 Changes for tango r4201. Added override keyword in a lot of places. Diggory Hardy <diggory.hardy@gmail.com> parents: 113 diff changeset	282 override IChildWidget getWidget (wdim cx, wdim cy) {
45 0fd51d2c6c8a Several changes to resising windows and layout widgets. This commit still has some bugs. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	283 debug scope (failure)
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	284 logger.warn ("getWidget: failure; values: click; pos; width: {},{}; {},{}; {},{}", cx, cy, x, y, w, h);
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	285 debug assert (cx >= x && cx < x + w && cy >= y && cy < y + h, "getWidget: not on widget (code error)");
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	286
45 0fd51d2c6c8a Several changes to resising windows and layout widgets. This commit still has some bugs. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	287 // Find row/column:
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	288 ptrdiff_t i = col.getCell (cx - x);
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	289 ptrdiff_t j = row.getCell (cy - y);
45 0fd51d2c6c8a Several changes to resising windows and layout widgets. This commit still has some bugs. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	290 if (i < 0 \|\| j < 0) // on a space between widgets
0fd51d2c6c8a Several changes to resising windows and layout widgets. This commit still has some bugs. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	291 return this;
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	292
45 0fd51d2c6c8a Several changes to resising windows and layout widgets. This commit still has some bugs. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	293 // On a subwidget; recurse call:
0fd51d2c6c8a Several changes to resising windows and layout widgets. This commit still has some bugs. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	294 return subWidgets[i + j*cols].getWidget (cx, cy);
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	295 }
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	296
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	297 // Resizing columns & rows
114 b16a534f5302 Changes for tango r4201. Added override keyword in a lot of places. Diggory Hardy <diggory.hardy@gmail.com> parents: 113 diff changeset	298 override int clickEvent (wdabs cx, wdabs cy, ubyte b, bool state) {
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	299 debug scope (failure)
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	300 logger.warn ("clickEvent: failure");
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	301 if (b == 1 && state == true) {
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	302 /* Note: Because of getWidget, this function is only called if the click is not on a
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	303 * sub-widget, so we know it's on some divisor (so at least one of resizeCol and
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	304 * resizeRow is non-negative). */
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	305
45 0fd51d2c6c8a Several changes to resising windows and layout widgets. This commit still has some bugs. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	306 // find col/row's resizeD & resizeU
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	307 if (col.findResizeCols (cx - x) && row.findResizeCols (cy - y))
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: 95 diff changeset	308 return 0; // unable to resize
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	309
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	310 dragX = cx;
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	311 dragY = cy;
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	312
77 3dfd934100f7 Continuing widget data changes started in last commit: all previous widgets work again now (but lacking saving). Diggory Hardy <diggory.hardy@gmail.com> parents: 72 diff changeset	313 mgr.addClickCallback (&endCallback);
3dfd934100f7 Continuing widget data changes started in last commit: all previous widgets work again now (but lacking saving). Diggory Hardy <diggory.hardy@gmail.com> parents: 72 diff changeset	314 mgr.addMotionCallback (&resizeCallback);
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	315 }
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: 95 diff changeset	316 return 0;
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	317 }
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	318
114 b16a534f5302 Changes for tango r4201. Added override keyword in a lot of places. Diggory Hardy <diggory.hardy@gmail.com> parents: 113 diff changeset	319 override void draw () {
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	320 super.draw ();
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	321
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	322 foreach (widget; subWidgets)
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	323 widget.draw ();
109 2a1428ec5344 Optional, visible spacing in grid layouts. Diggory Hardy <diggory.hardy@gmail.com> parents: 105 diff changeset	324
2a1428ec5344 Optional, visible spacing in grid layouts. Diggory Hardy <diggory.hardy@gmail.com> parents: 105 diff changeset	325 if (useSpacing)
2a1428ec5344 Optional, visible spacing in grid layouts. Diggory Hardy <diggory.hardy@gmail.com> parents: 105 diff changeset	326 mgr.renderer.drawSpacers (x,y, w,h, col.pos[1..$], row.pos[1..$]);
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	327 }
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	328
95 2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	329 package:
40 b28d7adc786b Made GUI more robust to mutable data changes and improved much of GridLayoutWidget's code. Diggory Hardy <diggory.hardy@gmail.com> parents: 39 diff changeset	330 /* Calculations which need to be run whenever a new sub-widget structure is set
111 1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	331 * or other changes affecting widget sizes. Most of these need to happen regardless of whether
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	332 * changes have occurred, since AlignColumns have been reset.
71 77c7d3235114 Separated the grid layout widget's implementation into a base and a derived class, to allow other uses of layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 66 diff changeset	333 *
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	334 * rows, cols and subWidgets must be set before calling. Part of the set-up for AlignColumns
92 085f2ca31914 Shared alignments supported in more complex cases. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	335 * (col and row). subWidgets need to know their minimal size and resizability. */
114 b16a534f5302 Changes for tango r4201. Added override keyword in a lot of places. Diggory Hardy <diggory.hardy@gmail.com> parents: 113 diff changeset	336 override void setupAlignDimData (uint n, uint flags) {
111 1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	337 if (sADD_n == n) return; // cached data is current
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	338 sADD_n = n;
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	339
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 118 diff changeset	340 debug (mdeWidgets) logger.trace ("GridWidget: setup on subWidgets...");
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	341 foreach (widg; subWidgets) { // make sure all subwidgets have been set up
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	342 debug assert (widg, "null widg");
111 1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	343 widg.setup (n,flags);
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	344 }
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 118 diff changeset	345 debug (mdeWidgets) logger.trace ("GridWidget: setup on subWidgets...done");
111 1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	346 // make sure both AlignColumns are set up (since first call to setup(n) calls reset):
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	347 col.setup (n, flags);
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	348 row.setup (n, flags);
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 118 diff changeset	349
111 1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	350 // Note: shared AlignColumns get this set by all sharing GridWidgets
109 2a1428ec5344 Optional, visible spacing in grid layouts. Diggory Hardy <diggory.hardy@gmail.com> parents: 105 diff changeset	351 col.spacing = row.spacing = useSpacing ? mgr.renderer.layoutSpacing : 0;
45 0fd51d2c6c8a Several changes to resising windows and layout widgets. This commit still has some bugs. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	352
40 b28d7adc786b Made GUI more robust to mutable data changes and improved much of GridLayoutWidget's code. Diggory Hardy <diggory.hardy@gmail.com> parents: 39 diff changeset	353 // Calculate the minimal column and row sizes:
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	354 if (colR == size_t.max)
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	355 colR = col.addRows (rows);
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	356 if (rowR == size_t.max)
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	357 rowR = row.addRows (cols);
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	358 // AlignColumns (row, col) takes care of initializing minWidth.
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	359 for (size_t r = 0; r < rows; ++r) {
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	360 for (size_t c = 0; c < cols; ++c) {
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	361 size_t i = r*cols + c;
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	362 col.minCellWidths[i+colR*cols] = subWidgets[i].minWidth;
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	363 row.minCellWidths[(c+rowR)*rows+r] = subWidgets[i].minHeight;
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	364 }
40 b28d7adc786b Made GUI more robust to mutable data changes and improved much of GridLayoutWidget's code. Diggory Hardy <diggory.hardy@gmail.com> parents: 39 diff changeset	365 }
b28d7adc786b Made GUI more robust to mutable data changes and improved much of GridLayoutWidget's code. Diggory Hardy <diggory.hardy@gmail.com> parents: 39 diff changeset	366
b28d7adc786b Made GUI more robust to mutable data changes and improved much of GridLayoutWidget's code. Diggory Hardy <diggory.hardy@gmail.com> parents: 39 diff changeset	367 // Find which cols/rows are resizable:
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	368 // AlignColumns initializes sizable, and sets first and last sizables.
130 c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	369 static if (!(SIZABILITY & SIZABILITY_ENUM.SUBWIDGETS)) return;
40 b28d7adc786b Made GUI more robust to mutable data changes and improved much of GridLayoutWidget's code. Diggory Hardy <diggory.hardy@gmail.com> parents: 39 diff changeset	370 forCols:
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	371 for (size_t i = 0; i < cols; ++i) { // for each column
130 c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	372 for (size_t j = 0; j < subWidgets.length; j += cols) { // for each row
c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	373 static if (SIZABILITY == SIZABILITY_ENUM.ALL_SUBWIDGETS) {
c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	374 if (!subWidgets[i+j].isWSizable) { // column not resizable
c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	375 col.sizable[i] = false;
c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	376 continue forCols; // no point checking more
c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	377 }
c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	378 } else {
c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	379 if (subWidgets[i+j].isWSizable) { // column is resizable
c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	380 col.sizable[i] = true;
c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	381 continue forCols;
c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	382 }
c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	383 }
c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	384 }
40 b28d7adc786b Made GUI more robust to mutable data changes and improved much of GridLayoutWidget's code. Diggory Hardy <diggory.hardy@gmail.com> parents: 39 diff changeset	385 }
b28d7adc786b Made GUI more robust to mutable data changes and improved much of GridLayoutWidget's code. Diggory Hardy <diggory.hardy@gmail.com> parents: 39 diff changeset	386
b28d7adc786b Made GUI more robust to mutable data changes and improved much of GridLayoutWidget's code. Diggory Hardy <diggory.hardy@gmail.com> parents: 39 diff changeset	387 forRows:
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	388 for (size_t i = 0; i < subWidgets.length; i += cols) { // for each row
130 c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	389 for (size_t j = 0; j < cols; ++j) { // for each column
c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	390 static if (SIZABILITY == SIZABILITY_ENUM.ALL_SUBWIDGETS) {
c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	391 if (!subWidgets[i+j].isHSizable) {
c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	392 row.sizable[i / cols] = false;
c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	393 continue forRows;
c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	394 }
c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	395 } else {
c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	396 if (subWidgets[i+j].isHSizable) {
c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	397 row.sizable[i / cols] = true;
c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	398 continue forRows;
c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	399 }
c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	400 }
c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	401 }
37 052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	402 }
052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	403 }
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	404
95 2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	405 private:
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	406 override void setColWidth (size_t i, wdim w, int dir) {
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	407 for (size_t j = 0; j < rows; ++j) {
46 03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	408 subWidgets[i + cols*j].setWidth (w, dir);
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	409 }
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	410 }
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	411 override void setRowHeight (size_t j, wdim h, int dir) {
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	412 for (size_t i = 0; i < cols; ++i) {
46 03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	413 subWidgets[i + cols*j].setHeight (h, dir);
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	414 }
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	415 }
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	416
140 c94ec5594449 Fixed a bug with changing the minimal size and optimised it slightly. Diggory Hardy <diggory.hardy@gmail.com> parents: 139 diff changeset	417 void colNewMW () {
c94ec5594449 Fixed a bug with changing the minimal size and optimised it slightly. Diggory Hardy <diggory.hardy@gmail.com> parents: 139 diff changeset	418 w = col.w;
c94ec5594449 Fixed a bug with changing the minimal size and optimised it slightly. Diggory Hardy <diggory.hardy@gmail.com> parents: 139 diff changeset	419 parent.minWChange (this, col.mw);
126 c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 124 diff changeset	420 }
140 c94ec5594449 Fixed a bug with changing the minimal size and optimised it slightly. Diggory Hardy <diggory.hardy@gmail.com> parents: 139 diff changeset	421 void rowNewMW () {
c94ec5594449 Fixed a bug with changing the minimal size and optimised it slightly. Diggory Hardy <diggory.hardy@gmail.com> parents: 139 diff changeset	422 h = row.w;
c94ec5594449 Fixed a bug with changing the minimal size and optimised it slightly. Diggory Hardy <diggory.hardy@gmail.com> parents: 139 diff changeset	423 parent.minHChange (this, row.mw);
126 c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 124 diff changeset	424 }
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 124 diff changeset	425
46 03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	426
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	427 //BEGIN Col/row resizing callback
114 b16a534f5302 Changes for tango r4201. Added override keyword in a lot of places. Diggory Hardy <diggory.hardy@gmail.com> parents: 113 diff changeset	428 override void resizeCallback (wdim cx, wdim cy) {
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	429 col.resizeCols (cx - dragX);
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	430 row.resizeCols (cy - dragY);
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	431
45 0fd51d2c6c8a Several changes to resising windows and layout widgets. This commit still has some bugs. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	432 // NOTE: all adjustments are relative; might be better if they were absolute?
0fd51d2c6c8a Several changes to resising windows and layout widgets. This commit still has some bugs. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	433 dragX = cx;
0fd51d2c6c8a Several changes to resising windows and layout widgets. This commit still has some bugs. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	434 dragY = cy;
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	435
46 03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	436 foreach (i,widget; subWidgets)
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	437 widget.setPosition (x + col.pos[i % cols],
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	438 y + row.pos[i / cols]);
77 3dfd934100f7 Continuing widget data changes started in last commit: all previous widgets work again now (but lacking saving). Diggory Hardy <diggory.hardy@gmail.com> parents: 72 diff changeset	439 mgr.requestRedraw;
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	440 }
114 b16a534f5302 Changes for tango r4201. Added override keyword in a lot of places. Diggory Hardy <diggory.hardy@gmail.com> parents: 113 diff changeset	441 override bool endCallback (wdabs cx, wdabs cy, ubyte b, bool state) {
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	442 if (b == 1 && state == false) {
77 3dfd934100f7 Continuing widget data changes started in last commit: all previous widgets work again now (but lacking saving). Diggory Hardy <diggory.hardy@gmail.com> parents: 72 diff changeset	443 mgr.removeCallbacks (cast(void*) this);
45 0fd51d2c6c8a Several changes to resising windows and layout widgets. This commit still has some bugs. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	444 return true; // we've handled the up-click
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	445 }
45 0fd51d2c6c8a Several changes to resising windows and layout widgets. This commit still has some bugs. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	446 return false; // we haven't handled it
40 b28d7adc786b Made GUI more robust to mutable data changes and improved much of GridLayoutWidget's code. Diggory Hardy <diggory.hardy@gmail.com> parents: 39 diff changeset	447 }
37 052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	448
40 b28d7adc786b Made GUI more robust to mutable data changes and improved much of GridLayoutWidget's code. Diggory Hardy <diggory.hardy@gmail.com> parents: 39 diff changeset	449 protected:
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	450 // Data for resizing cols/rows:
58 d43523ed4b62 Included a wdim typedef for all variables to do with window position or size instead of just using int. Diggory Hardy <diggory.hardy@gmail.com> parents: 46 diff changeset	451 wdim dragX, dragY; // coords where drag starts
46 03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	452 //END Col/row resizing callback
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	453
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	454 size_t cols, rows; // number of cells in grid
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	455 wdim[] initWidths; // see this / setInitialSize
111 1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	456 uint sADD_n = uint.max; // param n of last setup call after setupAlignDimData has run
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	457 bool useSpacing; // add inter-row/col spacing?
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	458
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	459 /* All widgets in the grid, by row. Order: [ 0 1 ]
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	460 * [ 2 3 ] */
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	461 //IChildWidget[] subWidgets; (inherited from AParentWidget)
37 052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	462
142 9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	463 package AlignColumns col, row; // aligners for cols and rows
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	464 // "rows" allocated in col and row; return value of *.addRows():
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	465 size_t colR = size_t.max, rowR = size_t.max;
90 b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	466 }
b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	467
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	468
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	469 /**************************************************************************************************
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	470 * Alignment device
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	471 *
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	472 * E.g. can control widths of columns within a grid, and provide sensible resizing, respecting the
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	473 * minimal width required by each cell in a column. Is not restricted to horizontal widths, but to
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	474 * ease descriptions, a horizontal context (column widths) is assumed.
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	475 *
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	476 * Cells should be of type IChildWidget.
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	477 *
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	478 * Cells are not directly interacted with, but minimal widths for each column are passed, and
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	479 * callback functions are used to adjust the width of any column.
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	480 *************************************************************************************************/
95 2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	481 package class AlignColumns
90 b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	482 {
142 9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	483 /** Get an aligner.
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	484 *
142 9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	485 * Will be shared with other layouts with the same id which have the same
9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	486 * parent or if the parents share an aligner.
9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	487 *
9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	488 * Also ensures each widget sharing an instance expects the same number of
9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	489 * columns. */
9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	490 static AlignColumns getInstance (widgetID id, IParentWidget parent, size_t columns, bool horiz) {
9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	491 if (horiz)
9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	492 id ~= "H"; // make the ID different for each aligner
9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	493 AlignColumns[]* p = id in instances;
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	494 if (p) {
142 9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	495 foreach (ac; *p) {
9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	496 if (parent !is ac.parent) { // If parents are different
9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	497 GridWidget parGrid = cast(GridWidget) parent,
9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	498 acPGrid = cast(GridWidget) ac.parent;
9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	499 // and either is not a GridWidget
9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	500 // or their aligners are different
9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	501 if (parGrid is null \|\| acPGrid is null \|\|
9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	502 horiz ? parGrid.row !is acPGrid.row
9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	503 : parGrid.col !is acPGrid.col) {
9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	504 continue; // don't share with it
9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	505 }
9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	506 }
9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	507 if (ac.cols != columns)
9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	508 continue; // Alignment sharing with ContentListWidgets??
9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	509 return ac;
9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	510 }
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	511 }
142 9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	512 auto a = new AlignColumns (columns, parent);
9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	513 if (p) *p ~= a;
9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	514 else instances[id] = [a];
9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	515 return a;
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	516 }
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	517
142 9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	518 /** Create an aligner.
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	519 *
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	520 * After creation, minimal widths should be set for all columns (minWidth) and
142 9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	521 * setWidths must be called before other functions are used.
9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	522 *
9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	523 * Params:
9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	524 * columns = Number of columns. Not expected to change.
9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	525 * parent = The parent of the GridWidget using this aligner. (Used when sharing aligners.) */
9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	526 this (size_t columns, IParentWidget parent) {
111 1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	527 if (columns < 1)
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	528 throw new GuiException("AlignColumns: created with <1 column (code error)");
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	529 minWidth.length = columns;
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	530 sizable.length = columns;
130 c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	531 static if (SIZABILITY & SIZABILITY_ENUM.START_TRUE)
c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	532 sizable[] = true;
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	533 cols = columns;
142 9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	534 this.parent = parent;
111 1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	535 }
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	536
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	537 /** Like IChildWidget's setup; calls sADD delegates. */
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	538 void setup (uint n, uint flags) {
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	539 if (n != setup_n) {
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	540 setup_n = n;
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	541 setupWidths = false;
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	542 reset (cols);
111 1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	543
126 c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 124 diff changeset	544 foreach (cb; cbs)
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 124 diff changeset	545 cb.sADD (n, flags); // set flag 1
111 1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	546 }
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	547 }
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	548
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	549 /** Reset all column information (only keep set callbacks).
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	550 *
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	551 * Widths should be set after calling, as on creation. */
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	552 void reset (size_t columns) {
130 c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	553 assert (columns == cols, "no support for changing number of columns for now");
111 1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	554 minWidth[] = 0;
130 c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	555 static if (SIZABILITY & SIZABILITY_ENUM.START_TRUE)
c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	556 sizable[] = true;
c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	557 else
c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	558 sizable[] = false;
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	559 firstSizable = -1;
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	560 lastSizable = -1;
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	561 }
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	562
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	563 /** Add num "rows" to the aligner. They start at the returned index r, thus the values in
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	564 * minCellWidths to set are minCellWidths[colsr..cols(r+num)].
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	565 *
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	566 * Calling this function is necessary to allocate room in minCellWidths. */
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	567 size_t addRows (size_t num) {
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	568 size_t r = rows;
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	569 rows += num;
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	570 minCellWidths.length = cols*rows;
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	571 return r;
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	572 }
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	573
95 2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	574 /** Initialize widths, either from minWidths or from supplied list, checking validity.
2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	575 *
2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	576 * Also calculates first/lastSizable from sizable, overall minimal width and column positions.
2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	577 */
2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	578 void setWidths (wdim[] data = null) {
111 1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	579 if (!setupWidths) {
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	580 setupWidths = true;
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	581
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	582 // Set minWidth
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	583 assert (minCellWidths.length == rows * cols, "minCellWidths: bad length");
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	584 for (size_t c = 0; c < cols; ++c)
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	585 for (size_t r = 0; r < rows; ++r) {
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	586 wdim mcw = minCellWidths[c+r*cols];
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	587 if (minWidth[c] < mcw)
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	588 minWidth[c] = mcw;
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	589 }
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	590
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	591 /* Calculate the minimal width of all columns plus spacing. */
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	592 mw = spacing * cast(wdim)(cols - 1);
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	593 foreach (imw; minWidth)
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	594 mw += imw;
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	595
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	596 // set width
111 1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	597 if (data \|\| width) { // use existing/external data: need to check validity
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	598 if (data) {
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	599 assert (data.length == cols, "setWidths called with bad data length (code error)");
111 1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	600 width = data.dup; // data is shared by other widgets with same id so must be .dup'ed
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	601 }
95 2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	602 foreach (i, m; minWidth) {
2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	603 if (!sizable[i] \|\| width[i] < m) // if width is fixed or less than minimum
2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	604 width[i] = m;
2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	605 }
2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	606 } else
2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	607 width = minWidth.dup;
2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	608
2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	609 genPositions;
2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	610
2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	611 foreach (i,s; sizable) {
2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	612 if (s) {
2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	613 firstSizable = i;
2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	614 goto gotFirst;
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	615 }
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	616 }
95 2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	617 return; // none resizable - don't search for lastSizable
2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	618 gotFirst:
2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	619 foreach_reverse (i,s; sizable) {
2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	620 if (s) {
2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	621 lastSizable = i;
2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	622 return; // done
2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	623 }
2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	624 }
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	625 }
90 b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	626 }
b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	627
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	628 /** Get the row/column of relative position l.
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	629 *
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	630 * returns:
95 2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	631 * -i if in space to left of col i, or i if on col i. */
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	632 ptrdiff_t getCell (wdim l) {
95 2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	633 debug assert (width, "AlignColumns not initialized when getCell called (code error)");
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	634 ptrdiff_t i = cols - 1; // starting from right...
90 b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	635 while (l < pos[i]) { // decrement while left of this column
b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	636 debug assert (i > 0, "getCell: l < pos[0] (code error)");
b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	637 --i;
b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	638 } // now (l >= pos[i])
95 2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	639 if (l >= pos[i] + width[i]) { // between columns
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	640 debug assert (i+1 < cols, "getCell: l >= total width (code error)");
90 b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	641 return -i - 1; // note: i might be 0 so cannot just return -i
45 0fd51d2c6c8a Several changes to resising windows and layout widgets. This commit still has some bugs. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	642 }
90 b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	643 return i;
b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	644 }
b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	645
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	646 /** Adjust total size with direction dir.
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	647 *
139 29a524e7c858 Fixed a resizing issue and added a popup menu for all content. Diggory Hardy <diggory.hardy@gmail.com> parents: 138 diff changeset	648 * nw should be at least the minimal width.
29a524e7c858 Fixed a resizing issue and added a popup menu for all content. Diggory Hardy <diggory.hardy@gmail.com> parents: 138 diff changeset	649 *
29a524e7c858 Fixed a resizing issue and added a popup menu for all content. Diggory Hardy <diggory.hardy@gmail.com> parents: 138 diff changeset	650 * Returns: the final width */
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	651 wdim resizeWidth (wdim nw, int dir) {
95 2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	652 debug assert (width, "AlignColumns not initialized when resizeWidth called (code error)");
139 29a524e7c858 Fixed a resizing issue and added a popup menu for all content. Diggory Hardy <diggory.hardy@gmail.com> parents: 138 diff changeset	653 debug if (nw < mw) {
29a524e7c858 Fixed a resizing issue and added a popup menu for all content. Diggory Hardy <diggory.hardy@gmail.com> parents: 138 diff changeset	654 logger.warn ("Widget dimension set below minimal (code error)");
29a524e7c858 Fixed a resizing issue and added a popup menu for all content. Diggory Hardy <diggory.hardy@gmail.com> parents: 138 diff changeset	655 return w;
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	656 }
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	657 if (nw == w) return w;
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	658
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	659 wdim diff = nw - w;
95 2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	660 if (firstSizable == -1)
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	661 diff = adjustCellSizes (diff, cols-1, -1);
95 2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	662 else
2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	663 diff = adjustCellSizes (diff, (dir == -1 ? lastSizable : firstSizable), dir);
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	664 genPositions;
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	665
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	666 debug if (nw != w) {
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	667 logger.trace ("resizeWidth on {} to {} failed, new width: {}, diff {}, firstSizable {}, columns {}",cast(void*)this, nw,w, diff, firstSizable, cols);
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	668 /+ Also print column widths & positions:
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	669 logger.trace ("resizeWidth to {} failed! Column dimensions and positions:",nw);
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	670 foreach (i,w; width)
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	671 logger.trace ("\t{}\t{}", w,pos[i]);+/
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	672 }
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	673 return w;
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	674 }
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	675
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	676 /** Calculate resizeU/resizeD, and return true if unable to resize.
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	677 *
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	678 * This and resizeCols are for moving dividers between cells. */
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	679 bool findResizeCols (wdim l) {
90 b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	680 resizeU = -getCell (l); // potential start for upward-resizes
95 2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	681 if (resizeU <= 0)
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	682 return true; // not on a space between cells
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	683 resizeD = resizeU - 1; // potential start for downward-resizes
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	684
90 b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	685 while (!sizable[resizeU]) { // find first actually resizable column (upwards)
b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	686 ++resizeU;
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	687 if (resizeU >= cols) { // cannot resize
90 b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	688 resizeU = -1;
b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	689 return true;
b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	690 }
b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	691 }
b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	692
b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	693 while (!sizable[resizeD]) { // find first actually resizable column (downwards)
b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	694 --resizeD;
b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	695 if (resizeD < 0) { // cannot resize
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	696 resizeU = -1; // resizeU is tested to check whether resizes are possible
90 b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	697 return true;
b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	698 }
45 0fd51d2c6c8a Several changes to resising windows and layout widgets. This commit still has some bugs. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	699 }
0fd51d2c6c8a Several changes to resising windows and layout widgets. This commit still has some bugs. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	700
90 b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	701 return false; // can resize
b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	702 }
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	703 /// Resize columns based on findResizeCols
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	704 void resizeCols (wdim diff)
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	705 {
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	706 if (resizeU <= 0) return;
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	707
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	708 // do shrinking first (in case we hit the minimum)
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	709 if (diff >= 0) {
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	710 diff = -adjustCellSizes (-diff, resizeU, 1);
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	711 adjustCellSizes (diff, resizeD, -1);
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	712 } else {
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	713 diff = -adjustCellSizes (diff, resizeD, -1);
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	714 adjustCellSizes (diff, resizeU, 1);
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	715 }
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	716 genPositions;
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	717 }
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	718
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	719 /** Called when one of the cells in column col now has minimal width nmw.
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	720 *
140 c94ec5594449 Fixed a bug with changing the minimal size and optimised it slightly. Diggory Hardy <diggory.hardy@gmail.com> parents: 139 diff changeset	721 * Enlarges column minimal width if necessary; tries to keep total width
c94ec5594449 Fixed a bug with changing the minimal size and optimised it slightly. Diggory Hardy <diggory.hardy@gmail.com> parents: 139 diff changeset	722 * the same.
c94ec5594449 Fixed a bug with changing the minimal size and optimised it slightly. Diggory Hardy <diggory.hardy@gmail.com> parents: 139 diff changeset	723 *
c94ec5594449 Fixed a bug with changing the minimal size and optimised it slightly. Diggory Hardy <diggory.hardy@gmail.com> parents: 139 diff changeset	724 * Returns: true if min-width changes (callbacks do necessary work),
c94ec5594449 Fixed a bug with changing the minimal size and optimised it slightly. Diggory Hardy <diggory.hardy@gmail.com> parents: 139 diff changeset	725 * false if no change to mw (position should still be reset). */
c94ec5594449 Fixed a bug with changing the minimal size and optimised it slightly. Diggory Hardy <diggory.hardy@gmail.com> parents: 139 diff changeset	726 bool newMinWidth (size_t col, size_t row, wdim nmw) {
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	727 minCellWidths[col + row*cols] = nmw;
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	728 wdim nd = 0; // negative diff to keep overall size constant if possible
126 c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 124 diff changeset	729 if (minWidth[col] < nmw) { // increase minimal
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	730 minWidth[col] = nmw;
126 c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 124 diff changeset	731 nd = width[col] - nmw; // negative diff
139 29a524e7c858 Fixed a resizing issue and added a popup menu for all content. Diggory Hardy <diggory.hardy@gmail.com> parents: 138 diff changeset	732 if (nd > 0)
140 c94ec5594449 Fixed a bug with changing the minimal size and optimised it slightly. Diggory Hardy <diggory.hardy@gmail.com> parents: 139 diff changeset	733 nd = 0; // Don't decrease if already larger (mustn't shrink self)
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	734 } else if (minWidth[col] > nmw) { // potentially decrease minimal
140 c94ec5594449 Fixed a bug with changing the minimal size and optimised it slightly. Diggory Hardy <diggory.hardy@gmail.com> parents: 139 diff changeset	735 // set nmw to max of all cell min widths in col:
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	736 for (size_t r = 0; r < rows; ++r) {
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	737 wdim mcw = minCellWidths[col+r*cols];
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	738 if (nmw < mcw)
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	739 nmw = mcw;
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	740 }
140 c94ec5594449 Fixed a bug with changing the minimal size and optimised it slightly. Diggory Hardy <diggory.hardy@gmail.com> parents: 139 diff changeset	741 if (minWidth[col] == nmw) // no change
c94ec5594449 Fixed a bug with changing the minimal size and optimised it slightly. Diggory Hardy <diggory.hardy@gmail.com> parents: 139 diff changeset	742 return false;
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	743 minWidth[col] = nmw;
139 29a524e7c858 Fixed a resizing issue and added a popup menu for all content. Diggory Hardy <diggory.hardy@gmail.com> parents: 138 diff changeset	744 if (!sizable[col] && lastSizable >= 0)
29a524e7c858 Fixed a resizing issue and added a popup menu for all content. Diggory Hardy <diggory.hardy@gmail.com> parents: 138 diff changeset	745 nd = width[col] - nmw; // Not resizable but another column is
140 c94ec5594449 Fixed a bug with changing the minimal size and optimised it slightly. Diggory Hardy <diggory.hardy@gmail.com> parents: 139 diff changeset	746 // Else leave larger; mustn't shrink ourself
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	747 } else
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	748 return false;
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	749
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	750 mw = spacing * cast(wdim)(cols - 1);
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	751 foreach (imw; minWidth)
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	752 mw += imw;
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	753
129 ad91de8867a0 Added a widget size printing debug function. Fixed a bug in SwitchWidget. Diggory Hardy <diggory.hardy@gmail.com> parents: 126 diff changeset	754 if (nd != 0) { // needs enlarging or shrinking
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	755 width[col] = nmw;
126 c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 124 diff changeset	756 foreach (cb; cbs)
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 124 diff changeset	757 cb.setWidth (col, nmw, -1);
142 9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	758 if (lastSizable >= 0)
9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	759 adjustCellSizes (nd, lastSizable, -1);
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	760 }
140 c94ec5594449 Fixed a bug with changing the minimal size and optimised it slightly. Diggory Hardy <diggory.hardy@gmail.com> parents: 139 diff changeset	761
142 9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	762 debug wdim ow = w;
9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	763 genPositions;
9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	764 debug if (w < ow)
9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	765 logger.error ("newMinWidth: shrunk (code error); w={}, ow={}, nd={}", w,ow,nd);
9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	766
141 6f69a9c111eb Fix for using BoolContentWidget in a menu. Made popups' widths match their parents under certain conditions. Diggory Hardy <diggory.hardy@gmail.com> parents: 140 diff changeset	767 //debug logger.trace ("newMW for col: minWidth: {}, nmw: {}, col: {}, nd: {}, mw: {}, w: {}", minWidth, nmw, col, nd, mw, w);
126 c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 124 diff changeset	768 foreach (cb; cbs)
140 c94ec5594449 Fixed a bug with changing the minimal size and optimised it slightly. Diggory Hardy <diggory.hardy@gmail.com> parents: 139 diff changeset	769 cb.newMW ();
c94ec5594449 Fixed a bug with changing the minimal size and optimised it slightly. Diggory Hardy <diggory.hardy@gmail.com> parents: 139 diff changeset	770 return true;
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	771 }
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	772
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	773 /* Generate position infomation for each column and set w. */
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	774 private void genPositions () {
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	775 pos.length = cols;
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	776
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	777 w = 0;
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	778 foreach (i, cw; width) {
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	779 pos[i] = w;
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	780 w += cw + spacing;
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	781 }
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	782 w -= spacing;
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	783 }
90 b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	784
b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	785 /* Adjust the total size of rows/columns (including spacing) by diff.
b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	786 *
b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	787 * Params:
b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	788 * diff = amount to increase/decrease the total size
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	789 * start= index for col/row to start resizing on; assumed to be sizable
90 b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	790 * incr = direction to resize in (added to index each step). Must be either -1 or +1.
b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	791 *
b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	792 * Returns:
b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	793 * The amount adjusted. This may be larger than diff, since cellD is clamped by cellDMin.
b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	794 *
139 29a524e7c858 Fixed a resizing issue and added a popup menu for all content. Diggory Hardy <diggory.hardy@gmail.com> parents: 138 diff changeset	795 * Will shrink non-sizable columns if they're over minimal size.
29a524e7c858 Fixed a resizing issue and added a popup menu for all content. Diggory Hardy <diggory.hardy@gmail.com> parents: 138 diff changeset	796 * Will increase column start, since it's assumed sizable.
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	797 *
139 29a524e7c858 Fixed a resizing issue and added a popup menu for all content. Diggory Hardy <diggory.hardy@gmail.com> parents: 138 diff changeset	798 * Note: Check variable used for start is valid before calling! If a non-
29a524e7c858 Fixed a resizing issue and added a popup menu for all content. Diggory Hardy <diggory.hardy@gmail.com> parents: 138 diff changeset	799 * sizable column's index is passed, this should get increased (if diff > 0)
29a524e7c858 Fixed a resizing issue and added a popup menu for all content. Diggory Hardy <diggory.hardy@gmail.com> parents: 138 diff changeset	800 * but not decreased. */
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	801 private wdim adjustCellSizes (wdim diff, ptrdiff_t start, int incr)
90 b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	802 in {
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	803 assert (width.length == cols, "CellAlign.adjustCellSizes: width is invalid (code error)");
90 b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	804 // Most likely if passed negative when sizing is disabled:
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	805 assert (start >= 0 && start < cols, "adjustCellSizes: invalid start");
90 b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	806 debug assert (incr == 1 \|\| incr == -1, "adjustCellSizes: invalid incr");
b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	807 } body {
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	808 debug scope(failure) logger.trace ("adjustCellSizes: failure");
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	809 ptrdiff_t i = start;
90 b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	810 if (diff > 0) { // increase size of first resizable cell
b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	811 width[i] += diff;
126 c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 124 diff changeset	812 foreach (cb; cbs)
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 124 diff changeset	813 cb.setWidth (i, width[i], incr);
45 0fd51d2c6c8a Several changes to resising windows and layout widgets. This commit still has some bugs. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	814 }
90 b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	815 else if (diff < 0) { // decrease
b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	816 wdim rd = diff; // running diff
139 29a524e7c858 Fixed a resizing issue and added a popup menu for all content. Diggory Hardy <diggory.hardy@gmail.com> parents: 138 diff changeset	817 while (i >= 0 && i < cols) {
29a524e7c858 Fixed a resizing issue and added a popup menu for all content. Diggory Hardy <diggory.hardy@gmail.com> parents: 138 diff changeset	818 if (width[i] > minWidth[i]) {
29a524e7c858 Fixed a resizing issue and added a popup menu for all content. Diggory Hardy <diggory.hardy@gmail.com> parents: 138 diff changeset	819 width[i] += rd; // decrease this cell's size (but may be too much)
29a524e7c858 Fixed a resizing issue and added a popup menu for all content. Diggory Hardy <diggory.hardy@gmail.com> parents: 138 diff changeset	820 rd = width[i] - minWidth[i];
29a524e7c858 Fixed a resizing issue and added a popup menu for all content. Diggory Hardy <diggory.hardy@gmail.com> parents: 138 diff changeset	821 if (rd >= 0) { // OK; we're done
29a524e7c858 Fixed a resizing issue and added a popup menu for all content. Diggory Hardy <diggory.hardy@gmail.com> parents: 138 diff changeset	822 foreach (cb; cbs)
29a524e7c858 Fixed a resizing issue and added a popup menu for all content. Diggory Hardy <diggory.hardy@gmail.com> parents: 138 diff changeset	823 cb.setWidth (i, width[i], incr);
29a524e7c858 Fixed a resizing issue and added a popup menu for all content. Diggory Hardy <diggory.hardy@gmail.com> parents: 138 diff changeset	824 break; // we hit the mark exactly: diff is correct
29a524e7c858 Fixed a resizing issue and added a popup menu for all content. Diggory Hardy <diggory.hardy@gmail.com> parents: 138 diff changeset	825 }
29a524e7c858 Fixed a resizing issue and added a popup menu for all content. Diggory Hardy <diggory.hardy@gmail.com> parents: 138 diff changeset	826
29a524e7c858 Fixed a resizing issue and added a popup menu for all content. Diggory Hardy <diggory.hardy@gmail.com> parents: 138 diff changeset	827 // else we decreased it too much!
29a524e7c858 Fixed a resizing issue and added a popup menu for all content. Diggory Hardy <diggory.hardy@gmail.com> parents: 138 diff changeset	828 width[i] = minWidth[i];
126 c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 124 diff changeset	829 foreach (cb; cbs)
139 29a524e7c858 Fixed a resizing issue and added a popup menu for all content. Diggory Hardy <diggory.hardy@gmail.com> parents: 138 diff changeset	830 cb.setWidth (i, width[i], incr);
29a524e7c858 Fixed a resizing issue and added a popup menu for all content. Diggory Hardy <diggory.hardy@gmail.com> parents: 138 diff changeset	831 // rd is remainder to decrease by
45 0fd51d2c6c8a Several changes to resising windows and layout widgets. This commit still has some bugs. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	832 }
90 b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	833
139 29a524e7c858 Fixed a resizing issue and added a popup menu for all content. Diggory Hardy <diggory.hardy@gmail.com> parents: 138 diff changeset	834 i += incr;
45 0fd51d2c6c8a Several changes to resising windows and layout widgets. This commit still has some bugs. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	835 }
139 29a524e7c858 Fixed a resizing issue and added a popup menu for all content. Diggory Hardy <diggory.hardy@gmail.com> parents: 138 diff changeset	836 diff -= rd; // still had rd left to decrease (may be 0)
45 0fd51d2c6c8a Several changes to resising windows and layout widgets. This commit still has some bugs. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	837 }
90 b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	838 // else no adjustment needed (diff == 0)
45 0fd51d2c6c8a Several changes to resising windows and layout widgets. This commit still has some bugs. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	839
90 b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	840 return diff;
b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	841 }
b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	842
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	843
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	844 /** Minimal widths per cell.
90 b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	845 *
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	846 * Array of all cells, organised like GridLayoutWidget.subWidgets when representing columns,
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	847 * with rows and columns swapped when representing rows.
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	848 *
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	849 * Then minWidth[i] = min(minCellWidths[i]) (where min acts on an array). */
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	850 wdim[] minCellWidths;
90 b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	851
b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	852 /** For each column i, sizable[i] is true if that column is resizable.
b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	853 *
b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	854 * Set along with minWidth before calling setWidths. */
b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	855 bool[] sizable; // set by genCachedConstructionData
b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	856
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	857 /** Current width, relative position (for each column)
90 b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	858 *
95 2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	859 * Treat as READ ONLY outside this class! */
90 b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	860 wdim[] width; // only adjusted within the class
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	861 wdim[] pos; /// ditto
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	862 wdim spacing; // used by genPositions (which cannot access the layout class's data)
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	863 wdim w,mw; // current & minimal widths
126 c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 124 diff changeset	864
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 124 diff changeset	865 package struct CallbackStruct {
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 124 diff changeset	866 void delegate (size_t,wdim,int) setWidth; // set width of a column, with resize direction
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 124 diff changeset	867 void delegate (uint,uint) sADD; // setupAlignDimData dlgs
140 c94ec5594449 Fixed a bug with changing the minimal size and optimised it slightly. Diggory Hardy <diggory.hardy@gmail.com> parents: 139 diff changeset	868 void delegate () newMW; // propegate or finalize minimal width change
126 c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 124 diff changeset	869 }
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 124 diff changeset	870 CallbackStruct cbs[];
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 124 diff changeset	871
95 2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	872 protected:
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	873 /* Minimal width for each column.
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	874 *
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	875 * Set by setWidths. */
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	876 wdim[] minWidth;
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	877 size_t cols, rows; // number of columns and rows (wrong way round when AlignColumns
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	878 // represents rows)
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	879
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	880 ptrdiff_t resizeD, // resizeCols works down from this index (<0 if not resizing)
90 b525ff28774b Widgets generated dynamically from a list can now be standard widgets selected from data files. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	881 resizeU; // and up from this index
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	882 /* indicies of the first/last resizable column (negative if none are resizable). */
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	883 ptrdiff_t firstSizable = -1, lastSizable = -1; // set by calcFLSbl
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	884 // Callbacks used to actually adjust a column's width:
111 1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	885
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	886 uint setup_n = uint.max; // param n of last setup call
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 109 diff changeset	887 bool setupWidths; // setWidths has been run
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	888
142 9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	889 IParentWidget parent; // Used to determine when to share aligner
9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	890
9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	891 static HashMap!(widgetID,AlignColumns[]) instances;
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	892 static this () {
142 9dabcc44f515 Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable). Diggory Hardy <diggory.hardy@gmail.com> parents: 141 diff changeset	893 instances = new HashMap!(widgetID,AlignColumns[]);
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 90 diff changeset	894 }
118 9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	895
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: 130 diff changeset	896 alias IParentWidget.SIZABILITY SIZABILITY;
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: 130 diff changeset	897 alias IParentWidget.SIZABILITY_ENUM SIZABILITY_ENUM;
130 c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 129 diff changeset	898
118 9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	899 debug invariant()
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	900 {
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	901 if (setupWidths) {
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	902 assert (width.length == cols, "invariant: bad width length");
118 9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	903 wdim x = 0;
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	904 foreach (i,w; width) {
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	905 assert (minWidth[i] <= w, "invariant: min size not reached"); // even when "not sizable", cols may get enlarged
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	906 assert (x == pos[i], "invariant: position wrong");
118 9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	907 x += w + spacing;
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	908 }
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	909 assert (x - spacing == w, "invariant: w is wrong");
a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	910 x = spacing * cast(wdim)(cols - 1);
118 9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	911 foreach (mw; minWidth)
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	912 x += mw;
124 a2ef6b549101 Dynamic minimal size changing is now fully supported. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	913 assert (x == mw, "invariant: mw is wrong");
118 9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	914 }
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	915 }
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	916
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	917 debug (mdeUnitTest) unittest {
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	918 bool throws (void delegate() dg) {
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	919 bool r = false;
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	920 try {
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	921 dg();
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	922 } catch (Exception e) {
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	923 r = true;
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	924 }
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	925 return r;
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	926 }
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	927
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	928 AlignColumns a, a2, b;
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	929 a = getInstance ("a", 2);
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	930 a2 = getInstance ("a", 2);
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	931 b = getInstance ("b", 5);
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	932 assert (a is a2);
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	933 assert (a !is b);
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	934 assert (throws ({ getInstance ("a", 4); }));
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	935
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	936 a.setup (0, 3);
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	937 a.spacing = 6;
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	938 a.minWidth[0] = 50;
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	939 a.minWidth[1] = 6;
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	940 a.sizable[1] = true;
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	941 a.setWidths;
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	942 assert (a.w == 62);
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	943
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	944 b.setup (0,3);
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	945 b.spacing = 2;
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	946 foreach (ref wd; b.minWidth)
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	947 wd = 10;
136 4084f07f2c7a Added simpler mergetag readers and writers, with unittest. Diggory Hardy <diggory.hardy@gmail.com> parents: 133 diff changeset	948 b.sizable = [false, true, false, true, false];
118 9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	949 b.setWidths;
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	950 assert (b.w == 58);
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	951
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	952 assert (b.resizeWidth (60, -1) == 60);
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	953 assert (b.width[3] == 12);
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	954
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	955 logger.info ("Unittest complete.");
9ac208b53582 Unittest for mde.gui.widget.layout. Diggory Hardy <diggory.hardy@gmail.com> parents: 115 diff changeset	956 }
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	957 }

Mercurial > projects > mde

annotate mde/gui/widget/layout.d @ 144:66c58e5b0062