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

annotate mde/gui/widget/Floating.d @ 80:ea58f277f487

Gui reorganization and changes; partial implementation of floating widgets. Moved contents of mde/gui/WidgetData.d elsewhere; new gui/WidgetDataSet.d and gui/types.d modules. Changes to widget/createWidget.d Partially implemented FloatingAreaWidget to provide an area for floating "window" widgets. New DebugWidget and some uses of it (e.g. bad widget data). Decoupled OptionChanges from Options.

author	Diggory Hardy <diggory.hardy@gmail.com>
date	Thu, 07 Aug 2008 11:25:27 +0100
parents	mde/gui/widget/Window.d@25cb7420dc91
children	ac1e3fd07275

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
80 ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	16 /** The Window class. Becoming a widget. */
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	17 module mde.gui.widget.Floating;
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	18
80 ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	19 import mde.gui.widget.Widget;
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	20 import mde.gui.exception;
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	21 /+import mde.gui.widget.createWidget;
32 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;
41 b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	24 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	25
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	26 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	27 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	28 import mde.mergetag.parse.parseFrom : parseFrom;
80 ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	29 +/
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	30 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	31
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 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	33 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	34 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	35 }
80 ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	36 //FIXME - documentation
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	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 */
80 ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	46 /** An area to contain floating widgets.
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	47 *
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	48 * The position of each sub-widget is set from data, but not the size.
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	49 * Rationale: parents' need to set subwidgets' positions when its position is set, so it needs to
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	50 * know their positions. Size setting is still under work FIXME.
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	51 *
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	52 * Data: Each string item is interpreted as a subwidget widgetID.
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	53 * Ints supplied may consist of just the widget type or
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	54 * additionally an (x,y) coordinate for each subwidget (all x coords first, then all y coords).
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	55 */
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	56 class FloatingAreaWidget : SizableWidget, IParentWidget
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	57 {
80 ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	58 this (IWidgetManager mgr, WidgetData data) {
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	59 subWidgets.length = data.strings.length;
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	60 foreach (i,s; data.strings)
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	61 subWidgets[i] = mgr.makeWidget (s, this);
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	62 sWCoords.length = subWidgets.length;
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	63
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	64 if (data.ints.length != 1) {
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	65 if (data.ints.length != 2*subWidgets.length + 1) {
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	66 throw new WidgetDataException;
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	67 }
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	68 foreach (i, ref c; sWCoords) {
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	69 c.x = cast(wdim) data.ints[i + 1];
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	70 c.y = cast(wdim) data.ints[i + 1 + sWCoords.length];
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	71 }
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	72 }
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	73
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	74 super (mgr, data);
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	75
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	76 foreach (w; subWidgets) {
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	77 //FIXME: set default size
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	78 w.setWidth (w.minWidth, -1);
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	79 w.setHeight (w.minHeight, -1);
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	80 }
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	81 }
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	82
80 ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	83 void setPosition (wdim x, wdim y) {
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	84 super.setPosition (x,y);
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	85
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	86 foreach (i,c; sWCoords)
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	87 subWidgets[i].setPosition (x+c.x, y+c.y);
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	88 }
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	89
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	90 void draw () {
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	91 super.draw;
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	92
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	93 mgr.renderer.restrict (x,y, w,h);
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	94
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	95 foreach (w; subWidgets)
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	96 w.draw;
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	97 }
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	98
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	99 protected:
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	100 IChildWidget[] subWidgets; // all subwidgets, framed or not
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	101 wdimPair[] sWCoords; // coords for subwidgets, relative to this widget
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	102
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	103 /+
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	104 /** 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	105 *
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	106 * 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	107 * 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	108 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	109 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	110 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	111 } body {
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	112 // 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	113 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	114 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	115
41 b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	116 // 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	117 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	118 rend = createRenderer (gui.rendererName);
38 8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	119
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	120 // 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	121 // 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	122 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	123 // 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	124 // 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	125 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	126 widgetStrings = null;
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	127
41 b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	128 // 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	129 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	130
b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	131 // 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	132 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	133 logger.warn ("Local widget position data is invalid!");
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	134 mutableData = null; // no longer needed
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	135
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	136 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	137 w += border.l + border.r; // Adjust for border
8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	138 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	139
38 8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	140 widgetX = x + border.l; // widget position
8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	141 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	142 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	143
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	144 // 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	145 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	146 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	147
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	148 xw = x+w;
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	149 yh = y+h;
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	150 }
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	151 //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	152
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	153 //BEGIN IWindow methods
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	154 /** 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	155 *
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	156 * 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	157 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	158 in {
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	159 // 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	160 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	161 } body {
36 57d000574d75 Enabled drawing on demand, and made the polling interval configurable. Diggory Hardy <diggory.hardy@gmail.com> parents: 35 diff changeset	162 /* 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	163 * 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	164
57d000574d75 Enabled drawing on demand, and made the polling interval configurable. Diggory Hardy <diggory.hardy@gmail.com> parents: 35 diff changeset	165 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	166 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	167 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	168
57d000574d75 Enabled drawing on demand, and made the polling interval configurable. Diggory Hardy <diggory.hardy@gmail.com> parents: 35 diff changeset	169 // Throws WidgetDataException (a WindowLoadException) if bad data:
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	170 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	171 }
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	172
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	173 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	174 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	175 // 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	176 // 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	177 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	178 } 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	179 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	180 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	181 (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	182 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	183
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	184 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	185 }
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
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	187 /** 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	188 widgetID addCreationData (IWidget widget)
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	189 {
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	190 widgetID i;
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	191 if (widgetData is null)
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	192 i = 0;
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	193 else
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	194 i = widgetData.keys[$-1] + 1;
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	195
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	196 /+ 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	197 + 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	198 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	199 +/
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	200 widgetData[i] = widget.getCreationData;
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	201
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	202 return i;
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	203 }
41 b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	204
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	205 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	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 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	208 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	209 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	210 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	211 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	212
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	213 /+ 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	214 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	215 +/
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	216 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	217
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	218 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	219 }
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	220
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	221 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	222 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	223 }
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	224
41 b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	225 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	226 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	227 }
b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	228
b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	229 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	230 in {
b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	231 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	232 } body {
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	233 return rend;
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	234 }
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	235 //END IWindow methods
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	236
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	237 //BEGIN IWidget methods
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	238 //FIXME: how many of these methods are actually needed/used?
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	239 int[] adjust (int[]) { // simply not relevant (never used)
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	240 return [];
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	241 }
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	242 int[] getCreationData () { // simply not relevant (never used)
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	243 return [];
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	244 }
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	245 int[] getMutableData () { // simply not relevant (never used)
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	246 return [];
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	247 }
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	248
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	249 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	250 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	251 }
052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 36 diff changeset	252 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	253 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	254 }
052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 36 diff changeset	255
66 f54ae4fc2b2f Replaced IWidget.getMinimalSize(out w,out h) with minWidth() and minHeight(). Diggory Hardy <diggory.hardy@gmail.com> parents: 65 diff changeset	256 wdim minWidth () {
f54ae4fc2b2f Replaced IWidget.getMinimalSize(out w,out h) with minWidth() and minHeight(). Diggory Hardy <diggory.hardy@gmail.com> parents: 65 diff changeset	257 return mw;
f54ae4fc2b2f Replaced IWidget.getMinimalSize(out w,out h) with minWidth() and minHeight(). Diggory Hardy <diggory.hardy@gmail.com> parents: 65 diff changeset	258 }
f54ae4fc2b2f Replaced IWidget.getMinimalSize(out w,out h) with minWidth() and minHeight(). Diggory Hardy <diggory.hardy@gmail.com> parents: 65 diff changeset	259 wdim minHeight () {
f54ae4fc2b2f Replaced IWidget.getMinimalSize(out w,out h) with minWidth() and minHeight(). Diggory Hardy <diggory.hardy@gmail.com> parents: 65 diff changeset	260 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	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 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	263 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	264 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	265 }
6b4116e6355c Work on the Gui: some of the framework for drag & drop. Also made Window an IWidget. Diggory Hardy <diggory.hardy@gmail.com> parents: 32 diff changeset	266
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	267 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	268 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	269 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	270 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	271 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	272 }
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	273 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	274 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	275 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	276 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	277 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	278 }
052df9b2fe07 Allowed widget resizing, changed widget IDs and made Input catch any callback exceptions. Diggory Hardy <diggory.hardy@gmail.com> parents: 36 diff changeset	279
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	280 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	281 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	282 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	283
35 928db3c75ed3 Windows can now be moved. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	284 xw = x+w;
928db3c75ed3 Windows can now be moved. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	285 yh = y+h;
928db3c75ed3 Windows can now be moved. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	286
38 8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	287 widgetX = x + border.l;
8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	288 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	289
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 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	291
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	292 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	293 }
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	294
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	295 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	296 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	297 return null;
38 8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	298 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	299 // 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	300 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	301 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	302 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	303 }
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	304 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	305 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	306 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	307
b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	308 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	309 // 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	310 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	311 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	312 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	313 xDrag = w - cx;
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	314
41 b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	315 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	316 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	317 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	318 yDrag = h - cy;
38 8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	319
41 b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	320 // 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	321 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	322 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	323 } else { // window is being moved
38 8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	324 xDrag = cx - x;
8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	325 yDrag = cy - y;
8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	326
8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	327 gui_.addClickCallback (&endCallback);
8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	328 gui_.addMotionCallback (&moveCallback);
8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	329 }
35 928db3c75ed3 Windows can now be moved. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	330 }
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	331 }
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	332
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	333 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	334 // 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	335 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	336
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	337 // 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	338 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	339 }
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	340 //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	341
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	342 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	343 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	344 alias IRenderer.RESIZE_TYPE RESIZE_TYPE;
38 8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	345
8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	346 //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	347 void moveCallback (wdabs cx, wdabs cy) {
38 8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	348 setPosition (cx-xDrag, cy-yDrag);
35 928db3c75ed3 Windows can now be moved. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	349 }
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	350 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	351 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	352 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	353
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	354 // 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	355 // 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	356 // 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	357
41 b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	358 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	359 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	360 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	361 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	362 setWidth (xSize, 1);
38 8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	363 }
41 b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	364 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	365 setWidth (xDrag + cx, -1);
38 8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	366 }
41 b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	367 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	368 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	369 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	370 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	371 setHeight (ySize, 1);
38 8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	372 }
41 b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	373 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	374 setHeight (yDrag + cy, -1);
38 8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	375 }
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	376
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	377 // 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	378 // 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	379 setPosition (x, y);
38 8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	380 }
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	381 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	382 if (b == 1 && state == false) {
38 8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	383 // 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	384 // 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	385 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	386
b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	387 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	388 }
41 b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	389 return false; // we haven't handled it
35 928db3c75ed3 Windows can now be moved. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	390 }
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	391 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	392 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	393 //END Window moving and resizing
35 928db3c75ed3 Windows can now be moved. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	394
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	395 // Load/save data:
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	396 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	397 //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	398
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	399 IGui gui_; // The gui managing this window
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	400 IRenderer rend; // The window's renderer
5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	401
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	402 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	403
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	404 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	405 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	406 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	407 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	408 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	409
8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	410 BorderDimensions border; // Total border size (move plus resize)
80 ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	411 +/
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	412 }

Mercurial > projects > mde

annotate mde/gui/widget/Floating.d @ 80:ea58f277f487