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

comparison mde/gui/widget/layout.d @ 142:9dabcc44f515

Tightened rules for alignment sharing of grid layouts (avoids a bug and generally preferable).

author	Diggory Hardy <diggory.hardy@gmail.com>
date	Sun, 08 Feb 2009 17:36:57 +0000
parents	6f69a9c111eb
children	66c58e5b0062

comparison

equal deleted inserted replaced

-:6f69a9c111eb
+:9dabcc44f515
 * Derived constructors may also set initWidths to the array of column widths followed by
 * row heights used to initially set the row/column dimensions. */
 protected this (IWidgetManager mgr, IParentWidget parent, widgetID id, WidgetData data) {
 super (mgr, parent, id);
-// Create cell aligners with appropriate col/row adjustment function
+// Create cell aligners, potentially sharing
 if (data.ints[1] & 1)
-	    col = AlignColumns.getInstance (id, cols);
+	    col = AlignColumns.getInstance (id, parent, cols, false);
 else
-	    col = (new AlignColumns (cols));
+	    col = (new AlignColumns (cols,null));
 if (data.ints[1] & 2)
-	    row = AlignColumns.getInstance (id~"R", rows);      // id must be unique to that for cols!
+	    row = AlignColumns.getInstance (id, parent, rows, true);
 else
-	    row = (new AlignColumns (rows));
+	    row = (new AlignColumns (rows,null));
 AlignColumns.CallbackStruct cbS;
 cbS.setWidth = &setColWidth;
 cbS.sADD = &setupAlignDimData;
 cbS.newMW = &colNewMW;
 /* All widgets in the grid, by row. Order:  [ 0 1 ]
 *                                          [ 2 3 ] */
 //IChildWidget[] subWidgets; (inherited from AParentWidget)
-AlignColumns col, row;	// aligners for cols and rows
+package AlignColumns col, row;	// aligners for cols and rows
 				// "rows" allocated in col and row; return value of *.addRows():
 size_t colR = size_t.max, rowR = size_t.max;
 }
 * Cells are not directly interacted with, but minimal widths for each column are passed, and
 * callback functions are used to adjust the width of any column.
 *************************************************************************************************/
 package class AlignColumns
 {
-/** Instance returned will be shared with any other widgets of same widgetID.
+/** Get an aligner.
 *
-* Also ensures each widget sharing an instance expects the same number of columns. */
+* Will be shared with other layouts with the same id which have the same
-static AlignColumns getInstance (widgetID id, size_t columns) {
+* parent or if the parents share an aligner.
-AlignColumns* p = id in instances;
+*
+* Also ensures each widget sharing an instance expects the same number of
+* columns. */
+static AlignColumns getInstance (widgetID id, IParentWidget parent, size_t columns, bool horiz) {
+if (horiz)
+id ~= "H";	// make the ID different for each aligner
+AlignColumns[]* p = id in instances;
 if (p) {
-if (p.cols != columns)
+foreach (ac; *p) {
-throw new GuiException ("AlignColumns: no. of columns varies between sharing widgets (code error)");
+if (parent !is ac.parent) {	// If parents are different
-//logger.trace ("Shared alignment for: "~id);
+GridWidget parGrid = cast(GridWidget) parent,
-return *p;
+acPGrid = cast(GridWidget) ac.parent;
-} else {
+// and either is not a GridWidget
-auto a = new AlignColumns (columns);
+// or their aligners are different
-instances[id] = a;
+if (parGrid is null || acPGrid is null ||
-return a;
+horiz ? parGrid.row !is acPGrid.row
-}
+: parGrid.col !is acPGrid.col) {
-}
+continue;	// don't share with it
+}
-/** Create an instance. After creation, the number of columns can only be changed by calling
+}
-* reset.
+if (ac.cols != columns)
+continue;	// Alignment sharing with ContentListWidgets??
+return ac;
+}
+}
+auto a = new AlignColumns (columns, parent);
+if (p) *p ~= a;
+else instances[id] = [a];
+return a;
+}
+/** Create an aligner.
 *
 * After creation, minimal widths should be set for all columns (minWidth) and
-* setWidths must be called before other functions are used. */
+* setWidths must be called before other functions are used.
-this (size_t columns) {
+*
+* Params:
+*	columns = Number of columns. Not expected to change.
+*	parent = The parent of the GridWidget using this aligner. (Used when sharing aligners.) */
+this (size_t columns, IParentWidget parent) {
 	if (columns < 1)
 	    throw new GuiException("AlignColumns: created with <1 column (code error)");
 	minWidth.length = columns;
 	sizable.length = columns;
 static if (SIZABILITY & SIZABILITY_ENUM.START_TRUE)
 sizable[] = true;
 cols = columns;
+this.parent = parent;
 }
 /** Like IChildWidget's setup; calls sADD delegates. */
 void setup (uint n, uint flags) {
 	if (n != setup_n) {
 if (nd != 0) {	// needs enlarging or shrinking
 width[col] = nmw;
 foreach (cb; cbs)
 cb.setWidth (col, nmw, -1);
-if (lastSizable >= 0) {
+if (lastSizable >= 0)
-	if (nd != adjustCellSizes (nd, lastSizable, -1))
+	adjustCellSizes (nd, lastSizable, -1);
-logger.error ("New minimal size not applied correctly (code error): minWidth: {}, nmw: {}, col: {}, nd: {}", minWidth, nmw, col, nd);
+}
-}
-genPositions;
+debug wdim ow = w;
-}
+genPositions;
+debug if (w < ow)
+logger.error ("newMinWidth: shrunk (code error); w={}, ow={}, nd={}", w,ow,nd);
 //debug logger.trace ("newMW for col: minWidth: {}, nmw: {}, col: {}, nd: {}, mw: {}, w: {}", minWidth, nmw, col, nd, mw, w);
 foreach (cb; cbs)
 cb.newMW ();
 return true;
 // Callbacks used to actually adjust a column's width:
 uint setup_n = uint.max;	// param n of last setup call
 bool setupWidths;		// setWidths has been run
-static HashMap!(widgetID,AlignColumns) instances;
+IParentWidget parent;	// Used to determine when to share aligner
+static HashMap!(widgetID,AlignColumns[]) instances;
 static this () {
-instances = new HashMap!(widgetID,AlignColumns);
+instances = new HashMap!(widgetID,AlignColumns[]);
 }
 alias IParentWidget.SIZABILITY SIZABILITY;
 alias IParentWidget.SIZABILITY_ENUM SIZABILITY_ENUM;

Mercurial > projects > mde

comparison mde/gui/widget/layout.d @ 142:9dabcc44f515