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

Allow plugin inline displays to shrink

Browse Source 
Plugin inline displays were forbidden to shrink as this might cause a deadlock
when the shrinkage causes the scrollbar to disappear.

display shrink → scrollbar unneeded → scrollbar disappears →
more horizontal space -> display grows -> scrollbar appears →
less horizontal space -> display shrink and so forth

This was formerly avoided by not allowing display shrinkage.

The solution proposed here sets the maximum height of the display to the
current height, if a scrollbar is present during resizing and has not been
present during the last resizing. So if this scrollbar disappears (after
resizing it might no longer be needed), the display would have the possibility
to grow, but it does not grow vertically as the maximum height is limited to
the current height.
This commit is contained in:
Johannes Mueller 2017-08-15 21:05:13 +02:00 committed by Robin Gareus
parent 869d48c9a6
commit f647ac7dae
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtk2_ardour/processor_box.cc
View File

@ -1568,6 +1568,7 @@ ProcessorEntry::PluginInlineDisplay::PluginInlineDisplay (ProcessorEntry& e, boo
: PluginDisplay (p, max_height)
, _entry (e)
, _scroll (false)
, _given_max_height (max_height)
{
std::string postfix = string_compose(_("\n%1+double-click to toggle inline-display"), Keyboard::tertiary_modifier_name ());
@ -1639,11 +1640,15 @@ ProcessorEntry::PluginInlineDisplay::update_height_alloc (uint32_t inline_height
}
if (shm != _cur_height) {
if (_scroll == sc || _cur_height < shm) {
queue_resize ();
queue_resize ();
if (!_scroll && sc) {
_max_height = shm;
} else {
_max_height = _given_max_height;
}
_cur_height = shm;
}
_scroll = sc;
}

1
gtk2_ardour/processor_box.h
View File

@ -258,6 +258,7 @@ private:
ProcessorEntry& _entry;
bool _scroll;
const uint32_t _given_max_height;
};
class LuaPluginDisplay : public PluginInlineDisplay {