ardour/livetrax
13
0
Fork 0
Code

push2: improve logic of ::set_current_layout() to allow reset of same layout

Browse Source
This commit is contained in:
Paul Davis 2016-09-27 13:47:29 -05:00
parent 0006f28511
commit 303358973f
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libs/surfaces/push2/push2.cc
View File

@ -1712,20 +1712,26 @@ Push2::get_color (ColorName name)
void
Push2::set_current_layout (Push2Layout* layout)
{
if (_current_layout) {
_current_layout->hide ();
_canvas->root()->remove (_current_layout);
_previous_layout = _current_layout;
}
_current_layout = layout;
if (_current_layout) {
_canvas->root()->add (_current_layout);
if (layout && layout == _current_layout) {
_current_layout->show ();
}
} else {
_canvas->request_redraw ();
if (_current_layout) {
_current_layout->hide ();
_canvas->root()->remove (_current_layout);
_previous_layout = _current_layout;
}
_current_layout = layout;
if (_current_layout) {
_canvas->root()->add (_current_layout);
_current_layout->show ();
}
_canvas->request_redraw ();
}
}
void