From 5536377c72b3d049c78cb250d6e82ef22e6c9176 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Sat, 22 Mar 2008 13:55:26 +0000 Subject: [PATCH] moved effect-chain to right side of window git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@807 0778d3d1-df1d-0410-868b-ea421aaaa00d --- src/core/fx_mixer.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/core/fx_mixer.cpp b/src/core/fx_mixer.cpp index a01a20ec2..3aaa7515b 100644 --- a/src/core/fx_mixer.cpp +++ b/src/core/fx_mixer.cpp @@ -248,7 +248,7 @@ public: m_mv( _mv ), m_name( _name ) { - setFixedSize( 32, 200 ); + setFixedSize( 32, 232 ); setAttribute( Qt::WA_OpaquePaintEvent, TRUE ); } @@ -317,14 +317,12 @@ fxMixerView::fxMixerView() : pal.setColor( QPalette::Background, QColor( 72, 76, 88 ) ); setPalette( pal ); setAutoFillBackground( TRUE ); - setSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::Minimum ); + setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Minimum ); -// setFixedHeight( 250+216 ); setWindowTitle( tr( "FX-Mixer" ) ); // setWindowIcon( embed::getIconPixmap( "fxmixer" ) ); - parentWidget()->setAttribute( Qt::WA_DeleteOnClose, FALSE ); - QVBoxLayout * ml = new QVBoxLayout; + QHBoxLayout * ml = new QHBoxLayout; ml->setMargin( 0 ); ml->setSpacing( 0 ); @@ -332,7 +330,7 @@ fxMixerView::fxMixerView() : a->setFrameShape( QFrame::NoFrame ); a->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); a->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOn ); - a->setFixedHeight( 216 ); + a->setFixedHeight( 250 ); ml->addWidget( a ); QWidget * base = new QWidget; @@ -341,7 +339,7 @@ fxMixerView::fxMixerView() : bl->setMargin( 0 ); a->setWidget( base ); - base->setFixedSize( (NumFxChannels+1)*33+6+10, 200 ); + base->setFixedSize( (NumFxChannels+1)*33+6+10, 236 ); pal = base->palette(); pal.setColor( QPalette::Background, QColor( 72, 76, 88 ) ); base->setPalette( pal ); @@ -349,6 +347,7 @@ fxMixerView::fxMixerView() : m_fxRackArea = new QWidget; + ml->addSpacing( 10 ); ml->addWidget( m_fxRackArea ); setLayout( ml ); @@ -374,7 +373,8 @@ fxMixerView::fxMixerView() : cv->m_fader = new fader( &m->m_fxChannels[i]->m_volumeModel, cv->m_fxLine ); - cv->m_fader->move( 15-cv->m_fader->width()/2, 80 ); + cv->m_fader->move( 15-cv->m_fader->width()/2, + cv->m_fxLine->height()-130 ); cv->m_rackView = new effectRackView( &m->m_fxChannels[i]->m_fxChain, NULL ); fxl->addWidget( cv->m_rackView );