From 05bf935dd5a9a1caca8b9d2fe4a0b1ca1a7787bc Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Fri, 13 Feb 2009 00:23:17 +0000 Subject: [PATCH] do not hide menus when collapsing widget git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@2029 0778d3d1-df1d-0410-868b-ea421aaaa00d --- ChangeLog | 3 +++ src/gui/fluiq/collapsible_widget.cpp | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b677c1674..112168b9d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2009-02-12 Tobias Doerffel + * src/gui/fluiq/collapsible_widget.cpp: + do not hide menus when collapsing widget + * src/gui/automation_editor.cpp: * include/automation_editor.h: * include/piano_roll.h: diff --git a/src/gui/fluiq/collapsible_widget.cpp b/src/gui/fluiq/collapsible_widget.cpp index e8a02f3bf..455ffc18a 100644 --- a/src/gui/fluiq/collapsible_widget.cpp +++ b/src/gui/fluiq/collapsible_widget.cpp @@ -24,6 +24,7 @@ #include +#include #include #include @@ -397,7 +398,8 @@ void FLUIQ::CollapsibleWidget::collapse( void ) // hide all children foreach( QWidget * w, findChildren() ) { - if( w != m_header && w->parentWidget() == this ) + if( w != m_header && w->parentWidget() == this && + qobject_cast( w ) == NULL ) { w->hide(); }