summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dw/table.cc90
-rw-r--r--dw/table.hh5
-rw-r--r--dw/widget.cc29
-rw-r--r--dw/widget.hh3
4 files changed, 101 insertions, 26 deletions
diff --git a/dw/table.cc b/dw/table.cc
index 4f450f51..3cdff345 100644
--- a/dw/table.cc
+++ b/dw/table.cc
@@ -208,7 +208,7 @@ int Table::getAvailWidthOfChild (Widget *child, bool forceValue)
DBG_OBJ_ENTER ("resize", 0, "getAvailWidthOfChild", "%p, %s",
child, forceValue ? "true" : "false");
- int width = -1;
+ int width;
// Unlike other containers, the table widget sometimes narrows
// columns to a width less than specified by CSS (see
@@ -216,33 +216,73 @@ int Table::getAvailWidthOfChild (Widget *child, bool forceValue)
// be calculated in all cases.
if (forceValue) {
calcCellSizes (false);
-
- // "child" is not a direct child, but a direct descendant.
- // Search for the actual childs.
- Widget *actualChild = child;
- while (actualChild != NULL && actualChild->getParent () != this)
- actualChild = actualChild->getParent ();
-
- assert (actualChild != NULL);
-
- // TODO This is inefficient. (Use parentRef?)
- for (int row = numRows - 1; width == -1 && row >= 0; row--) {
- for (int col = 0; width == -1 && col < numCols; col++) {
- int n = row * numCols + col;
- if (childDefined (n) &&
- children->get(n)->cell.widget == actualChild) {
- DBG_OBJ_MSGF ("resize", 1, "calculated from column %d", col);
- width = (children->get(n)->cell.colspanEff - 1)
- * getStyle()->hBorderSpacing;
- for (int i = 0; i < children->get(n)->cell.colspanEff; i++)
- width += colWidths->get (col + i);
- width = misc::max (width, 0);
- }
+ width = calcAvailWidthForDescendant (child);
+ } else
+ width = -1;
+
+ DBG_OBJ_MSGF ("resize", 1, "=> %d", width);
+ DBG_OBJ_LEAVE ();
+ return width;
+}
+
+void Table::correctRequisitionOfChild (core::Widget *child,
+ core::Requisition *requisition,
+ void (*splitHeightFun) (int, int*, int*))
+{
+ // TODO Same comments as in Widget::correctRequisitionOfChild may
+ // apply here.
+
+ DBG_OBJ_ENTER ("resize", 0, "correctRequisitionOfChild",
+ "%p, %d * (%d + %d), ...)",
+ child, requisition->width, requisition->ascent,
+ requisition->descent);
+
+ if (child->getStyle()->width != core::style::LENGTH_AUTO) {
+ calcCellSizes (false);
+ // The requisition is always the width of the column; the table
+ // widget is special in inforcing this, based on extremes, which
+ // may again be corrected again by CSS attributes.
+ requisition->width = calcAvailWidthForDescendant (child);
+ }
+
+ correctReqHeightOfChild (child, requisition, splitHeightFun);
+
+ DBG_OBJ_MSGF ("resize", 1, "=> %d * (%d + %d)",
+ requisition->width, requisition->ascent,
+ requisition->descent);
+ DBG_OBJ_LEAVE ();
+}
+
+int Table::calcAvailWidthForDescendant (Widget *child)
+{
+ DBG_OBJ_ENTER ("resize", 0, "calcAvailWidthForDescendant", "%p", child);
+
+ // "child" is not a direct child, but a direct descendant. Search
+ // for the actual childs.
+ Widget *actualChild = child;
+ while (actualChild != NULL && actualChild->getParent () != this)
+ actualChild = actualChild->getParent ();
+
+ assert (actualChild != NULL);
+
+ // TODO This is inefficient. (Use parentRef?)
+ int width = -1;
+ for (int row = numRows - 1; width == -1 && row >= 0; row--) {
+ for (int col = 0; width == -1 && col < numCols; col++) {
+ int n = row * numCols + col;
+ if (childDefined (n) &&
+ children->get(n)->cell.widget == actualChild) {
+ DBG_OBJ_MSGF ("resize", 1, "calculated from column %d", col);
+ width = (children->get(n)->cell.colspanEff - 1)
+ * getStyle()->hBorderSpacing;
+ for (int i = 0; i < children->get(n)->cell.colspanEff; i++)
+ width += colWidths->get (col + i);
+ width = misc::max (width, 0);
}
}
-
- assert (width != -1);
}
+
+ assert (width != -1);
DBG_OBJ_MSGF ("resize", 1, "=> %d", width);
DBG_OBJ_LEAVE ();
diff --git a/dw/table.hh b/dw/table.hh
index 186f1f50..4cb97040 100644
--- a/dw/table.hh
+++ b/dw/table.hh
@@ -411,6 +411,8 @@ private:
children->get(n)->type != Child::SPAN_SPACE;
}
+ int calcAvailWidthForDescendant (Widget *child);
+
void reallocChildren (int newNumCols, int newNumRows);
void calcCellSizes (bool calcHeights);
@@ -442,6 +444,9 @@ protected:
void resizeDrawImpl ();
int getAvailWidthOfChild (Widget *child, bool forceValue);
+ void correctRequisitionOfChild (core::Widget *child,
+ core::Requisition *requisition,
+ void (*splitHeightFun) (int, int*, int*));
void containerSizeChangedForChildren ();
bool usesAvailWidth ();
diff --git a/dw/widget.cc b/dw/widget.cc
index ba2d8c8f..83c401a6 100644
--- a/dw/widget.cc
+++ b/dw/widget.cc
@@ -1292,7 +1292,21 @@ void Widget::correctRequisitionOfChild (Widget *child, Requisition *requisition,
// TODO Correct by extremes?
DBG_OBJ_ENTER ("resize", 0, "correctRequisitionOfChild",
- "%p, %d * (%d + %d), ...)",
+ "%p, %d * (%d + %d), ...", child, requisition->width,
+ requisition->ascent, requisition->descent);
+
+ correctReqWidthOfChild (child, requisition);
+ correctReqHeightOfChild (child, requisition, splitHeightFun);
+
+ DBG_OBJ_MSGF ("resize", 1, "=> %d * (%d + %d)",
+ requisition->width, requisition->ascent,
+ requisition->descent);
+ DBG_OBJ_LEAVE ();
+}
+
+void Widget::correctReqWidthOfChild (Widget *child, Requisition *requisition)
+{
+ DBG_OBJ_ENTER ("resize", 0, "correctReqWidthOfChild", "%p, %d * (%d + %d)",
child, requisition->width, requisition->ascent,
requisition->descent);
@@ -1308,6 +1322,19 @@ void Widget::correctRequisitionOfChild (Widget *child, Requisition *requisition,
}
}
+ DBG_OBJ_MSGF ("resize", 1, "=> %d * (%d + %d)",
+ requisition->width, requisition->ascent,
+ requisition->descent);
+ DBG_OBJ_LEAVE ();
+}
+
+void Widget::correctReqHeightOfChild (Widget *child, Requisition *requisition,
+ void (*splitHeightFun) (int, int*, int*))
+{
+ DBG_OBJ_ENTER ("resize", 0, "correctReqHeightOfChild",
+ "%p, %d * (%d + %d), ...", child, requisition->width,
+ requisition->ascent, requisition->descent);
+
// TODO Perhaps split first, then add box ascent and descent.
if (style::isAbsLength (child->getStyle()->height))
splitHeightFun (style::absLengthVal (child->getStyle()->height)
diff --git a/dw/widget.hh b/dw/widget.hh
index bb41b3e3..a2bda3c0 100644
--- a/dw/widget.hh
+++ b/dw/widget.hh
@@ -320,6 +320,9 @@ protected:
Requisition *requisition,
void (*splitHeightFun) (int, int*,
int*));
+ void correctReqWidthOfChild (Widget *child, Requisition *requisition);
+ void correctReqHeightOfChild (Widget *child, Requisition *requisition,
+ void (*splitHeightFun) (int, int*, int*));
virtual void correctExtremesOfChild (Widget *child, Extremes *extremes);
virtual void containerSizeChangedForChildren ();