ardour/livetrax
13
0
Fork 0
Code

Canvas: improve behavior of Widget::compute_bounding_box()

Browse Source 
Firstly, ::compute_bounding_box() cannot allocate space, so do not try to do that here.
Secondly, if there is no allocation yet, use the CairoWidget's own size_request()
This commit is contained in:
Paul Davis 2021-09-10 12:59:29 -06:00
parent be461e95e1
commit 63a74d0911
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libs/canvas/widget.cc
View File

@ -124,20 +124,13 @@ Widget::_size_allocate (Rect const & r)
void void
Widget::compute_bounding_box () const Widget::compute_bounding_box () const
{ {
GtkRequisition req = { 0, 0 }; if (_allocation) {
Gtk::Allocation alloc; _bounding_box = Rect (0, 0, _allocation.width(), _allocation.height());
} else {
_widget.size_request (req); GtkRequisition req = { 0, 0 };
_widget.size_request (req);
_bounding_box = Rect (0, 0, req.width, req.height); _bounding_box = Rect (0., 0., req.width, req.height);
}
/* make sure the widget knows that it got what it asked for */
alloc.set_x (0);
alloc.set_y (0);
alloc.set_width (req.width);
alloc.set_height (req.height);
_widget.size_allocate (alloc);
bb_clean (); bb_clean ();
} }