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/bullet.cc | |
parent | e05ebd46d570cd64c116ed4bdde669ea0962e99b (diff) | |
parent | 428094b178eb03d8e500c81837caac402e4b138c (diff) |
Merge with main repo.
Diffstat (limited to 'dw/bullet.cc')
-rw-r--r-- | dw/bullet.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/dw/bullet.cc b/dw/bullet.cc index 0b4b5983..e01191c3 100644 --- a/dw/bullet.cc +++ b/dw/bullet.cc @@ -44,10 +44,9 @@ void Bullet::sizeRequestImpl (core::Requisition *requisition) void Bullet::getExtremesImpl (core::Extremes *extremes) { - extremes->minWidth = extremes->maxWidth = + extremes->minWidth = extremes->maxWidth = extremes->adjustmentWidth = + extremes->minWidthIntrinsic = extremes->maxWidthIntrinsic = lout::misc::max (getStyle()->font->xHeight * 4 / 5, 1); - extremes->minWidthIntrinsic = extremes->minWidth; - extremes->maxWidthIntrinsic = extremes->maxWidth; } void Bullet::containerSizeChangedForChildren () |