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

annotate mde/gui/widget/layout.d @ 43:1530d9c04d4d

Column/row resizing implemented for GridLayoutWidget (finally)! Also new exitImmediately option and a few debug scope(failure) log messages. committer: Diggory Hardy <diggory.hardy@gmail.com>

author	Diggory Hardy <diggory.hardy@gmail.com>
date	Thu, 15 May 2008 10:39:57 +0100
parents	8bf53e711cc7
children	0fd51d2c6c8a

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
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	22 import tango.io.Stdout;
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	23 debug {
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	24 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	25 private Logger logger;
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	26 static this () {
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	27 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	28 }
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	29 }
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	30
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	31 /** Encapsulates a grid of Widgets.
052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	32 *
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	33 * Currently there is no support for changing number of cells, sub-widgets or sub-widget properties
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	34 * (namely isW/HSizable and minimal size) after this() has run.
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	35 *
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	36 * Since a grid with either dimension zero is not useful, there must be at least one sub-widget.
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	37 *
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	38 * The grid has no border but has spacing between widgets. */
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	39 class GridLayoutWidget : Widget
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	40 {
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	41 this (IWindow wind, int[] 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	42 // Get grid size and check data
052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	43 // Check sufficient data for rows, cols, and at least one widget:
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	44 if (data.length < 4) throw new WidgetDataException;
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	45 super (wind, data);
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	46
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	47 rows = data[1];
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	48 cols = data[2];
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	49 if (data.length != 3 + rows * cols) throw new WidgetDataException;
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	50 /* data.length >= 3 so besides checking the length is correct, this tells us:
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	51 * rows * cols >= 4 - 3 = 1 a free check!
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 * The only thing not checked is whether both rows and cols are negative, which would
052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	53 * cause an exception when dynamic arrays are allocated later (and is unlikely). */
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	54
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	55 // 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	56 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	57 foreach (i, ref subWidget; subWidgets) {
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	58 subWidget = window.makeWidget (data[i+3]);
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	59 }
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	60
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	61 // 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	62 genCachedConstructionData;
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	63 }
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	64
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	65 int[] adjust (int[] data) {
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	66 // Give all sub-widgets their data:
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	67 foreach (widget; subWidgets)
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	68 data = widget.adjust (data);
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	69
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	70 /* We basically short-cut setSize by loading previous col/row sizes and doing the final
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	71 * calculations.
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	72 * Note: if setSize gets called afterwards, it should have same dimensions and so not do
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	73 * anything. */
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	74
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	75 int lenUsed = 0;
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	76 if (data.length < rows + cols) { // data error; use defaults
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	77 colW = colWMin.dup;
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	78 rowH = rowHMin.dup;
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	79 } else { // sufficient 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	80 lenUsed = rows+cols;
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	81 colW = data[0..cols];
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	82 rowH = data[cols..lenUsed];
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	83
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	84 // Check row sizes are valid:
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	85 //NOTE: this could be made optional
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	86 //NOTE: could also check non-resizable sizes are not too large
41 b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	87 foreach (i, ref w; colW)
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	88 if (w < colWMin[i]) w = colWMin[i];
41 b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	89 foreach (i, ref h; rowH)
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	90 if (h < rowHMin[i]) h = rowHMin[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	91 }
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	92
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	93 genCachedMutableData;
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	94 w = colW[$-1] + colX[$-1];
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	95 h = rowY[$-1] + rowH[$-1];
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	96
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	97 return data[lenUsed..$];
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	98 }
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	99
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	100 int[] getCreationData () {
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	101 int[] ret;
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	102 ret.length = 3 + subWidgets.length;
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	103
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	104 ret [0..3] = [widgetType, rows, cols]; // first data
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	105
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	106 foreach (i,widget; subWidgets) // sub widgets
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	107 ret[i+3] = window.addCreationData (widget);
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	108
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	109 return ret;
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	110 }
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	111 int[] getMutableData () {
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	112 int[] ret;
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	113 foreach (widget; subWidgets)
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	114 ret ~= widget.getMutableData;
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	115
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	116 ret ~= colW ~ rowH;
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	117 return ret;
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	118 }
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	119
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	120 bool isWSizable () {
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	121 return (sizableCols.length != 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	122 }
052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	123
052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	124 bool isHSizable () {
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	125 return (sizableRows.length != 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	126 }
052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	127
052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	128 /* Calculates the minimal size from all rows and columns of widgets. */
052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	129 void getMinimalSize (out int mw, out int mh) {
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	130 mw = this.mw;
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	131 mh = this.mh;
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	132 }
052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	133
052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	134 void setSize (int nw, int nh) {
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	135 // Step 1: calculate the row/column sizes.
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	136 w += adjustCellSizes (colW, colWMin, sizableCols, nw - w, true);
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	137 h += adjustCellSizes (rowH, rowHMin, sizableRows, nh - h, true);
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	138
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	139 // Step 2: calculate the row/column offsets (positions) and set the sub-widget's sizes.
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	140 genCachedMutableData;
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	141
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	142 // Step 3: position needs to be set
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	143 // Currently this happens by specifying that setPosition should be run after setSize.
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	144 }
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	145
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	146 void setPosition (int x, int y) {
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	147 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	148 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	149
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	150 foreach (i,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	151 widget.setPosition (x + colX[i % cols], y + rowY[i / cols]);
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	152 }
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	153
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	154
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	155 // Find the relevant widget.
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	156 IWidget getWidget (int cx, int cy) {
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	157 int lx = cx - x, ly = cy - y; // use coords relative to this widget
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	158
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	159 // Find the column
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	160 int i = cols - 1; // starting from right...
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	161 while (lx < colX[i]) { // decrement while left of this column
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	162 debug assert (i > 0, "getWidget: left of first column"); // should be impossible
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	163 --i;
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	164 } // now (lx >= colX[i])
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	165 if (lx >= colX[i] + colW[i]) return this; // between columns
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	166
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	167 // Find the row;
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	168 int j = rows - 1;
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	169 while (ly < rowY[j]) {
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	170 debug assert (j > 0, "getWidget: above first row"); // should be impossible
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	171 --j;
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	172 }
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	173 if (ly >= rowY[j] + rowH[j]) return this;
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	174
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	175 // Now we know it's in widget (i,j)'s cell (but the widget may not take up the whole cell)
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	176 lx -= colX[i];
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	177 ly -= rowY[j];
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	178 IWidget widg = subWidgets[i + j*cols];
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	179 widg.getCurrentSize (i,j);
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	180 if (lx < i && ly < j)
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	181 return widg.getWidget (cx, cy);
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	182 return this; // wasn't in cell
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	183 }
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	184
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	185 // Resizing columns & rows
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	186 void clickEvent (ushort cx, ushort cy, ubyte b, bool state) {
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	187 debug scope (failure)
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	188 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	189 if (b == 1 && state == true) {
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	190 /* 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	191 * 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	192 * 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	193
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	194 // Find the column
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	195 if (sizableCols.length != 0) {
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	196 int l = cx - x; // use relative coords
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	197 size_t i = cols - 1; // index, from right
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	198 while (l < colX[i]) { // decrement while left of this column
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	199 debug assert (i > 0, "clickEvent: left of first column");
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	200 --i;
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	201 } // now (l >= colX[resizeCol])
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	202 if (l < colX[i] + colW[i]) i = -1; // on a sub-widget
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	203
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	204 // Set resizeColsL / resizeColsH
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	205 // Want to find j such that [0..j],[j..$] divide sizableCols about i:
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	206 size_t j = 0;
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	207 while (j < sizableCols.length && sizableCols[j] <= i) ++j;
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	208
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	209 resizeColsL = sizableCols[0..j];
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	210 resizeColsH = sizableCols[j..$];
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	211
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	212 // Cannot resize if either list is empty. resizeCallback checks the length of L,
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	213 // but to save it checking R too, we set L's length zero if R's is.
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	214 if (resizeColsH.length == 0)
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	215 resizeColsL = null;
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	216 }
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	217
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	218 // Find the row
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	219 if (sizableRows.length != 0) {
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	220 int l = cy - y;
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	221 size_t i = rows - 1;
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	222 while (l < rowY[i]) {
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	223 debug assert (i > 0, "clickEvent: above first row");
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	224 --i;
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	225 }
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	226 if (l < rowY[i] + rowH[i]) i = -1;
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	227
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	228 size_t j = 0;
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	229 while (j < sizableRows.length && sizableRows[j] <= i) ++j;
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	230
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	231 resizeRowsL = sizableRows[0..j];
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	232 resizeRowsH = sizableRows[j..$];
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	233
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	234 if (resizeRowsH.length == 0)
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	235 resizeRowsL = null;
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	236 }
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	237
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	238 if (resizeColsL is null && resizeRowsL is null)
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	239 return; // no resizing to do
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	240
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	241 dragX = cx;
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	242 dragY = cy;
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	243
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	244 window.gui.addClickCallback (&endCallback);
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	245 window.gui.addMotionCallback (&resizeCallback);
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	246 }
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	247 }
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	248
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	249 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	250 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	251
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	252 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	253 widget.draw ();
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	254 }
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	255
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	256 private:
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	257 //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	258 /* Calculations which need to be run whenever a new sub-widget structure is set
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	259 * (i.e. to produce cached data calculated from 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	260 void genCachedConstructionData () {
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	261 // Calculate the minimal column and row sizes:
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	262 colWMin = new int[cols]; // set length, making sure the arrays are initialised to zero
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	263 rowHMin = new int[rows];
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	264 int ww, wh; // sub-widget minimal sizes
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	265 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	266 widget.getMinimalSize (ww, wh);
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	267
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	268 // Increase dimensions if current minimal size is larger:
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	269 uint n = i % cols; // column
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	270 if (colWMin[n] < ww) colWMin[n] = ww;
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	271 n = i / cols; // row
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	272 if (rowHMin[n] < wh) rowHMin[n] = wh;
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	273 }
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	274
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
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	276 // Calculate the overall minimal size, starting with the spacing:
41 b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	277 mh = window.renderer.layoutSpacing; // use mh temporarily
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	278 mw = mh * (cols - 1);
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	279 mh *= (rows - 1);
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
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	281 foreach (x; colWMin) // add the column/row's dimensions
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	282 mw += 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	283 foreach (x; rowHMin)
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 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	285
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	286
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	287 // Find which cols/rows are resizable:
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	288 sizableCols = sizableRows = null; // reset; we're about to concatenate to them
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	289
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	290 forCols:
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	291 for (uint i = 0; i < cols; ++i) { // for each column
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	292 for (uint j = 0; j < subWidgets.length; j += cols) // for each row
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	293 if (!subWidgets[i+j].isWSizable) // column not resizable
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	294 continue forCols; // continue the outer for loop
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	295
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 // column is resizable if we get to here
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	297 sizableCols ~= 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	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
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	300 forRows:
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	301 for (uint i = 0; i < subWidgets.length; i += cols) { // for each row
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	302 for (uint 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	303 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	304 continue forRows;
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	305
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	306 sizableRows ~= i / cols;
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	307 }
052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	308 }
052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	309
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	310 /* Calculations which need to be run whenever resizing occurs (or deeper alterations)
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	311 * (i.e. to produce cached data calculated from construction and mutable 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	312 void genCachedMutableData () {
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	313 // Calculate column and row locations:
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	314 colX.length = cols;
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	315 rowY.length = rows;
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	316 int spacing = window.renderer.layoutSpacing;
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	317
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	318 int cum = 0;
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	319 foreach (i, x; rowH) {
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	320 rowY[i] = cum;
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	321 cum += x + spacing;
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	322 }
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	323
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	324 cum = 0;
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	325 foreach (i, x; colW) {
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	326 colX[i] = cum;
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	327 cum += x + spacing;
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	328 }
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	329
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	330 // Tell subwidgets their new sizes:
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	331 foreach (i,widget; subWidgets)
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	332 widget.setSize (colW[i % cols], rowH[i / cols]);
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	333 }
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	334 //END Cache calculation functions
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	335
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	336 /* Adjust the total size of rows/columns (including spacing) by diff.
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	337 *
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	338 * Params:
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	339 * cellD = current sizes; is adjusted by the function to new sizes
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	340 * cellDMin = minimal sizes (see colWMin/rowHMin)
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	341 * sizableCells= List of indexes in cellD for cells which are resizable
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	342 * diff = amount to increase/decrease the total size
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	343 * startHigh = if true, start resizing from the tail end of cellD, instead of the beginning
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	344 *
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	345 * Returns:
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	346 * The amount adjusted. This may be larger than diff, since cellD is clamped by cellDMin.
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	347 */
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	348 int adjustCellSizes (ref int[] cellD, ref int[] cellDMin, ref size_t[] sizableCells, int diff, bool startHigh)
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	349 in {// Could occur if adjust isn't called first, but this would be a code error:
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	350 assert (cellD !is null, "adjustCellSizes: cellD is null");
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	351 } body {
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	352 // Cannot resize if no cells are sizable:
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	353 if (sizableCells.length == 0) return 0;
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	354
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	355 size_t si = (startHigh ? sizableCells.length-1 : 0); // starting index of sizableCells
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	356
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	357 // FIXME: could do with an overhaul
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	358 if (diff > 0) { // increase size of first resizable cell
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	359 cellD[sizableCells[si]] += diff;
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	360 return diff;
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	361 }
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	362 else if (diff < 0) { // decrease
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	363 size_t sc = (startHigh ? -1 : 1); // amount to iterate
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	364 size_t ci; // index in cellD
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	365 int rd = diff; // running diff
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	366 while (true) {
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	367 ci = sizableCells[si];
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	368
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	369 cellD[ci] += rd; // decrease this cell's size (but may be too much)
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	370 rd = cellD[ci] - cellDMin[ci];
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	371 if (rd >= 0) // OK; we're done
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	372 return diff;// we hit the mark exactly
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	373
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	374 // else we decreased it too much!
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	375 cellD[ci] = cellDMin[ci];
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	376 // rd is remainder to decrease by
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	377
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	378 si += sc; // iterate
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	379 if (si < 0 \|\| si >= sizableCells.length) // run out of next cells
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	380 return diff - rd; // still had rd left to decrease
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	381 }
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	382 }
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	383 else // no adjustment needed
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	384 return 0;
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	385 }
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	386
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	387 //BEGIN Col/row resizing
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	388 void resizeCallback (ushort cx, ushort cy) {
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	389 int move; // NOTE: all resizing is relative, unlike in Window
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	390
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	391 if (resizeColsL.length != 0) {
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	392 move = cx - dragX;
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	393
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	394 // do shrinking first (in case we hit the minimum)
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	395 // Note: we rely on x[a..b] pointing to the same memory as x
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	396 if (move < 0) {
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	397 move = -adjustCellSizes (colW, colWMin, resizeColsL, move, false);
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	398 adjustCellSizes (colW, colWMin, resizeColsH, move, true);
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	399 } else {
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	400 move = -adjustCellSizes (colW, colWMin, resizeColsH, -move, true);
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	401 adjustCellSizes (colW, colWMin, resizeColsL, move, false);
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	402 }
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	403
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	404 dragX = cx;
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	405 }
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	406
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	407 if (resizeRowsL.length != 0) {
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	408 move = cy - dragY;
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	409
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	410 // do shrinking first (in case we hit the minimum)
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	411 // Note: we rely on x[a..b] pointing to the same memory as x
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	412 if (move < 0) {
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	413 move = -adjustCellSizes (rowH, rowHMin, resizeRowsL, move, false);
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	414 adjustCellSizes (rowH, rowHMin, resizeRowsH, move, true);
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	415 } else {
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	416 move = -adjustCellSizes (rowH, rowHMin, resizeRowsH, -move, true);
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	417 adjustCellSizes (rowH, rowHMin, resizeRowsL, move, false);
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	418 }
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	419
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	420 dragY = cy;
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	421 }
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	422
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	423 // NOTE: this might be able to be made more efficient, but basically this all needs to happen:
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	424 genCachedMutableData;
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	425 setPosition (x,y);
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	426 window.requestRedraw;
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	427 }
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	428 bool endCallback (ushort cx, ushort cy, ubyte b, bool state) {
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	429 if (b == 1 && state == false) {
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	430 window.gui.removeCallbacks (cast(void*) this);
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	431 // Remove unwanted data (although it shouldn't free any memory):
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	432 resizeColsL = resizeColsH = resizeRowsL = resizeRowsH = null;
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	433 return true; // we've handled the up-click
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	434 }
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	435 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	436 }
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	437
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	438 protected:
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	439 // Data for resizing cols/rows:
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	440 int dragX, dragY; // coords where drag starts
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	441 // Lists of columns/rows with lower/higher index than the resize position
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	442 size_t[] resizeColsL, resizeColsH, resizeRowsL, resizeRowsH;
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	443 //END Col/row resizing
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	444
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	445
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	446 //BEGIN Construction (i.e. non-mutable) data
40 b28d7adc786b Made GUI more robust to mutable data changes and improved much of GridLayoutWidget's code. Diggory Hardy <diggory.hardy@gmail.com> parents: 39 diff changeset	447 int 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	448
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	449 /* 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	450 * [ 2 3 ] */
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	451 IWidget[] 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	452
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	453 // Cached data calculated from construction data:
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	454 // Minimal column width / row height:
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	455 int[] colWMin, rowHMin;
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	456 int mw, mh; // minimal dimensions
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	457
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	458 // All resizable cols/rows, in order:
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	459 size_t[] sizableCols, sizableRows;
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	460 //END Construction data
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	461
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	462
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	463 //BEGIN Mutable data
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	464 int[] colW, rowH; // column width / row height (largest size in col/row)
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	465
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	466 // Cached data calculated from construction and mutable data:
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	467 int[] colX, rowY; // cumulative colW[i-1] + padding (add x to get column's left x-coord)
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	468 //END Mutable data
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	469 }

Mercurial > projects > mde

annotate mde/gui/widget/layout.d @ 43:1530d9c04d4d