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

annotate mde/gui/widget/Floating.d @ 131:9cff74f68b84

Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Moved Widget.AWidget to AChildWidget.AChildWidget and Widget.AParentWidget to AParentWidget.AParentWidget. Removed ASingleParentWidget to improve code sharing. AChildWidget doesn't implement IParentWidget like AWidget did. New IPopupParentWidget extending IParentWidget for the WM and some widgets to handle popups. Cut old popup management code. New underMouse() function replacing highlight(); called on all widgets. Separate menu-popup and button widgets aren't needed for menus now. Functions returning content widgets have been moved to their own module. Cleaned up jobs.txt. Switched to 80 line length for Ddoc.

author	Diggory Hardy <diggory.hardy@gmail.com>
date	Wed, 21 Jan 2009 13:01:40 +0000
parents	c5c38eaadb64
children	9f035cd139c6

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
131 9cff74f68b84 Major revisions to popup handling. Buttons can close menus now, plus some smaller impovements. Removed Widget module. Diggory Hardy <diggory.hardy@gmail.com> parents: 130 diff changeset	19 import mde.gui.widget.AParentWidget;
80 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;
123 d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	21 import mde.content.Content;
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	22
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	23 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	24
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	25 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	26 static this () {
82 ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 80 diff changeset	27 logger = Log.getLogger ("mde.gui.widget.Floating");
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	28 }
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	29
80 ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	30 /** 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	31 *
96 dbf332403c6e Improvements to FloatingAreaWidget: positioning, passing click events and draw order. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	32 * The position of each sub-widget is set from dimension data, but not the size.
80 ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	33 * Rationale: parents' need to set subwidgets' positions when its position is set, so it needs to
96 dbf332403c6e Improvements to FloatingAreaWidget: positioning, passing click events and draw order. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	34 * know their positions.
80 ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	35 *
123 d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	36 * Data: Each string item is interpreted as a sub-widget widgetID to add as a floating window.
d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	37 * Ints consist of widget type followed by a border type (flags from IRenderer.Border.BTYPE) for
d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	38 * each sub-widget. */
95 2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 92 diff changeset	39 class FloatingAreaWidget : AParentWidget
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	40 {
123 d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	41 this (IWidgetManager mgr, IParentWidget parent, widgetID id, WidgetData data, IContent content) {
97 30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	42 if (data.ints.length != 1 + data.strings.length)
96 dbf332403c6e Improvements to FloatingAreaWidget: positioning, passing click events and draw order. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	43 throw new WidgetDataException (this);
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 114 diff changeset	44 super (mgr, parent, id);
80 ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	45
96 dbf332403c6e Improvements to FloatingAreaWidget: positioning, passing click events and draw order. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	46 subWidgets.length = data.strings.length; // widgets created from string data
dbf332403c6e Improvements to FloatingAreaWidget: positioning, passing click events and draw order. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	47 sWOrder.length = subWidgets.length;
97 30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	48 sWData.length = subWidgets.length;
96 dbf332403c6e Improvements to FloatingAreaWidget: positioning, passing click events and draw order. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	49 foreach (i,s; data.strings) {
123 d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	50 subWidgets[i] = mgr.makeWidget (this, s, content);
96 dbf332403c6e Improvements to FloatingAreaWidget: positioning, passing click events and draw order. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	51 sWOrder[i] = i;
97 30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	52 sWData[i].borderType = cast(BTYPE) data.ints[i+1];
96 dbf332403c6e Improvements to FloatingAreaWidget: positioning, passing click events and draw order. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	53 }
dbf332403c6e Improvements to FloatingAreaWidget: positioning, passing click events and draw order. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	54
97 30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	55 wdim[] dd = mgr.dimData (id);
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	56 if (dd.length == subWidgets.length * 4) {
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	57 foreach (i, ref d; sWData)
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	58 (&d.x)[0..4] = dd[i4..i4+4];
80 ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	59 }
96 dbf332403c6e Improvements to FloatingAreaWidget: positioning, passing click events and draw order. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	60 }
dbf332403c6e Improvements to FloatingAreaWidget: positioning, passing click events and draw order. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	61
114 b16a534f5302 Changes for tango r4201. Added override keyword in a lot of places. Diggory Hardy <diggory.hardy@gmail.com> parents: 111 diff changeset	62 override bool setup (uint n, uint flags) {
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 114 diff changeset	63 debug (mdeWidgets) logger.trace ("FloatingAreaWidget.setup");
97 30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	64 foreach (i, ref d; sWData) with (d) {
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	65 auto widg = subWidgets[i];
111 1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 103 diff changeset	66 if (!widg.setup (n, flags) && n != 0 && !(flags & 1))
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 103 diff changeset	67 continue; // no changes; skip the rest
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 103 diff changeset	68
1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 103 diff changeset	69 d.border = mgr.renderer.getBorder (borderType, widg.isWSizable, widg.isHSizable);
97 30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	70 mw = widg.minWidth + border.x1 + border.x2;
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	71 mh = widg.minHeight + border.y1 + border.y2;
103 42e241e7be3e ContentList content type; getting content items/lists from Options generically via content.Items, and a new addContent widget function. Several improvements to generic handling of content. New button-with-text widget. Diggory Hardy <diggory.hardy@gmail.com> parents: 99 diff changeset	72 if (w < mw \|\| !widg.isWSizable) w = mw;
42e241e7be3e ContentList content type; getting content items/lists from Options generically via content.Items, and a new addContent widget function. Several improvements to generic handling of content. New button-with-text widget. Diggory Hardy <diggory.hardy@gmail.com> parents: 99 diff changeset	73 if (h < mh \|\| !widg.isHSizable) h = mh;
97 30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	74 widg.setWidth (w - border.x1 - border.x2, -1);
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	75 widg.setHeight (h - border.y1 - border.y2, -1);
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	76 }
111 1655693702fc Resolved ticket #4, allowing widgets to reload strings and recalculate sizes mid-run. Diggory Hardy <diggory.hardy@gmail.com> parents: 103 diff changeset	77 return false; // floating area size is not changed
97 30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	78 }
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	79
114 b16a534f5302 Changes for tango r4201. Added override keyword in a lot of places. Diggory Hardy <diggory.hardy@gmail.com> parents: 111 diff changeset	80 override bool saveChanges () {
97 30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	81 wdim[] dd = new wdim[sWData.length*4];
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	82 foreach (i, ref d; sWData) {
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	83 subWidgets[i].saveChanges ();
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	84 dd[4i..4i+4] = (&d.x)[0..4];
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	85 }
80 ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	86
121 5b37d0400732 Widgets now receive and store their parent (IParentWidget). Infinite widget recursion checks. WidgetManager code redistributed. Diggory Hardy <diggory.hardy@gmail.com> parents: 114 diff changeset	87 mgr.dimData (id, dd); // save positions
96 dbf332403c6e Improvements to FloatingAreaWidget: positioning, passing click events and draw order. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	88 return true;
dbf332403c6e Improvements to FloatingAreaWidget: positioning, passing click events and draw order. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	89 }
dbf332403c6e Improvements to FloatingAreaWidget: positioning, passing click events and draw order. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	90
114 b16a534f5302 Changes for tango r4201. Added override keyword in a lot of places. Diggory Hardy <diggory.hardy@gmail.com> parents: 111 diff changeset	91 override void setWidth (wdim nw, int) {
96 dbf332403c6e Improvements to FloatingAreaWidget: positioning, passing click events and draw order. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	92 w = nw;
dbf332403c6e Improvements to FloatingAreaWidget: positioning, passing click events and draw order. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	93 // check all floating widgets are visible
97 30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	94 foreach (i, ref d; sWData) with (d) {
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	95 if (x + w > this.w)
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	96 x = (w > this.w) ? 0 : this.w - w;
96 dbf332403c6e Improvements to FloatingAreaWidget: positioning, passing click events and draw order. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	97 }
dbf332403c6e Improvements to FloatingAreaWidget: positioning, passing click events and draw order. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	98 }
114 b16a534f5302 Changes for tango r4201. Added override keyword in a lot of places. Diggory Hardy <diggory.hardy@gmail.com> parents: 111 diff changeset	99 override void setHeight (wdim nh, int) {
96 dbf332403c6e Improvements to FloatingAreaWidget: positioning, passing click events and draw order. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	100 h = nh;
97 30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	101 foreach (i, ref d; sWData) with (d) {
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	102 if (y + h > this.h)
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	103 y = (h > this.h) ? 0 : this.h - h;
80 ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	104 }
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	105 }
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	106
130 c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 126 diff changeset	107 override bool isWSizable () {
c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 126 diff changeset	108 return true;
c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 126 diff changeset	109 }
c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 126 diff changeset	110 override bool isHSizable () {
c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 126 diff changeset	111 return true;
c5c38eaadb64 Changed how sizability is set for parents: can require all sub-widgets resizable or only one to set parent resizable. Diggory Hardy <diggory.hardy@gmail.com> parents: 126 diff changeset	112 }
92 085f2ca31914 Shared alignments supported in more complex cases. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	113
114 b16a534f5302 Changes for tango r4201. Added override keyword in a lot of places. Diggory Hardy <diggory.hardy@gmail.com> parents: 111 diff changeset	114 override void setPosition (wdim nx, wdim ny) {
97 30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	115 x = nx;
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	116 y = ny;
80 ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	117
96 dbf332403c6e Improvements to FloatingAreaWidget: positioning, passing click events and draw order. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	118 size_t n = subWidgets.length;
97 30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	119 foreach (i, ref d; sWData)
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	120 subWidgets[i].setPosition (x + d.x + d.border.x1, y + d.y + d.border.y1);
80 ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	121 }
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	122
126 c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	123 override void minWChange (IChildWidget widg, wdim nmw) {
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	124 with (sWData[getWidgetIndex(widg)]) {
123 d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	125 mw = nmw + border.x1 + border.x2;
d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	126
d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	127 if (mw > w \|\| !widg.isWSizable) {
d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	128 w = mw;
d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	129 widg.setWidth (w - border.x1 - border.x2, -1);
d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	130 }
126 c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	131
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	132 if (x + w > this.w)
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	133 x = (w > this.w) ? 0 : this.w - w;
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	134
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	135 widg.setPosition (this.x + border.x1 + x,this.y + border.y1 + y);
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	136 mgr.requestRedraw;
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	137 }
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	138 }
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	139 override void minHChange (IChildWidget widg, wdim nmh) {
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	140 with (sWData[getWidgetIndex(widg)]) {
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	141 mh = nmh + border.y1 + border.y2;
c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	142
123 d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	143 if (mh > h \|\| !widg.isHSizable) {
d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	144 h = mh;
d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	145 widg.setHeight (h - border.y1 - border.y2, -1);
d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	146 }
d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	147
d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	148 if (y + h > this.h)
d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	149 y = (h > this.h) ? 0 : this.h - h;
d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	150
126 c9843fbaac88 Dynamic minimal size changing improved; works over layouts sharing alignment. Diggory Hardy <diggory.hardy@gmail.com> parents: 123 diff changeset	151 widg.setPosition (this.x + border.x1 + x,this.y + border.y1 + y);
123 d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	152 mgr.requestRedraw;
d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	153 }
d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	154 }
d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	155
114 b16a534f5302 Changes for tango r4201. Added override keyword in a lot of places. Diggory Hardy <diggory.hardy@gmail.com> parents: 111 diff changeset	156 override void draw () {
80 ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	157 super.draw;
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	158
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	159 mgr.renderer.restrict (x,y, w,h);
96 dbf332403c6e Improvements to FloatingAreaWidget: positioning, passing click events and draw order. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	160 foreach (i; sWOrder)
97 30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	161 with (sWData[i]) {
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	162 mgr.renderer.drawWindow (&border, this.x + x, this.y + y, w, h);
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	163 subWidgets[i].draw;
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	164 }
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	165 mgr.renderer.relax;
96 dbf332403c6e Improvements to FloatingAreaWidget: positioning, passing click events and draw order. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	166 }
dbf332403c6e Improvements to FloatingAreaWidget: positioning, passing click events and draw order. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	167
114 b16a534f5302 Changes for tango r4201. Added override keyword in a lot of places. Diggory Hardy <diggory.hardy@gmail.com> parents: 111 diff changeset	168 override IChildWidget getWidget (wdim cx, wdim cy) {
97 30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	169 debug scope (failure)
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	170 logger.warn ("getWidget: failure; values: click, pos, width - {}, {}, {} - {}, {}, {}", cx, x, w, cy, y, h);
96 dbf332403c6e Improvements to FloatingAreaWidget: positioning, passing click events and draw order. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	171 debug assert (cx >= x && cx < x + w && cy >= y && cy < y + h, "getWidget: not on widget (code error)");
dbf332403c6e Improvements to FloatingAreaWidget: positioning, passing click events and draw order. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	172
97 30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	173 foreach_reverse (j,i; sWOrder) with (sWData[i]) {
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	174 wdim lx = cx - (this.x + x);
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	175 wdim ly = cy - (this.y + y);
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	176 if (lx >= 0 && lx < w &&
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	177 ly >= 0 && ly < h)
96 dbf332403c6e Improvements to FloatingAreaWidget: positioning, passing click events and draw order. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	178 {
dbf332403c6e Improvements to FloatingAreaWidget: positioning, passing click events and draw order. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	179 sWOrder[j..$-1] = sWOrder[j+1..$].dup;
dbf332403c6e Improvements to FloatingAreaWidget: positioning, passing click events and draw order. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	180 sWOrder[$-1] = i;
dbf332403c6e Improvements to FloatingAreaWidget: positioning, passing click events and draw order. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	181 mgr.requestRedraw;
97 30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	182 if (lx >= border.x1 && lx < w-border.x2 &&
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	183 ly >= border.y1 && ly < h-border.y2)
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	184 return subWidgets[i].getWidget (cx,cy);
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	185 event = i;
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	186 return this;
96 dbf332403c6e Improvements to FloatingAreaWidget: positioning, passing click events and draw order. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	187 }
dbf332403c6e Improvements to FloatingAreaWidget: positioning, passing click events and draw order. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	188 }
97 30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	189 event = size_t.max;
96 dbf332403c6e Improvements to FloatingAreaWidget: positioning, passing click events and draw order. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	190 return this; // no match
80 ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	191 }
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	192
114 b16a534f5302 Changes for tango r4201. Added override keyword in a lot of places. Diggory Hardy <diggory.hardy@gmail.com> parents: 111 diff changeset	193 override int clickEvent (wdabs cx, wdabs cy, ubyte b, bool state) {
99 5de5810e3516 Implemented an editable TextContent widget; it's now possible to edit text options using the GUI. Diggory Hardy <diggory.hardy@gmail.com> parents: 97 diff changeset	194 if (event > subWidgets.length) return 0;
35 928db3c75ed3 Windows can now be moved. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	195 if (b == 1 && state == true) {
97 30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	196 active = event;
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	197 with (sWData[active]) {
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	198 resizeType = border.getResize (cx - this.x - x, cy - this.y - y, w,h);
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	199 alias border.RESIZE RESIZE;
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	200
97 30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	201 if (resizeType != RESIZE.NONE) {
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	202 // Set x/yDrag (unfortunately these need to be different for each edge)
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	203 if (resizeType & RESIZE.X1)
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	204 xDrag = w + cx;
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	205 else if (resizeType & RESIZE.X2)
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	206 xDrag = w - cx;
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	207
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	208 if (resizeType & RESIZE.Y1)
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	209 yDrag = h + cy;
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	210 else if (resizeType & RESIZE.Y2)
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	211 yDrag = h - cy;
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	212
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	213 mgr.addClickCallback (&endCallback);
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	214 mgr.addMotionCallback (&resizeCallback);
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	215 } else if (borderType & BTYPE.MOVE) { // window is being moved
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	216 xDrag = cx - x;
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	217 yDrag = cy - y;
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	218
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	219 mgr.addClickCallback (&endCallback);
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	220 mgr.addMotionCallback (&moveCallback);
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	221 }
38 8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	222 }
35 928db3c75ed3 Windows can now be moved. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	223 }
99 5de5810e3516 Implemented an editable TextContent widget; it's now possible to edit text options using the GUI. Diggory Hardy <diggory.hardy@gmail.com> parents: 97 diff changeset	224 return 0;
34 6b4116e6355c Work on the Gui: some of the framework for drag & drop. Also made Window an IWidget. Diggory Hardy <diggory.hardy@gmail.com> parents: 32 diff changeset	225 }
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
97 30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	227 protected:
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	228 void moveCallback (wdabs cx, wdabs cy) {
97 30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	229 with (sWData[active]) {
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	230 x = cx-xDrag;
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	231 y = cy-yDrag;
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	232
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	233 if (x < 0)
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	234 x = 0;
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	235 else if (x + w > this.w)
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	236 x = (w > this.w) ? 0 : this.w - w;
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	237 if (y < 0)
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	238 y = 0;
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	239 else if (y + h > this.h)
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	240 y = (h > this.h) ? 0 : this.h - h;
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	241
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	242 subWidgets[active].setPosition (this.x + x + border.x1, this.y + y + border.y1);
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	243 }
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	244 mgr.requestRedraw;
35 928db3c75ed3 Windows can now be moved. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	245 }
58 d43523ed4b62 Included a wdim typedef for all variables to do with window position or size instead of just using int. Diggory Hardy <diggory.hardy@gmail.com> parents: 46 diff changeset	246 void resizeCallback (wdabs cx, wdabs cy) {
97 30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	247 with (sWData[active]) {
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	248 if (resizeType & RESIZE.X1) {
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	249 wdim ow = w;
123 d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	250 w = xDrag - cx; // new width
d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	251 if (w < mw) w = mw; // limit to min width
d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	252 x += ow - w; // move by difference
d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	253 if (x < 0) { // limit to left edge of area
d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	254 w += x;
d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	255 x = 0;
d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	256 }
97 30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	257 subWidgets[active].setWidth (w - border.x1 - border.x2, 1);
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	258 }
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	259 else if (resizeType & RESIZE.X2) {
123 d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	260 w = xDrag + cx; // new width
d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	261 if (w < mw) w = mw; // limit to min width
d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	262 if (x + w > this.w) // limit to right edge of area
d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	263 w = this.w - x;
97 30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	264 subWidgets[active].setWidth (w - border.x1 - border.x2, -1);
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	265 }
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	266 if (resizeType & RESIZE.Y1) {
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	267 wdim oh = h;
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	268 h = yDrag - cy;
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	269 if (h < mh) h = mh;
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	270 y += oh - h;
123 d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	271 if (y < 0) {
d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	272 h += y;
d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	273 y = 0;
d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	274 }
97 30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	275 subWidgets[active].setHeight (h - border.y1 - border.y2, 1);
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	276 }
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	277 else if (resizeType & RESIZE.Y2) {
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	278 h = yDrag + cy;
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	279 if (h < mh) h = mh;
123 d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	280 if (y + h > this.h)
d3b2cefd46c9 minSizeChange() allows run-time changes to widgets' minimal size (except for shrinking in a GridLayoutWidget). Diggory Hardy <diggory.hardy@gmail.com> parents: 121 diff changeset	281 h = this.h - y;
97 30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	282 subWidgets[active].setHeight (h - border.y1 - border.y2, -1);
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	283 }
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	284 // Reposition widget and sub-widgets:
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	285 subWidgets[active].setPosition (this.x + x + border.x1, this.y + y + border.y1);
38 8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	286 }
97 30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	287 mgr.requestRedraw;
38 8c4c96f04e7f Windows can now be resized! Diggory Hardy <diggory.hardy@gmail.com> parents: 37 diff changeset	288 }
97 30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	289 bool endCallback (wdabs, wdabs, ubyte b, bool state) {
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	290 if (b == 1 && state == false) { // end of a move/resize
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	291 mgr.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	292 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	293 }
41 b3a6ca4516b4 The renderer now controls which parts of the window border allow resizing. Diggory Hardy <diggory.hardy@gmail.com> parents: 40 diff changeset	294 return false; // we haven't handled it
35 928db3c75ed3 Windows can now be moved. Diggory Hardy <diggory.hardy@gmail.com> parents: 34 diff changeset	295 }
39 5132301e9ed7 Implemented widget saving. Diggory Hardy <diggory.hardy@gmail.com> parents: 38 diff changeset	296
97 30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	297 struct SWData { // NOTE: x,y,w,h must be first elements; search (&d.x)
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	298 wdim x,y; // position (corner of border)
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	299 wdim w,h; // size (including border)
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	300 wdim mw,mh;
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	301 BTYPE borderType; // what type of border to put around the widget
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	302 IRenderer.Border border;
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	303 }
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	304 static assert (SWData.alignof == 4); // assumptions for optimization; search (&d.x)
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	305 SWData[] sWData;
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	306 size_t[] sWOrder; // indexes for draw order (top widget at end of list)
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	307
97 30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	308 // Click/drag information:
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	309 alias IRenderer.Border.BTYPE BTYPE;
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	310 alias IRenderer.Border.RESIZE RESIZE;
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	311 size_t event = size_t.max; // Border with last click/release: size_t.max: main area (no subwidget), i: subwidget[i]
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	312 size_t active = size_t.max; // Like event, but refers to widget being moved/resized
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	313 wdim xDrag, yDrag; // where a drag starts relative to x and y
30470bc19ca4 Floating widgets now work nicely: customizable borders added, resizing, moving. Diggory Hardy <diggory.hardy@gmail.com> parents: 96 diff changeset	314 RESIZE resizeType; // Type of current resize
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	315 }

Mercurial > projects > mde

annotate mde/gui/widget/Floating.d @ 131:9cff74f68b84