diff options
| author | Sebastian Geerken <devnull@localhost> | 2014-12-12 12:55:34 +0100 |
|---|---|---|
| committer | Sebastian Geerken <devnull@localhost> | 2014-12-12 12:55:34 +0100 |
| commit | 1d88499f6f895ab2f8159c6f150b0e41c5151d59 (patch) | |
| tree | 769581dd0bfa5d02dd44609eea0aa79800b7d707 | |
| parent | 16d44971c6cba5ee542ef6a7621eb54b4b9286a2 (diff) | |
| parent | ae04d50269ea70e5e17d0975039276c0eb24de0a (diff) | |
Merge with main repo.
| -rw-r--r-- | dw/textblock.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dw/textblock.cc b/dw/textblock.cc index f5308d8c..28197621 100644 --- a/dw/textblock.cc +++ b/dw/textblock.cc @@ -766,8 +766,8 @@ int Textblock::getAvailWidthOfChild (Widget *child, bool forceValue) !mustBeWidenedToAvailWidth ()) { core::Extremes extremes; getExtremes (&extremes); - if (width > extremes.maxWidth) - width = extremes.maxWidth; + if (width > extremes.maxWidth - boxDiffWidth () - leftInnerPadding) + width = extremes.maxWidth - boxDiffWidth () - leftInnerPadding; } } |