Skip to content

Commit

Permalink
Fix broken FxLine tool tips (#3321)
Browse files Browse the repository at this point in the history
  • Loading branch information
xy124 authored and zonkmachine committed Dec 24, 2018
1 parent e1d9d89 commit dd6d4a5
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions src/gui/FxMixerView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ FxMixerView::FxMixerView() :

// Set margins
ml->setContentsMargins( 0, 4, 0, 0 );

// Channel area
m_channelAreaWidget = new QWidget;
chLayout = new QHBoxLayout( m_channelAreaWidget );
Expand Down Expand Up @@ -138,9 +138,9 @@ FxMixerView::FxMixerView() :
ml->addWidget( newChannelBtn, 0, Qt::AlignTop );


// add the stacked layout for the effect racks of fx channels
// add the stacked layout for the effect racks of fx channels
ml->addWidget( m_racksWidget, 0, Qt::AlignTop | Qt::AlignRight );

setCurrentFxLine( m_fxChannelViews[0]->m_fxLine );

setLayout( ml );
Expand Down Expand Up @@ -219,10 +219,10 @@ void FxMixerView::refreshDisplay()
chLayout->addWidget(m_fxChannelViews[i]->m_fxLine);
m_racksLayout->addWidget( m_fxChannelViews[i]->m_rackView );
}

// set selected fx line to 0
setCurrentFxLine( 0 );

// update all fx lines
for( int i = 0; i < m_fxChannelViews.size(); ++i )
{
Expand Down Expand Up @@ -308,7 +308,7 @@ FxMixerView::FxChannelView::FxChannelView(QWidget * _parent, FxMixerView * _mv,
connect(&fxChannel->m_soloModel, SIGNAL( dataChanged() ),
_mv, SLOT ( toggledSolo() ) );
ToolTip::add( m_soloBtn, tr( "Solo FX channel" ) );

// Create EffectRack for the channel
m_rackView = new EffectRackView( &fxChannel->m_fxChain, _mv->m_racksWidget );
m_rackView->setFixedSize( 245, FxLine::FxLineHeight );
Expand Down Expand Up @@ -354,6 +354,8 @@ void FxMixerView::updateFxLine(int index)
// does current channel send to this channel?
int selIndex = m_currentFxLine->channelIndex();
FxLine * thisLine = m_fxChannelViews[index]->m_fxLine;
thisLine->setToolTip( Engine::fxMixer()->effectChannel( index )->m_name );

FloatModel * sendModel = mix->channelSendModel(selIndex, index);
if( sendModel == NULL )
{
Expand Down

0 comments on commit dd6d4a5

Please sign in to comment.