ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Canvas: change behavior of Item::preferred_size() for items without an intrinsic size

This commit is contained in:
Paul Davis 2020-06-19 13:58:52 -06:00
parent ea96798ee9
commit 61742ededf
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libs/canvas/item.cc
View File

@ -1211,28 +1211,22 @@ Item::preferred_size (Duple& minimum, Duple& natural) const
if (_intrinsic_height < 0 && _intrinsic_width < 0) {
/* intrinsic size untouched, use bounding box */
/* intrinsic size untouched ... fall back on
arbitrary default (small) sizes.
*/
Rect bb (bounding_box());
if (!bb) {
natural.x = 2;
natural.y = 2;
} else {
natural.x = bb.width();
natural.y = bb.height();
}
minimum.x = 1;
minimum.y = 1;
natural.x = 2;
natural.y = 2;
} else {
natural.x = _intrinsic_width;
natural.y = _intrinsic_height;
minimum = natural;
}
minimum.x = 1;
minimum.y = 1;
}
void