mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-03-14 12:08:33 -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/core/Track.cpp
View File

@@ -56,6 +56,7 @@
#include "Clipboard.h"
#include "embed.h"
#include "Engine.h"
#include "GuiApplication.h"
#include "gui_templates.h"
#include "InstrumentTrack.h"
#include "MainWindow.h"
@@ -1136,7 +1137,7 @@ void TrackContentWidget::update()
*/
void TrackContentWidget::changePosition( const MidiTime & _new_pos )
{
if( m_trackView->trackContainerView() == Engine::getBBEditor()->trackContainerView() )
if( m_trackView->trackContainerView() == gui->getBBEditor()->trackContainerView() )
{
const int cur_bb = Engine::getBBTrackContainer()->currentBB();
setUpdatesEnabled( false );
@@ -1468,7 +1469,7 @@ void TrackContentWidget::paintEvent( QPaintEvent * _pe )
int ppt = static_cast<int>( tcv->pixelsPerTact() );
QPainter p( this );
// Don't draw background on BB-Editor
if( m_trackView->trackContainerView() != Engine::getBBEditor()->trackContainerView() )
if( m_trackView->trackContainerView() != gui->getBBEditor()->trackContainerView() )
{
p.drawTiledPixmap( rect(), m_background, QPoint(
tcv->currentPosition().getTact() * ppt, 0 ) );