diff options
Diffstat (limited to 'dw')
| -rw-r--r-- | dw/table.cc | 20 | ||||
| -rw-r--r-- | dw/table.hh | 32 |
2 files changed, 18 insertions, 34 deletions
diff --git a/dw/table.cc b/dw/table.cc index 460e9a29..8b8fe853 100644 --- a/dw/table.cc +++ b/dw/table.cc @@ -907,7 +907,7 @@ void Table::actuallyCalcCellSizes (bool calcHeights) int childHeight; core::Extremes extremes; - // Will also call calcColumnExtremes(), when needed. + // Will also call forceCalcColumnExtremes(), when needed. getExtremes (&extremes); int availWidth = getAvailWidth (true); @@ -1285,24 +1285,6 @@ void Table::apportionRowSpan () /** - * \brief Fills dw::Table::colExtremes, only if recalculation is necessary. - * - * \bug Some parts are missing. - */ -void Table::_unused_calcColumnExtremes () -{ - // This method is actually not used. Consider removal. - - DBG_OBJ_ENTER0 ("resize", 0, "calcColumnExtremes"); - - if (extremesChanged () || extremesQueued ()) - forceCalcColumnExtremes (); - - DBG_OBJ_LEAVE (); -} - - -/** * \brief Fills dw::Table::colExtremes in all cases. */ void Table::forceCalcColumnExtremes () diff --git a/dw/table.hh b/dw/table.hh index c94514c0..b4f6a7bc 100644 --- a/dw/table.hh +++ b/dw/table.hh @@ -43,29 +43,26 @@ namespace dw { * sizeRequestImpl [color="#0000ff", URL="\ref dw::Table::sizeRequestImpl"]; * sizeAllocateImpl [color="#0000ff", * URL="\ref dw::Table::sizeAllocateImpl"]; + * getExtremes [color="#0000ff", URL="\ref dw::core::Widget::getExtremes"]; * getExtremesImpl [color="#0000ff", URL="\ref dw::Table::getExtremesImpl"]; * - * subgraph cluster_sizes { - * style="dashed"; color="#8080c0"; - * calcCellSizes [URL="\ref dw::Table::calcCellSizes"]; - * forceCalcCellSizes [URL="\ref dw::Table::forceCalcCellSizes"]; - * } - * - * subgraph cluster_extremes { - * style="dashed"; color="#8080c0"; - * calcColumnExtremes [URL="\ref dw::Table::calcColumnExtremes"]; - * forceCalcColumnExtremes[URL="\ref dw::Table::forceCalcColumnExtremes"]; - * } + * calcCellSizes [label="calcCellSizes (calcHeights = true)", + * URL="\ref dw::Table::calcCellSizes"]; + * forceCalcCellSizes [label="forceCalcCellSizes (calcHeights = true)", + * URL="\ref dw::Table::forceCalcCellSizes"]; + * actuallyCalcCellSizes[label="actuallyCalcCellSizes (calcHeights = true)", + * URL="\ref dw::Table::actuallyCalcCellSizes"]; + * forceCalcColumnExtremes[URL="\ref dw::Table::forceCalcColumnExtremes"]; * * sizeRequestImpl -> forceCalcCellSizes [label="[B]"]; * sizeAllocateImpl -> calcCellSizes [label="[A]"]; * getExtremesImpl -> forceCalcColumnExtremes [label="[B]"]; * - * forceCalcCellSizes -> calcColumnExtremes; + * forceCalcCellSizes -> actuallyCalcCellSizes; + * actuallyCalcCellSizes-> getExtremes; + * getExtremes -> getExtremesImpl [style="dashed", label="[C]"]; * * calcCellSizes -> forceCalcCellSizes [style="dashed", label="[C]"]; - * calcColumnExtremes -> forceCalcColumnExtremes [style="dashed", - * label="[C]"]; * } * \enddot * @@ -78,6 +75,12 @@ namespace dw { * [C] Whether this function is called, depends on NEEDS_RESIZE / * RESIZE_QUEUED / EXTREMES_CHANGED / EXTREMES_QUEUED. * + * **TODO:** + * + * - Are <tt>*[cC]alcCellSizes (calcHeights = *false*)</tt> not + * necessary anymore? + * - Calculating available sizes (Table::getAvailWidthOfChild) should + * be documented in this diagram, too. * * <h4>Apportionment</h4> * @@ -437,7 +440,6 @@ private: void actuallyCalcCellSizes (bool calcHeights); void apportionRowSpan (); - void _unused_calcColumnExtremes (); void forceCalcColumnExtremes (); void calcExtremesSpanMultiCols (int col, int cs, core::Extremes *cellExtremes, |