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

annotate mde/gui/widget/Window.d @ 74:cee261eba249

Minor tweaks.

author	Diggory Hardy <diggory.hardy@gmail.com>
date	Mon, 07 Jul 2008 15:54:47 +0100
parents	7fc0a8295c83
children	25cb7420dc91

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 /** The Window class. Hopefully eventually this will become a widget to make things a bit more
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	17 * generic. */
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	18 module mde.gui.widget.Window;
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	19
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	20 import mde.gui.widget.Ifaces;
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	21 import mde.gui.widget.createWidget;
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	22
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	23 import mde.gui.IGui;
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	24 import mde.gui.exception;
41 b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	25 import mde.gui.renderer.createRenderer;
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	26
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	27 import mt = mde.mergetag.DataSet;
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: 66 diff changeset	28 import mde.mergetag.parse.parseTo : parseTo;
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: 66 diff changeset	29 import mde.mergetag.parse.parseFrom : parseFrom;
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	30
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	31 import tango.util.log.Log : Log, Logger;
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	32
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	33 private Logger logger;
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	34 static this () {
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	35 logger = Log.getLogger ("mde.gui.widget.Window");
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	36 }
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	37
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	38 /** GUI Window class
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	39 *
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	40 * A window class instance does two things: (1) specify a region of the screen upon which the window
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	41 * and its associated widgets are drawn, and (2) load, save, and generally manage all its widgets.
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	42 *
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	43 * Let the window load a table of widget data, of type int[][widgetID]. Each widget will, when
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	44 * created, be given its int[] of data, which this() must confirm is valid (or throw).
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	45 */
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	46 class Window : mt.IDataSection, IWindow
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	47 {
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	48 //BEGIN Methods for GUI
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	49 this (char[] id) {
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	50 name = id;
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	51 }
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	52
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	53 /** Call after loading is finished to setup the window and confirm that it's valid.
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	54 *
37 052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 36 diff changeset	55 * Throws: WindowLoadException (or possibly other exceptions). Do not use the instance if an
052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 36 diff changeset	56 * exception occurs! */
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	57 void finalise (IGui gui)
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	58 in {
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	59 assert (gui !is null, "Window.finalise ("~name~"): gui is null");
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	60 } body {
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	61 // Check data was loaded:
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	62 if (widgetData is null)
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	63 throw new WindowLoadException ("No widget creation data");
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	64
41 b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	65 // Save gui and create the renderer:
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	66 gui_ = gui;
41 b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	67 rend = createRenderer (gui.rendererName);
38 8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	68
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	69 // Create the primary widget (and indirectly all sub-widgets), throwing on error:
41 b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	70 // Note: GridLayoutWidget's this relies on rend.layoutSpacing.
b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	71 widget = makeWidget (0); // primary widget always has ID 0.
65 891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	72 // This data is no longer needed by Window, although its sub-arrays may still be used, so
891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	73 // let the GC collect what it can:
891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	74 widgetData = null;
891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	75 widgetStrings = null;
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	76
41 b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	77 // get border sizes:
b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	78 border = rend.setSizable (isWSizable, isHSizable); // depends on widget
b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	79
b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	80 // Note: this should return an empty array, but we shouldn't make a fuss if it's not empty:
58 d43523ed4b62 Included a wdim typedef for all variables to do with window position or size instead of just using int. Diggory Hardy <diggory.hardy@gmail.com> parents: 46 diff changeset	81 if ((widget.adjust (mutableData)).length != 0) // adjust/set size, etc., depends on rend
d43523ed4b62 Included a wdim typedef for all variables to do with window position or size instead of just using int. Diggory Hardy <diggory.hardy@gmail.com> parents: 46 diff changeset	82 logger.warn ("Local widget position data is invalid!");
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	83 mutableData = null; // no longer needed
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	84
37 052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 36 diff changeset	85 widget.getCurrentSize (w,h); // and get this size
38 8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	86 w += border.l + border.r; // Adjust for border
8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	87 h += border.t + border.b;
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	88
38 8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	89 widgetX = x + border.l; // widget position
8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	90 widgetY = y + border.t; // must be updated if the window is moved
37 052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 36 diff changeset	91 widget.setPosition (widgetX, widgetY);
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	92
46 03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	93 // Calculate mw/mh and xw/yh (cached data):
66 f54ae4fc2b2f Replaced IWidget.getMinimalSize(out w,out h) with minWidth() and minHeight(). Diggory Hardy <diggory.hardy@gmail.com> parents: 65 diff changeset	94 mw = widget.minWidth + border.l + border.r;
f54ae4fc2b2f Replaced IWidget.getMinimalSize(out w,out h) with minWidth() and minHeight(). Diggory Hardy <diggory.hardy@gmail.com> parents: 65 diff changeset	95 mh = widget.minHeight + border.t + border.b;
46 03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	96
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	97 xw = x+w;
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	98 yh = y+h;
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	99 }
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	100 //BEGIN Mergetag code
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	101 void addTag (char[] tp, mt.ID id, char[] dt) {
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	102 // Priority is HIGH_LOW, so don't overwrite data which has already been loaded.
74 cee261eba249 Minor tweaks. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	103 if (tp == "int[][int]") {
cee261eba249 Minor tweaks. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	104 if (id == "widgetData" && widgetData == null) {
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	105 widgetData = cast(int[][widgetID]) parseTo!(int[][int]) (dt);
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	106 }
74 cee261eba249 Minor tweaks. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	107 } else if (tp == "char[][int]") {
cee261eba249 Minor tweaks. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	108 if (id == "widgetStrings" && widgetStrings == null) {
65 891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	109 widgetStrings = parseTo!(char[][int]) (dt);
891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	110 }
74 cee261eba249 Minor tweaks. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	111 } else if (tp == "int[]") {
cee261eba249 Minor tweaks. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	112 if (id == "mutableData" && mutableData == null) {
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	113 mutableData = parseTo!(int[]) (dt);
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	114 }
74 cee261eba249 Minor tweaks. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	115 } else if (tp == "int") {
cee261eba249 Minor tweaks. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	116 if (id == "x" && x == -1) {
58 d43523ed4b62 Included a wdim typedef for all variables to do with window position or size instead of just using int. Diggory Hardy <diggory.hardy@gmail.com> parents: 46 diff changeset	117 x = cast(wdim) parseTo!(int) (dt);
74 cee261eba249 Minor tweaks. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	118 } else if (id == "y" && y == -1) {
58 d43523ed4b62 Included a wdim typedef for all variables to do with window position or size instead of just using int. Diggory Hardy <diggory.hardy@gmail.com> parents: 46 diff changeset	119 y = cast(wdim) parseTo!(int) (dt);
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	120 }
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	121 }
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	122 }
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	123 void writeAll (ItemDelg dlg)
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	124 in {
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	125 assert (widgetData is null, "Window.writeAll: widgetData !is null");
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	126 } body {
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	127 /+ NOTE: currently editing is impossible...
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	128 if (edited) { // only save the widget creation data if it's been adjusted:
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	129 addCreationData (widget); // generate widget save data
74 cee261eba249 Minor tweaks. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	130 dlg ("int[][int]", "widgetData", parseFrom!(int[][int]) (widgetData));
cee261eba249 Minor tweaks. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	131 dlg ("char[][int]", "widgetStrings", parseFrom!(char[][int]) (widgetStrings));
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	132 }+/
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	133 // Save mutable data:
74 cee261eba249 Minor tweaks. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	134 dlg ("int[]", "mutableData", parseFrom!(int[]) (widget.getMutableData));
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	135 // Save the window position:
74 cee261eba249 Minor tweaks. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	136 dlg ("int", "x", parseFrom!(int) (x));
cee261eba249 Minor tweaks. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	137 dlg ("int", "y", parseFrom!(int) (y));
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	138 }
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	139 //END Mergetag code
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	140 //END Methods for GUI
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	141
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	142 //BEGIN IWindow methods
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	143 /** Get/create a widget by ID.
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 * Should $(I only) be called internally and by sub-widgets! */
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	146 IWidget makeWidget (widgetID i)
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	147 in {
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	148 // widgetData is normally left to be garbage collected after widgets have been created:
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	149 assert (widgetData !is null, "Window.makeWidget ("~name~"): widgetData is null");
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	150 } body {
36 57d000574d75 Enabled drawing on demand, and made the polling interval configurable. Diggory Hardy <diggory.hardy@gmail.com> parents: 35 diff changeset	151 /* Each widget returned should be a unique object; if multiple widgets are requested with
57d000574d75 Enabled drawing on demand, and made the polling interval configurable. Diggory Hardy <diggory.hardy@gmail.com> parents: 35 diff changeset	152 * the same ID, a new widget is created each time. */
57d000574d75 Enabled drawing on demand, and made the polling interval configurable. Diggory Hardy <diggory.hardy@gmail.com> parents: 35 diff changeset	153
57d000574d75 Enabled drawing on demand, and made the polling interval configurable. Diggory Hardy <diggory.hardy@gmail.com> parents: 35 diff changeset	154 int[]* d = i in widgetData;
57d000574d75 Enabled drawing on demand, and made the polling interval configurable. Diggory Hardy <diggory.hardy@gmail.com> parents: 35 diff changeset	155 if (d is null)
57d000574d75 Enabled drawing on demand, and made the polling interval configurable. Diggory Hardy <diggory.hardy@gmail.com> parents: 35 diff changeset	156 throw new WindowLoadException ("Window.makeWidget ("~name~"): Widget not found");
57d000574d75 Enabled drawing on demand, and made the polling interval configurable. Diggory Hardy <diggory.hardy@gmail.com> parents: 35 diff changeset	157
57d000574d75 Enabled drawing on demand, and made the polling interval configurable. Diggory Hardy <diggory.hardy@gmail.com> parents: 35 diff changeset	158 // Throws WidgetDataException (a WindowLoadException) if bad data:
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	159 return createWidget (this, *d);
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	160 }
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	161
65 891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	162 char[] getWidgetString (int i)
891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	163 in {
891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	164 // widgetStrings is freed at same time as widgetData
891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	165 // but widgetData is guaranteed to be read
891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	166 assert (widgetData !is null, "getWidgetString called after widget creation finished");
891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	167 } body {
891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	168 char[]* p;
891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	169 if (widgetStrings is null \|\|
891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	170 (p = i in widgetStrings) is null )
891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	171 throw new WindowLoadException ("Needed widgetStrings not set for Window");
891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	172
891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	173 return *p;
891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	174 }
891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	175
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	176 /** Add this widget's data to that to be saved, returning it's widgetID. */
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	177 widgetID addCreationData (IWidget widget)
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	178 {
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	179 widgetID i;
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	180 if (widgetData is null)
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	181 i = 0;
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	182 else
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	183 i = widgetData.keys[$-1] + 1;
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	184
65 891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	185 /+ Doesn't this have no effect except when getCreationData throws, in which case the data
891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	186 + isn't used anyway? I'm sure it was added for a reason... FIXME and below
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	187 widgetData[i] = null; // Make sure the same ID doesn't get used by a recursive call
65 891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	188 +/
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	189 widgetData[i] = widget.getCreationData;
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	190
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	191 return i;
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	192 }
41 b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	193
65 891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	194 int addWidgetString (char[] str)
891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	195 {
891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	196 int i;
891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	197 if (widgetStrings is null)
891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	198 i = 0;
891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	199 else
891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	200 i = widgetStrings.keys[$-1] + 1;
891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	201
891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	202 /+ See above. FIXME
891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	203 widgetStrings[i] = null; // Make sure the same ID doesn't get used by a recursive call
891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	204 +/
891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	205 widgetStrings[i] = str;
891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	206
891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	207 return i;
891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	208 }
891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	209
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	210 IGui gui () {
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	211 return gui_;
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	212 }
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	213
41 b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	214 void requestRedraw () {
b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	215 gui_.requestRedraw;
b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	216 }
b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	217
b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	218 IRenderer renderer ()
b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	219 in {
b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	220 assert (rend !is null, "Window.renderer: rend is null");
b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	221 } body {
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	222 return rend;
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	223 }
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	224 //END IWindow methods
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	225
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	226 //BEGIN IWidget methods
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	227 //FIXME: how many of these methods are actually needed/used?
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	228 int[] adjust (int[]) { // simply not relevant (never used)
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	229 return [];
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	230 }
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	231 int[] getCreationData () { // simply not relevant (never used)
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	232 return [];
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	233 }
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	234 int[] getMutableData () { // simply not relevant (never used)
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	235 return [];
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	236 }
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	237
37 052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 36 diff changeset	238 bool isWSizable () {
052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 36 diff changeset	239 return widget.isWSizable;
052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 36 diff changeset	240 }
052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 36 diff changeset	241 bool isHSizable () {
052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 36 diff changeset	242 return widget.isHSizable;
052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 36 diff changeset	243 }
052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 36 diff changeset	244
66 f54ae4fc2b2f Replaced IWidget.getMinimalSize(out w,out h) with minWidth() and minHeight(). Diggory Hardy <diggory.hardy@gmail.com> parents: 65 diff changeset	245 wdim minWidth () {
f54ae4fc2b2f Replaced IWidget.getMinimalSize(out w,out h) with minWidth() and minHeight(). Diggory Hardy <diggory.hardy@gmail.com> parents: 65 diff changeset	246 return mw;
f54ae4fc2b2f Replaced IWidget.getMinimalSize(out w,out h) with minWidth() and minHeight(). Diggory Hardy <diggory.hardy@gmail.com> parents: 65 diff changeset	247 }
f54ae4fc2b2f Replaced IWidget.getMinimalSize(out w,out h) with minWidth() and minHeight(). Diggory Hardy <diggory.hardy@gmail.com> parents: 65 diff changeset	248 wdim minHeight () {
f54ae4fc2b2f Replaced IWidget.getMinimalSize(out w,out h) with minWidth() and minHeight(). Diggory Hardy <diggory.hardy@gmail.com> parents: 65 diff changeset	249 return mh;
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	250 }
58 d43523ed4b62 Included a wdim typedef for all variables to do with window position or size instead of just using int. Diggory Hardy <diggory.hardy@gmail.com> parents: 46 diff changeset	251 void getCurrentSize (out wdim cw, out wdim ch) {
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	252 cw = w;
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 ch = h;
6b4116e6355c Work on the Gui: some of the framework for drag & drop. Also made Window an IWidget. Diggory Hardy <diggory.hardy@gmail.com> parents: 32 diff changeset	254 }
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	255
58 d43523ed4b62 Included a wdim typedef for all variables to do with window position or size instead of just using int. Diggory Hardy <diggory.hardy@gmail.com> parents: 46 diff changeset	256 void setWidth (wdim nw, int dir) {
46 03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	257 if (nw < mw) w = mw; // clamp
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	258 else w = nw;
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	259 xw = x + w;
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	260 widget.setWidth (w - border.l - border.r, dir);
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	261 }
58 d43523ed4b62 Included a wdim typedef for all variables to do with window position or size instead of just using int. Diggory Hardy <diggory.hardy@gmail.com> parents: 46 diff changeset	262 void setHeight (wdim nh, int dir) {
46 03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	263 if (nh < mh) h = mh; // clamp
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	264 else h = nh;
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	265 yh = y + h;
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	266 widget.setHeight (h - border.t - border.b, dir);
37 052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 36 diff changeset	267 }
052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 36 diff changeset	268
58 d43523ed4b62 Included a wdim typedef for all variables to do with window position or size instead of just using int. Diggory Hardy <diggory.hardy@gmail.com> parents: 46 diff changeset	269 void setPosition (wdim nx, wdim ny) {
37 052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 36 diff changeset	270 x = nx;
052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 36 diff changeset	271 y = ny;
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	272
35 928db3c75ed3 Windows can now be moved. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	273 xw = x+w;
928db3c75ed3 Windows can now be moved. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	274 yh = y+h;
928db3c75ed3 Windows can now be moved. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	275
38 8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	276 widgetX = x + border.l;
8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	277 widgetY = y + border.t;
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	278
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	279 widget.setPosition (widgetX, widgetY);
36 57d000574d75 Enabled drawing on demand, and made the polling interval configurable. Diggory Hardy <diggory.hardy@gmail.com> parents: 35 diff changeset	280
46 03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	281 gui_.requestRedraw (); // necessary whenever the window is moved; setPosition is called after resizes and moves
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	282 }
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	283
58 d43523ed4b62 Included a wdim typedef for all variables to do with window position or size instead of just using int. Diggory Hardy <diggory.hardy@gmail.com> parents: 46 diff changeset	284 IWidget getWidget (wdim cx, wdim 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	285 if (cx < x \|\| cx >= xw \|\| cy < y \|\| cy >= yh) // not over window
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	286 return null;
38 8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	287 if (cx >= widgetX && cx < xw-border.r && cy >= widgetY && cy < yh-border.b)
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	288 // over the 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	289 return widget.getWidget (cx, 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	290 else // over the window border
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	291 return this;
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	292 }
58 d43523ed4b62 Included a wdim typedef for all variables to do with window position or size instead of just using int. Diggory Hardy <diggory.hardy@gmail.com> parents: 46 diff changeset	293 void clickEvent (wdabs cx, wdabs cy, ubyte b, bool state) {
35 928db3c75ed3 Windows can now be moved. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	294 if (b == 1 && state == true) {
41 b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	295 resizeType = rend.getResizeType (cx-x, cy-y, w,h);
b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	296
b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	297 if (resizeType != RESIZE_TYPE.NONE) { // Some type of resize
b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	298 // Set x/yDrag (unfortunately these need to be different for each edge)
b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	299 if (resizeType & RESIZE_TYPE.L)
b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	300 xDrag = w + cx;
b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	301 else if (resizeType & RESIZE_TYPE.R)
b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	302 xDrag = w - cx;
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	303
41 b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	304 if (resizeType & RESIZE_TYPE.T)
b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	305 yDrag = h + cy;
b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	306 else if (resizeType & RESIZE_TYPE.B)
b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	307 yDrag = h - cy;
38 8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	308
41 b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	309 // Add the callbacks (they use resizeType which has already been set)
b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	310 gui_.addClickCallback (&endCallback);
b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	311 gui_.addMotionCallback (&resizeCallback);
b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	312 } else { // window is being moved
38 8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	313 xDrag = cx - x;
8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	314 yDrag = cy - y;
8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	315
8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	316 gui_.addClickCallback (&endCallback);
8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	317 gui_.addMotionCallback (&moveCallback);
8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	318 }
35 928db3c75ed3 Windows can now be moved. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	319 }
34 6b4116e6355c Work on the Gui: some of the framework for drag & drop. Also made Window an IWidget. Diggory Hardy <diggory.hardy@gmail.com> parents: 32 diff changeset	320 }
6b4116e6355c Work on the Gui: some of the framework for drag & drop. Also made Window an IWidget. Diggory Hardy <diggory.hardy@gmail.com> parents: 32 diff changeset	321
6b4116e6355c Work on the Gui: some of the framework for drag & drop. Also made Window an IWidget. Diggory Hardy <diggory.hardy@gmail.com> parents: 32 diff changeset	322 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	323 // background
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	324 rend.drawWindow (x,y, w,h);
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	325
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	326 // Tell the widget to draw itself:
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	327 widget.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	328 }
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	329 //END IWidget methods
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	330
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	331 private:
41 b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	332 alias IRenderer.BorderDimensions BorderDimensions;
b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	333 alias IRenderer.RESIZE_TYPE RESIZE_TYPE;
38 8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	334
8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	335 //BEGIN Window moving and resizing
58 d43523ed4b62 Included a wdim typedef for all variables to do with window position or size instead of just using int. Diggory Hardy <diggory.hardy@gmail.com> parents: 46 diff changeset	336 void moveCallback (wdabs cx, wdabs cy) {
38 8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	337 setPosition (cx-xDrag, cy-yDrag);
35 928db3c75ed3 Windows can now be moved. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	338 }
58 d43523ed4b62 Included a wdim typedef for all variables to do with window position or size instead of just using int. Diggory Hardy <diggory.hardy@gmail.com> parents: 46 diff changeset	339 void resizeCallback (wdabs cx, wdabs cy) {
45 0fd51d2c6c8a Several changes to resising windows and layout widgets. This commit still has some bugs. Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	340 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: 41 diff changeset	341 logger.trace ("resizeCallback: failure");
0fd51d2c6c8a Several changes to resising windows and layout widgets. This commit still has some bugs. Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	342
0fd51d2c6c8a Several changes to resising windows and layout widgets. This commit still has some bugs. Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	343 // This function is only called if some resize is going to happen.
46 03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	344 // x,y are used as parameters to setPosition as well as being affected by it; somewhat
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	345 // pointless but fairly effective.
45 0fd51d2c6c8a Several changes to resising windows and layout widgets. This commit still has some bugs. Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	346
41 b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	347 if (resizeType & RESIZE_TYPE.L) {
58 d43523ed4b62 Included a wdim typedef for all variables to do with window position or size instead of just using int. Diggory Hardy <diggory.hardy@gmail.com> parents: 46 diff changeset	348 wdim xSize = xDrag - cx;
46 03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	349 if (xSize < mw) xSize = mw; // clamp
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	350 x += w - xSize;
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	351 setWidth (xSize, 1);
38 8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	352 }
41 b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	353 else if (resizeType & RESIZE_TYPE.R) {
46 03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	354 setWidth (xDrag + cx, -1);
38 8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	355 }
41 b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	356 if (resizeType & RESIZE_TYPE.T) {
58 d43523ed4b62 Included a wdim typedef for all variables to do with window position or size instead of just using int. Diggory Hardy <diggory.hardy@gmail.com> parents: 46 diff changeset	357 wdim ySize = yDrag - cy;
46 03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	358 if (ySize < mh) ySize = mh;
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	359 y += h - ySize;
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	360 setHeight (ySize, 1);
38 8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	361 }
41 b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	362 else if (resizeType & RESIZE_TYPE.B) {
46 03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	363 setHeight (yDrag + cy, -1);
38 8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	364 }
45 0fd51d2c6c8a Several changes to resising windows and layout widgets. This commit still has some bugs. Diggory Hardy <diggory.hardy@gmail.com> parents: 41 diff changeset	365
46 03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	366 // Moves lower (x,y) coordinate if necessary and repositions any sub-widgets moved by the
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	367 // resizing:
03fa79a48c48 Fixed resizing bugs in previous commit and made code cleaner and more efficient. Diggory Hardy <diggory.hardy@gmail.com> parents: 45 diff changeset	368 setPosition (x, y);
38 8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	369 }
58 d43523ed4b62 Included a wdim typedef for all variables to do with window position or size instead of just using int. Diggory Hardy <diggory.hardy@gmail.com> parents: 46 diff changeset	370 bool endCallback (wdabs cx, wdabs cy, ubyte b, bool state) {
35 928db3c75ed3 Windows can now be moved. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	371 if (b == 1 && state == false) {
38 8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	372 // The mouse shouldn't have moved since the motion callback
8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	373 // was last called, so there's nothing else to do now.
35 928db3c75ed3 Windows can now be moved. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	374 gui_.removeCallbacks (cast(void*) this);
41 b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	375
b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	376 return true; // we've handled the up-click
35 928db3c75ed3 Windows can now be moved. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	377 }
41 b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	378 return false; // we haven't handled it
35 928db3c75ed3 Windows can now be moved. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	379 }
58 d43523ed4b62 Included a wdim typedef for all variables to do with window position or size instead of just using int. Diggory Hardy <diggory.hardy@gmail.com> parents: 46 diff changeset	380 wdim xDrag, yDrag; // where a drag starts relative to x and y
41 b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	381 IRenderer.RESIZE_TYPE resizeType; // Type of current resize
38 8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	382 //END Window moving and resizing
35 928db3c75ed3 Windows can now be moved. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	383
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	384 // Load/save data:
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	385 public char[] name; // The window's name (id from config file)
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	386 //bool edited = false; // True if any widgets have been edited (excluding scaling)
41 b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	387
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	388 // Data used for saving and loading (null in between):
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	389 int[][widgetID] widgetData = null;// Data for all widgets under this window
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	390 int[] mutableData = null; // Widget's mutable data (adjusted sizes, etc.)
65 891211f034f2 Changes to widgets: widgets may now get strings as creation data. Strings for TextWidgets can be set in files (in a temporary mannor). Diggory Hardy <diggory.hardy@gmail.com> parents: 58 diff changeset	391 char[][int] widgetStrings = null;// Strings by ID; string-typed creation data
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	392
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	393 IGui gui_; // The gui managing this window
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	394 IRenderer rend; // The window's renderer
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	395
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	396 IWidget widget; // The primary widget in this window.
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	397
58 d43523ed4b62 Included a wdim typedef for all variables to do with window position or size instead of just using int. Diggory Hardy <diggory.hardy@gmail.com> parents: 46 diff changeset	398 wdim x = -1, y = -1; // Window position
d43523ed4b62 Included a wdim typedef for all variables to do with window position or size instead of just using int. Diggory Hardy <diggory.hardy@gmail.com> parents: 46 diff changeset	399 wdsize w,h; // Window size (calculated from Widgets)
d43523ed4b62 Included a wdim typedef for all variables to do with window position or size instead of just using int. Diggory Hardy <diggory.hardy@gmail.com> parents: 46 diff changeset	400 wdim xw, yh; // x+w, y+h (frequent use by clickEvent)
d43523ed4b62 Included a wdim typedef for all variables to do with window position or size instead of just using int. Diggory Hardy <diggory.hardy@gmail.com> parents: 46 diff changeset	401 wdim widgetX, widgetY; // Widget position (= window position plus BORDER_WIDTH)
d43523ed4b62 Included a wdim typedef for all variables to do with window position or size instead of just using int. Diggory Hardy <diggory.hardy@gmail.com> parents: 46 diff changeset	402 wdim mw = -1, mh = -1; // minimal size (negative means requires calculation)
38 8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	403
8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	404 BorderDimensions border; // Total border size (move plus resize)
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	405 }

Mercurial > projects > mde

annotate mde/gui/widget/Window.d @ 74:cee261eba249