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 'gui_application' into ed_refac

Browse Source 
Conflicts:
	src/core/Song.cpp
	src/gui/MainWindow.cpp
This commit is contained in:
Lukas W
2015-01-07 00:03:32 +01:00
parent 0c4833ca4a 0df3998f95
commit 748cccd266
48 changed files with 436 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/FxMixerView.cpp
View File

@@ -41,6 +41,7 @@
#include "Knob.h"
#include "Engine.h"
#include "embed.h"
#include "GuiApplication.h"
#include "MainWindow.h"
#include "gui_templates.h"
#include "InstrumentTrack.h"
@@ -141,13 +142,13 @@ FxMixerView::FxMixerView() :
updateGeometry();
// timer for updating faders
connect( Engine::mainWindow(), SIGNAL( periodicUpdate() ),
connect( gui->mainWindow(), SIGNAL( periodicUpdate() ),
this, SLOT( updateFaders() ) );
// add ourself to workspace
QMdiSubWindow * subWin =
Engine::mainWindow()->workspace()->addSubWindow( this );
gui->mainWindow()->workspace()->addSubWindow( this );
Qt::WindowFlags flags = subWin->windowFlags();
flags &= ~Qt::WindowMaximizeButtonHint;
subWin->setWindowFlags( flags );