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

annotate mde/gui/widget/layout.d @ 77:3dfd934100f7

Continuing widget data changes started in last commit: all previous widgets work again now (but lacking saving).

author	Diggory Hardy <diggory.hardy@gmail.com>
date	Tue, 29 Jul 2008 17:11:22 +0100
parents	159775502bb4
children	79a1809421aa

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
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	19 import mde.gui.widget.Widget;
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
72 159775502bb4 The first dynamically generated widget lists, based on Options, are here! Diggory Hardy <diggory.hardy@gmail.com> parents: 71 diff changeset	22 import mde.gui.widget.TextWidget;
159775502bb4 The first dynamically generated widget lists, based on Options, are here! Diggory Hardy <diggory.hardy@gmail.com> parents: 71 diff changeset	23 import mde.gui.content.options;
159775502bb4 The first dynamically generated widget lists, based on Options, are here! Diggory Hardy <diggory.hardy@gmail.com> parents: 71 diff changeset	24
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	25 debug {
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	26 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	27 private Logger logger;
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	28 static this () {
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	29 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	30 }
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
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	33 /*************************************************************************************************
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 * 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	35 *
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 * Currently there is no support for changing number of cells, sub-widgets or sub-widget properties
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 * (namely isW/HSizable and minimal size) after this() has run.
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	38 *
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 * 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	40 *
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	41 * The grid has no border but has spacing between 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	42 *************************************************************************************************/
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	43 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	44 {
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	45 /** 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	46 *
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	47 * Widget uses the initialisation data:
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	48 * [widgetID, r, c, w11, w12, ..., w1c, ..., wr1, ..., wrc]
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	49 * where r and c are the number of rows and columns, and wij is the ID (from parent Window's
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	50 * list) for the widget in row i and column j. The number of parameters must be rc + 3. /
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	51 this (IWidgetManager mgr, WidgetData data) {
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	52 // Get grid size and check data
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	53 // Check sufficient data for rows, cols, and possibly row/col widths.
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	54 if (data.ints.length < 3) throw new WidgetDataException;
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	55
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	56 rows = data.ints[1];
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	57 cols = data.ints[2];
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	58 // Check: at least one sub-widget, ints length == 3 or also contains row & col widths,
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	59 // strings' length is correct:
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	60 if (rows < 1 \|\| cols < 1 \|\|
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	61 (data.ints.length != 3 && data.ints.length != 3 + rows + cols) \|\|
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	62 data.strings.length != rows * cols)
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	63 throw new WidgetDataException;
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	64
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	65 // 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	66 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	67 foreach (i, ref subWidget; subWidgets) {
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	68 subWidget = mgr.makeWidget (data.strings[i]);
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	69 }
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	70
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	71 super (mgr, data);
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
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	73 if (data.ints.length == 3 + rows + cols) {
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	74 col.setCheck (cast(wdim[]) data.ints[3..cols+3]);
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	75 row.setCheck (cast(wdim[]) data.ints[cols+3..$]);
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	76 } else {
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	77 col.dupMin;
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	78 row.dupMin;
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	79 }
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	80 adjustCache;
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	81 }
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	82 /+FIXME
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	83 /** Return construction data to recreate this GridLayoutWidget. */
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	84 int[] getCreationData () {
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 int[] ret;
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 ret.length = 3 + subWidgets.length;
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 ret [0..3] = [widgetType, rows, cols]; // first data
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	89
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	90 foreach (i,widget; subWidgets) // sub 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	91 ret[i+3] = window.addCreationData (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	92
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 return ret;
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	94 }+/
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 }
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	96
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	97
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	98 /*************************************************************************************************
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	99 * Trial layout of sub-widgets of one type only.
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	100 *************************************************************************************************/
72 159775502bb4 The first dynamically generated widget lists, based on Options, are here! Diggory Hardy <diggory.hardy@gmail.com> parents: 71 diff changeset	101 class TrialContentLayoutWidget : 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	102 {
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	103 this (IWidgetManager mgr, WidgetData data) {
72 159775502bb4 The first dynamically generated widget lists, based on Options, are here! Diggory Hardy <diggory.hardy@gmail.com> parents: 71 diff changeset	104 debug scope (failure)
159775502bb4 The first dynamically generated widget lists, based on Options, are here! Diggory Hardy <diggory.hardy@gmail.com> parents: 71 diff changeset	105 logger.warn ("TrialContentLayoutWidget: failure");
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	106 WDCheck (data, 2);
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	107
72 159775502bb4 The first dynamically generated widget lists, based on Options, are here! Diggory Hardy <diggory.hardy@gmail.com> parents: 71 diff changeset	108 OptionList optsList = OptionList.trial();
159775502bb4 The first dynamically generated widget lists, based on Options, are here! Diggory Hardy <diggory.hardy@gmail.com> parents: 71 diff changeset	109 rows = optsList.list.length;
159775502bb4 The first dynamically generated widget lists, based on Options, are here! Diggory Hardy <diggory.hardy@gmail.com> parents: 71 diff changeset	110 cols = 1;
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	111
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	112 // Get all sub-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	113 subWidgets.length = rows*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	114 WidgetData COWData;
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	115 COWData.ints = [0, data.ints[1]];
72 159775502bb4 The first dynamically generated widget lists, based on Options, are here! Diggory Hardy <diggory.hardy@gmail.com> parents: 71 diff changeset	116 foreach (i, c; optsList.list) {
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	117 subWidgets[i] = new ContentOptionWidget (mgr, COWData, c);
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	118 }
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	119 super (mgr, data);
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	120
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	121 // Set col/row widths to minimals.
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	122 col.dupMin;
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	123 row.dupMin;
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	124 adjustCache;
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	125 }
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	126
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	127 /+FIXME
72 159775502bb4 The first dynamically generated widget lists, based on Options, are here! Diggory Hardy <diggory.hardy@gmail.com> parents: 71 diff changeset	128 int[] getCreationData () {
159775502bb4 The first dynamically generated widget lists, based on Options, are here! Diggory Hardy <diggory.hardy@gmail.com> parents: 71 diff changeset	129 return [widgetType];
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	130 }+/
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	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:
159775502bb4 The first dynamically generated widget lists, based on Options, are here! Diggory Hardy <diggory.hardy@gmail.com> parents: 71 diff changeset	133 OptionList optsList;
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)
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	141 * and provide an implementation of getCreationData() (unless Widget's version is sufficient).
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 *
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	145 * The grid has no border but has spacing between 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	146 *************************************************************************************************/
72 159775502bb4 The first dynamically generated widget lists, based on Options, are here! Diggory Hardy <diggory.hardy@gmail.com> parents: 71 diff changeset	147 abstract class GridWidget : Widget
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	148 {
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	149 //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	150 /** 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	151 *
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	152 * Deriving classes should check data lengths, and set rows, cols, and the subWidgets array,
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	153 * before calling this super constructor. (If it's necessary to call super(...) first,
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	154 * the call to genCachedConstructionData can be moved to the derived this() methods.)
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	155 *
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	156 * Derived constructors should call either dupMin or setCheck on col and row, and then call
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	157 * adjustCache, after calling this. */
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	158 protected this (IWidgetManager mgr, WidgetData data) {
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	159 super (mgr, data);
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	160
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	161 // Needn't be set before genCachedConstructionData is called:
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	162 col.setColWidth = &setColWidth;
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	163 row.setColWidth = &setRowHeight;
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	164
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	165 // Calculate cached construction data
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	166 genCachedConstructionData;
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	167 }
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	168
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	169 /** Generates cached mutable data.
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	170 *
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	171 * Should be called by adjust() after setting col and row widths (currently via dupMin or
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	172 * setCheck). */
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	173 void adjustCache () {
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	174 // Generate cached mutable data
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	175 // Calculate column and row locations:
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	176 w = col.genPositions;
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	177 h = row.genPositions;
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	178
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	179 // Tell subwidgets their new sizes. Positions are given by a later call to setPosition.
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	180 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	181 // Resizing direction is arbitrarily set to negative:
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	182 widget.setWidth (col.width[i % cols], -1);
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	183 widget.setHeight (row.width[i / cols], -1);
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	184 }
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	185 }
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	186 /+ FIXME - saving
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	187 /** Returns sub-widget mutable data along with column widths and row heights, as used by
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	188 * adjust(). */
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	189 int[] getMutableData () {
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	190 int[] ret;
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	191 foreach (widget; subWidgets)
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	192 ret ~= widget.getMutableData;
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	193
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	194 return ret ~ cast(int[])col.width ~ cast(int[])row.width;
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	195 }+/
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	196 //END Creation & saving
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	197
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	198 //BEGIN Size & position
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	199 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	200 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	201 }
052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	202 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	203 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	204 }
052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	205
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	206 void setWidth (wdim nw, int 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	207 if (nw == w) return;
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	208
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	209 w += col.adjustCellSizes (nw - w, (dir == -1 ? col.lastSizable : col.firstSizable), dir);
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	210
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	211 // 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	212 }
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	213 void setHeight (wdim nh, int 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	214 if (nh == h) return;
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	215
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	216 h += row.adjustCellSizes (nh - h, (dir == -1 ? row.lastSizable : row.firstSizable), 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	217
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	218 // 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	219 }
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	220
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	221 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	222 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	223 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	224
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	225 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	226 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	227 }
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	228 //END Size & position
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	229
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
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	231 // Find the relevant widget.
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	232 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	233 debug scope (failure)
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	234 logger.warn ("getWidget: failure");
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	235 // Find row/column:
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	236 myDiff i = col.getCell (cx - x);
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	237 myDiff j = row.getCell (cy - y);
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	238 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	239 return this;
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	240
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	241 // 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	242 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	243 }
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	244
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	245 // Resizing columns & 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	246 void 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	247 debug scope (failure)
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	248 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	249 if (b == 1 && state == true) {
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	250 /* 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	251 * 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	252 * 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	253
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	254 // find col/row's resizeD & resizeU
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	255 if (col.findResize (cx - x) && row.findResize (cy - y))
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	256 return; // unable to resize
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	257
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	258 dragX = cx;
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	259 dragY = cy;
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	260
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	261 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	262 mgr.addMotionCallback (&resizeCallback);
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	263 }
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	264 }
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	265
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	266 void 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	267 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	268
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	269 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	270 widget.draw ();
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	271 }
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	272
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	273 private:
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	274 //BEGIN Cache calculation functions
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	275 /* Calculations which need to be run whenever a new sub-widget structure is set
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	276 * (i.e. to produce cached data calculated from construction data).
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	277 * Also need to be re-run if the renderer changes.
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	278 *
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	279 * rows, cols and subWidgets must be set before calling. */
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	280 void genCachedConstructionData () {
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	281 // Will only change if renderer changes:
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	282 col.spacing = row.spacing = mgr.renderer.layoutSpacing;
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
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	284 // Calculate the minimal column and row sizes:
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	285 // set length, making sure the arrays are initialised to zero:
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	286 col.minWidth = new wdim[cols];
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	287 row.minWidth = new wdim[rows];
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	288 foreach (i,widget; subWidgets) {
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	289 // Increase dimensions if current minimal size is larger:
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 myIt n = i % cols; // column
66 f54ae4fc2b2f Replaced IWidget.getMinimalSize(out w,out h) with minWidth() and minHeight(). Diggory Hardy <diggory.hardy@gmail.com> parents: 65 diff changeset	291 wdim md = widget.minWidth;
f54ae4fc2b2f Replaced IWidget.getMinimalSize(out w,out h) with minWidth() and minHeight(). Diggory Hardy <diggory.hardy@gmail.com> parents: 65 diff changeset	292 if (col.minWidth[n] < md) col.minWidth[n] = md;
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 n = i / cols; // row
66 f54ae4fc2b2f Replaced IWidget.getMinimalSize(out w,out h) with minWidth() and minHeight(). Diggory Hardy <diggory.hardy@gmail.com> parents: 65 diff changeset	294 md = widget.minHeight;
f54ae4fc2b2f Replaced IWidget.getMinimalSize(out w,out h) with minWidth() and minHeight(). Diggory Hardy <diggory.hardy@gmail.com> parents: 65 diff changeset	295 if (row.minWidth[n] < md) row.minWidth[n] = md;
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	296 }
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	297
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	298
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	299 // Calculate the overall minimal size, starting with the spacing:
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	300 mh = mgr.renderer.layoutSpacing; // use mh temporarily
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	301 mw = mh * cast(wdim)(cols - 1);
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	302 mh *= cast(wdim)(rows - 1);
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	303
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	304 foreach (x; col.minWidth) // add the column/row's dimensions
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	305 mw += x;
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 foreach (x; row.minWidth)
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	307 mh += x;
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	308
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	309
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	310 // Find which cols/rows are resizable:
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	311 // reset:
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	312 col.sizable = new bool[cols];
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	313 row.sizable = new bool[rows];
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	314 col.firstSizable = row.firstSizable = -1;
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	315
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	316 forCols:
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	317 for (myIt i = 0; i < cols; ++i) { // for each column
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	318 for (myIt j = 0; j < subWidgets.length; j += cols) // for each row
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	319 if (!subWidgets[i+j].isWSizable) // column not resizable
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	320 continue forCols; // continue the outer for loop
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	321
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	322 // column is resizable if we get to here
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	323 col.sizable[i] = true;
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	324 if (col.firstSizable < 0)
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	325 col.firstSizable = i;
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	326 col.lastSizable = i;
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	327 }
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	328
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	329 forRows:
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	330 for (myIt i = 0; i < subWidgets.length; i += cols) { // for each row
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	331 for (myIt j = 0; j < cols; ++j) // for each column
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	332 if (!subWidgets[i+j].isHSizable)
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	333 continue forRows;
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	334
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	335 row.lastSizable = i / cols;
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	336 row.sizable[row.lastSizable] = true;
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	337 if (row.firstSizable < 0)
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	338 row.firstSizable = row.lastSizable;
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	339 }
052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	340 }
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	341 //END Cache calculation functions
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	342
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	343
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	344 void setColWidth (myIt i, wdim w, int 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	345 for (myIt j = 0; j < rows; ++j) {
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	346 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	347 }
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	348 }
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	349 void setRowHeight (myIt j, wdim h, int 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	350 for (myIt i = 0; i < cols; ++i) {
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	351 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	352 }
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	353 }
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	354
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	355
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	356 //BEGIN Col/row resizing callback
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	357 void resizeCallback (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	358 col.resize (cx - dragX);
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	359 row.resize (cy - dragY);
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	360
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	361 // 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	362 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	363 dragY = cy;
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	364
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	365 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	366 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	367 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	368 mgr.requestRedraw;
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	369 }
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	370 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	371 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	372 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	373 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	374 }
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	375 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	376 }
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	377
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	378 protected:
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	379 // 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	380 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	381 //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	382
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	383
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	384 myIt cols, rows; // number of cells in grid
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	385
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	386 /* 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	387 * [ 2 3 ] */
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	388 IChildWidget[] subWidgets;
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	389
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	390 /* Widths, positions, etc., either of columns or of rows
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	391 *
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	392 * The purpose of this struct is mostly to unify functionality which must work the same on both
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	393 * horizontal and vertical cell placement.
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	394 *
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	395 * Most notation corresponds to horizontal layout (columns), simply for easy of naming. */
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	396 struct CellDimensions {
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	397 wdim[] pos, // relative position (cumulative width[i-1] plus spacing)
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	398 width, // current widths
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	399 minWidth; // minimal widths (set by genCachedConstructionData)
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	400 bool[] sizable; // true if col is resizable (set by genCachedConstructionData)
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	401 myDiff firstSizable, // first col which is resizable, negative if none
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	402 lastSizable; // as above, but last (set by genCachedConstructionData)
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	403 myDiff resizeD, // resize down from this index (<0 if not resizing)
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	404 resizeU; // and up from this index
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	405 wdim spacing; // used by genPositions (which cannot access the layout class's data)
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	406 /* This is a delegate to a enclosing class's function, since:
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	407 * a different implementation is needed for cols or rows
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 * we're unable to access enclosing class members directly */
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	409 void delegate (myIt,wdim,int) setColWidth; // set width of a column, with resize direction
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	410
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	411 void dupMin () {
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	412 width = minWidth.dup;
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	413 }
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	414 void setCheck (wdim[] data) {
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	415 // Set to provided data:
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	416 width = data;
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	417 // And check sizes are valid:
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	418 foreach (i, m; minWidth)
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	419 // if fixed width or width is less than minimum:
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	420 if (!sizable[i] \|\| width[i] < m)
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	421 width[i] = m;
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	422 }
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	423
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	424 // Generate position infomation and return total width (i.e. widget width/height)
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	425 wdim genPositions () {
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	426 pos.length = minWidth.length;
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	427
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	428 wdim x = 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	429 foreach (i, w; width) {
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	430 pos[i] = x;
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	431 x += w + spacing;
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 }
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 return x - spacing;
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 }
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	435
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	436 // Get the row/column a click occured in
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	437 // Returns -i if in space to left of col i, or i if on col i
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	438 myDiff getCell (wdim l) {
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	439 myDiff i = minWidth.length - 1; // starting from right...
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	440 while (l < pos[i]) { // decrement while left of this column
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	441 debug assert (i > 0, "getCell: l < pos[0] (code error)");
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	442 --i;
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	443 } // now (l >= pos[i])
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 if (l >= pos[i] + width[i]) // between columns
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	445 return -i - 1; // note: i might be 0 so cannot just return -i
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 i;
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	447 }
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	448
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	449 // Calculate resizeU/resizeD, and return true if unable to resize.
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	450 bool findResize (wdim l) {
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	451 resizeU = -getCell (l); // potential start for upward-resizes
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	452 if (resizeU <= 0) return true; // not on a space between cells
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	453 resizeD = resizeU - 1; // potential start for downward-resizes
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	454
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	455 while (!sizable[resizeU]) { // find first actually resizable column (upwards)
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	456 ++resizeU;
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	457 if (resizeU >= minWidth.length) { // cannot resize
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	458 resizeU = -1;
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	459 return true;
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	460 }
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	461 }
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	462
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	463 while (!sizable[resizeD]) { // find first actually resizable column (downwards)
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	464 --resizeD;
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	465 if (resizeD < 0) { // cannot resize
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	466 resizeU = -1; // resizeU is tested to check whether resizes are possible
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	467 return true;
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	468 }
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	469 }
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	470
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	471 return false; // can resize
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	472 }
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	473
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	474 /* Adjust the total size of rows/columns (including spacing) by diff.
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	475 *
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	476 * Params:
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	477 * diff = amount to increase/decrease the total size
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	478 * start= index for col/row to start resizing on
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	479 * incr = direction to resize in (added to index each step). Must be either -1 or +1.
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	480 *
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	481 * Returns:
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	482 * The amount adjusted. This may be larger than diff, since cellD is clamped by cellDMin.
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	483 *
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	484 * Note: Check variable used for start is valid before calling! If a non-sizable column's
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	485 * index is passed, this should get increased (if diff > 0) but not decreased.
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	486 */
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	487 wdim adjustCellSizes (wdim diff, myDiff start, int incr)
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	488 in {
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	489 // Could occur if constructor doesn't call dupMin/setCheck (code error):
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	490 assert (width !is null, "adjustCellSizes: width is null");
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	491 // Most likely if passed negative when sizing is disabled:
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	492 assert (start >= 0 && start < minWidth.length, "adjustCellSizes: invalid start");
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	493 assert (incr == 1 \|\| incr == -1, "adjustCellSizes: invalid incr");
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	494 assert (setColWidth !is null, "adjustCellSizes: setColWidth is null");
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	495 } body {
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	496 debug scope(failure)
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	497 logger.trace ("adjustCellSizes: failure");
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	498 myDiff i = start;
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	499 if (diff > 0) { // increase size of first resizable cell
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	500 width[i] += diff;
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	501 setColWidth (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	502 }
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	503 else if (diff < 0) { // decrease
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	504 wdim rd = diff; // running diff
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	505 aCSwhile:
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	506 while (true) {
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	507 width[i] += rd; // decrease this cell's size (but may be too much)
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	508 rd = width[i] - minWidth[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	509 if (rd >= 0) { // OK; we're done
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	510 setColWidth (i, width[i], incr); // set new width
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	511 break; // we hit the mark exactly: diff is correct
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	512 }
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	513
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	514 // else we decreased it too much!
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	515 width[i] = minWidth[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	516 setColWidth (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	517 // rd is remainder to decrease by
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	518
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	519
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	520 bool it = true; // iterate (force first time)
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	521 while (it) {
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	522 i += incr;
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	523 if (i < 0 \|\| i >= minWidth.length) { // run out of next cells
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	524 diff -= rd; // still had rd left to decrease
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	525 break aCSwhile; // exception: Array index out of bounds
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	526 }
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	527 it = !sizable[i]; // iterate again if row/col isn't resizable
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	528 }
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	529 }
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	530 }
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	531 // else no adjustment needed (diff == 0)
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	532
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	533 genPositions;
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	534 return diff;
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	535 }
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	536
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	537 void resize (wdim diff) {
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	538 if (resizeU <= 0) return;
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	539
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	540 // do shrinking first (in case we hit the minimum)
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	541 if (diff >= 0) {
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	542 diff = -adjustCellSizes (-diff, resizeU, 1);
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	543 adjustCellSizes (diff, resizeD, -1);
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	544 } else {
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	545 diff = -adjustCellSizes (diff, resizeD, -1);
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	546 adjustCellSizes (diff, resizeU, 1);
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	547 }
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	548 }
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	549 }
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	550 CellDimensions col, row;
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	551
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	552 // Index types. Note that in some cases they need to hold negative values.
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	553 // int is used for resizing direction (although ptrdiff_t would be more appropriate),
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	554 // since the value must always be -1 or +1 and int is smaller on X86_64.
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	555 alias size_t myIt;
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	556 alias ptrdiff_t myDiff;
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	557 }

Mercurial > projects > mde

annotate mde/gui/widget/layout.d @ 77:3dfd934100f7