mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-04-02 21:35:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable-0.4' into stable-0.4-new-fx-mixer

Browse Source 
Conflicts:
	src/gui/FxMixerView.cpp
This commit is contained in:
Tobias Doerffel
2014-01-15 22:59:49 +01:00
parent 4728fb425a 8e165bdbcf
commit 6993eda404
22 changed files with 447 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/FxMixerView.cpp
View File

@@ -48,6 +48,7 @@
#include "song.h"
#include "bb_track_container.h"
FxMixerView::FxMixerView() :
QWidget(),
ModelView( NULL, this ),
@@ -59,6 +60,7 @@ FxMixerView::FxMixerView() :
//QPalette pal = palette();
//pal.setColor( QPalette::Background, QColor( 72, 76, 88 ) );
//setPalette( pal );
setAutoFillBackground( true );
setWindowTitle( tr( "FX-Mixer" ) );
@@ -137,7 +139,7 @@ FxMixerView::FxMixerView() :
// add ourself to workspace
QMdiSubWindow * subWin =
QMdiSubWindow * subWin =
engine::mainWindow()->workspace()->addSubWindow( this );
Qt::WindowFlags flags = subWin->windowFlags();
flags &= ~Qt::WindowMaximizeButtonHint;