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

annotate mde/gui/widget/layout.d @ 45:0fd51d2c6c8a

Several changes to resising windows and layout widgets. This commit still has some bugs. Moved the implementable widgets from mde.gui.widget.Widget to miscWidgets, leaving base widgets in Widget. Rewrote some of GridLayoutWidget's implementation. Made many operations general to work for either columns or rows. Some optimisations were intended but ended up being removed due to problems. Allowed layout's to resize from either direction (only with window resizes). committer: Diggory Hardy <diggory.hardy@gmail.com>

author	Diggory Hardy <diggory.hardy@gmail.com>
date	Thu, 22 May 2008 11:34:09 +0100
parents	1530d9c04d4d
children	03fa79a48c48

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 debug {
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	23 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	24 private Logger logger;
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	25 static this () {
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	26 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	27 }
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
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	30 /** 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	31 *
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	32 * 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	33 * (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	34 *
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 * 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	36 *
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 * 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	38 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	39 {
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	40 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	41 // 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	42 // 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	43 if (data.length < 4) throw new WidgetDataException;
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	44 super (wind, data);
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	45
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	46 rows = data[1];
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	47 cols = data[2];
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	48 if (data.length != 3 + rows * cols) throw new WidgetDataException;
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	49 /* data.length >= 4 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	50 * 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	51 * The only thing not checked is whether both rows and cols are negative, which would
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	52 * cause an exception when dynamic arrays are allocated by genCachedConstructionData, which
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	53 * is an acceptible method of failure (and is unlikely anyway). */
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
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	77 col.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	78 row.dupMin;
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;
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	81 col.setCheck (data[0..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	82 row.setCheck (data[cols..lenUsed]);
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	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
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	85
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	86 // 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	87 // 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	88 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	89 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	90
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	91 // Tell subwidgets their new sizes. Positions are given by a later call to setPosition.
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	92 foreach (i,widget; subWidgets)
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	93 // Resizing direction is arbitrarily set to "high direction":
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	94 widget.setSize (col.width[i % cols], row.width[i / cols], true, true);
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	95
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	96 return data[lenUsed..$];
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	97 }
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 int[] getCreationData () {
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	100 int[] ret;
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	101 ret.length = 3 + subWidgets.length;
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	102
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	103 ret [0..3] = [widgetType, rows, cols]; // first data
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	104
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	105 foreach (i,widget; subWidgets) // sub widgets
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	106 ret[i+3] = window.addCreationData (widget);
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	107
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	108 return ret;
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	109 }
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	110 int[] getMutableData () {
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	111 int[] ret;
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	112 foreach (widget; subWidgets)
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	113 ret ~= widget.getMutableData;
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	114
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	115 ret ~= col.width ~ row.width;
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	116 return ret;
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	117 }
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	118
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	119 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	120 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	121 }
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 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	123 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	124 }
052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	125
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 /* 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	127 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	128 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	129 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	130 }
052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	131
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	132 void setSize (int nw, int nh, bool wHigh, bool hHigh) {
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	133 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	134 char[128] tmp;
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	135 logger.trace ("setSize failed: hHigh = " ~ (hHigh ? "true" : "false"));
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	136 logger.trace (logger.format (tmp, "rows to resize: {}, {}", row.firstSizable, row.lastSizable));
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	137 }
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	138 // Optimisation (could easily be called with same sizes if a parent layout widget is
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	139 // resized, since many columns/rows may not be 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	140 if (nw == w && nh == h) return;
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	141
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	142 // calculate the row/column sizes (and new positions)
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	143 if (wHigh)
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	144 w += col.adjustCellSizes (nw - w, col.lastSizable, -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	145 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	146 w += col.adjustCellSizes (nw - w, col.firstSizable, 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	147 if (hHigh)
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	148 h += row.adjustCellSizes (nh - h, row.lastSizable, -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	149 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	150 h += row.adjustCellSizes (nh - h, row.firstSizable, 1);
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	151
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	152 // set the sub-widget's sizes & positions
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	153 setSubWidgetSP (wHigh, hHigh);
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	154 }
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	155
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	156 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	157 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	158 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	159
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 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	161 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	162 }
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	163
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	164
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	165 // 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	166 IWidget getWidget (int cx, int 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	167 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	168 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	169 // 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	170 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	171 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	172 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	173 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
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	175 // 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	176 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	177 }
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	178
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	179 // Resizing columns & rows
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	180 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	181 debug scope (failure)
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	182 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	183 if (b == 1 && state == true) {
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	184 /* 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	185 * 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	186 * 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	187
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	188 // 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	189 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	190 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	191
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	192 dragX = cx;
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	193 dragY = cy;
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	194
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	195 window.gui.addClickCallback (&endCallback);
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	196 window.gui.addMotionCallback (&resizeCallback);
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	197 }
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	198 }
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	199
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	200 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	201 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	202
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	203 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	204 widget.draw ();
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	205 }
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	206
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	207 private:
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	208 //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	209 /* 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	210 * (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	211 void genCachedConstructionData () {
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	212 col.spacing = row.spacing = window.renderer.layoutSpacing;
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	213
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	214 // 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	215 // set length, making sure the arrays are initialised to zero:
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	216 col.minWidth = new int[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	217 row.minWidth = new int[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	218 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	219 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	220 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	221
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	222 // 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	223 myIt n = i % cols; // 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	224 if (col.minWidth[n] < ww) col.minWidth[n] = ww;
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	225 n = i / cols; // 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	226 if (row.minWidth[n] < wh) row.minWidth[n] = wh;
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	227 }
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	228
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	229
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	230 // Calculate the overall minimal size, starting with the 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	231 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	232 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	233 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	234
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	235 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	236 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	237 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	238 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	239
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	240
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	241 // 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	242 // 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	243 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	244 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	245 col.firstSizable = row.firstSizable = -1;
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	246
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	247 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	248 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	249 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	250 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	251 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	252
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	253 // 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	254 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	255 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	256 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	257 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	258 }
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
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 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	261 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	262 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	263 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	264 continue forRows;
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	265
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	266 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	267 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	268 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	269 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	270 }
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 }
052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	272
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	273 // set sub-widgets size & position (done after resizing widget or rows/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	274 void setSubWidgetSP (bool wH, bool hH) {
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	275 for (myIt i = 0; i < cols; ++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	276 for (myIt j = 0; j < rows; ++j)
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	277 {
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	278 IWidget widget = subWidgets[i + cols*j];
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	279 widget.setSize (col.width[i], row.width[j], wH, hH);
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	280 widget.setPosition (x + col.pos[i], y + row.pos[j]);
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	281 }
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	282 }
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	283 //END Cache calculation functions
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	284
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	285
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	286 //BEGIN Col/row resizing
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	287 void resizeCallback (ushort cx, ushort 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	288 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	289 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	290
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	291 // 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	292 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	293 dragY = cy;
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	294
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	295 // NOTE: Resizing direction is set to "high direction" which isn't always going to be
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	296 // correct. A more accurate but more complex approach might be to get
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	297 // adjustCellSizes to do the work.
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	298 setSubWidgetSP (true, true);
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	299 window.requestRedraw;
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	300 }
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	301 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	302 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	303 window.gui.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	304 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	305 }
45 0fd51d2c6c8a Several changes to resising windows and layout widgets. This commit still has some bugs. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	306 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	307 }
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	308
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	309 protected:
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	310 // Data for resizing cols/rows:
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 int dragX, dragY; // coords where drag starts
42 8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	312 //END Col/row resizing
8bf53e711cc7 Partially implemented column/row resizing (code not working well). Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	313
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	314
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	315 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	316
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	317 /* 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	318 * [ 2 3 ] */
1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	319 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	320
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	321 /* 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	322 *
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 * 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	324 * 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	325 *
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 * 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	327 struct CellDimensions {
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	328 int[] pos, // relative position (cumulative width[i-1] plus 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	329 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	330 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	331 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	332 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	333 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	334 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	335 resizeU; // and up from this index
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 int spacing; // used by genPositions (which cannot access the layout class's 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	337
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 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	339 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	340 }
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	341 void setCheck (int[] 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	342 // 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	343 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	344 // 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	345 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	346 // 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	347 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	348 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	349 }
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	350
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	351 // Generate position infomation and return total width (i.e. widget width/height)
0fd51d2c6c8a Several changes to resising windows and layout widgets. This commit still has some bugs. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	352 int 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	353 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	354
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	355 int x = 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	356 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	357 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	358 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	359 }
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	360 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	361 }
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
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 // 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	364 // Returns -i if in space to left of col i, or i if on col 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	365 myDiff getCell (int l) {
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	366 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	367 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	368 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	369 --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	370 } // 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	371 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	372 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	373 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	374 }
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
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	376 // Calculate resizeU/resizeD, and return true if unable to 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	377 bool findResize (int l) {
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	378 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	379 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	380 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	381
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	382 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	383 ++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	384 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	385 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	386 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	387 }
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	388 }
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	389
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 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	391 --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	392 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	393 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	394 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	395 }
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 }
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	397
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 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	399 }
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
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 /* 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	402 *
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 * 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	404 * 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	405 * 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	406 * 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	407 *
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	408 * 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	409 * The amount adjusted. This may be larger than diff, since cellD is clamped by cellDMin.
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 int adjustCellSizes (int diff, myDiff start, myDiff 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	412 in {// Could occur if adjust isn't called first, but this would be a 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	413 char[128] tmp;
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	414 logger.trace (logger.format (tmp, "start is {}", 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	415 assert (width !is null, "adjustCellSizes: width is null");
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 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	417 assert (incr == 1 \|\| incr == -1, "adjustCellSizes: invalid 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	418 } 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	419 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	420 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	421 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	422 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	423 width[i] += 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	424 }
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	425 else if (diff < 0) { // 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	426 int rd = diff; // running 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	427 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	428 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	429 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	430 rd = width[i] - minWidth[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	431 if (rd >= 0) // OK; we're done
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 break; // we hit the mark exactly: diff is correct
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
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 // 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	435 width[i] = minWidth[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	436 // 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	437
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	438 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	439 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	440 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	441 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	442 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	443 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	444 }
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 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	446 }
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 // 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	450
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 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	452 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	453 }
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 void resize (int 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	456 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	457
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 // 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	459 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	460 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	461 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	462 } 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	463 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	464 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	465 }
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 }
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 }
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 CellDimensions col, row;
43 1530d9c04d4d Column/row resizing implemented for GridLayoutWidget (finally)! Diggory Hardy <diggory.hardy@gmail.com> parents: 42 diff changeset	469
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	470 // Index types. Note that in some cases they need to hold negative values.
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 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	472 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	473 }

Mercurial > projects > mde

annotate mde/gui/widget/layout.d @ 45:0fd51d2c6c8a