diff options
author | Sebastian Geerken <devnull@localhost> | 2015-01-08 14:51:23 +0100 |
---|---|---|
committer | Sebastian Geerken <devnull@localhost> | 2015-01-08 14:51:23 +0100 |
commit | 3fa61740d50d8a8fd6c61eb86e1f7a45a3762570 (patch) | |
tree | b6d857642d861fc594292ec69260bfc3cc617be0 /dw/alignedtablecell.cc | |
parent | e05ebd46d570cd64c116ed4bdde669ea0962e99b (diff) | |
parent | 428094b178eb03d8e500c81837caac402e4b138c (diff) |
Merge with main repo.
Diffstat (limited to 'dw/alignedtablecell.cc')
-rw-r--r-- | dw/alignedtablecell.cc | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/dw/alignedtablecell.cc b/dw/alignedtablecell.cc index e7ab2741..dc7d88c9 100644 --- a/dw/alignedtablecell.cc +++ b/dw/alignedtablecell.cc @@ -17,8 +17,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ - - #include "alignedtablecell.hh" #include "table.hh" #include "tablecell.hh" @@ -58,6 +56,11 @@ bool AlignedTableCell::isBlockLevel () return tablecell::isBlockLevel (); } +bool AlignedTableCell::mustBeWidenedToAvailWidth () +{ + return tablecell::mustBeWidenedToAvailWidth (); +} + int AlignedTableCell::getAvailWidthOfChild (Widget *child, bool forceValue) { DBG_OBJ_ENTER ("resize", 0, "AlignedTableCell/getAvailWidthOfChild", @@ -104,15 +107,18 @@ void AlignedTableCell::correctRequisitionOfChild (Widget *child, } void AlignedTableCell::correctExtremesOfChild (Widget *child, - core::Extremes *extremes) + core::Extremes *extremes, + bool useAdjustmentWidth) { DBG_OBJ_ENTER ("resize", 0, "AlignedTableCell/correctExtremesOfChild", "%p, %d (%d) / %d (%d)", child, extremes->minWidth, extremes->minWidthIntrinsic, extremes->maxWidth, extremes->maxWidthIntrinsic); - AlignedTextblock::correctExtremesOfChild (child, extremes); - tablecell::correctCorrectedExtremesOfChild (this, child, extremes); + AlignedTextblock::correctExtremesOfChild (child, extremes, + useAdjustmentWidth); + tablecell::correctCorrectedExtremesOfChild (this, child, extremes, + useAdjustmentWidth); DBG_OBJ_LEAVE (); } |