Skip to content

Commit 91f750d

Browse files
authored
Fix track operations widget vertical alignment (LMMS#7765)
In LMMS#7708, the track operations widget was given a centered vertical alignment in order to fix an aesthetic layout issue. This is being reverted, since it is possible to resize tracks, and all the other track interface elements are top-aligned.
1 parent 768b3b2 commit 91f750d

File tree

1 file changed

+4
-20
lines changed

1 file changed

+4
-20
lines changed

src/gui/tracks/TrackOperationsWidget.cpp

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ TrackOperationsWidget::TrackOperationsWidget( TrackView * parent ) :
8383
// buttons in a layout.
8484
auto operationsWidget = new QWidget(this);
8585
auto operationsLayout = new QHBoxLayout(operationsWidget);
86-
operationsLayout->setContentsMargins(0, 0, 0, 0);
86+
operationsLayout->setContentsMargins(0, 3, 0, 0);
8787
operationsLayout->setSpacing(2);
8888

8989
m_trackOps = new QPushButton(operationsWidget);
@@ -131,7 +131,7 @@ TrackOperationsWidget::TrackOperationsWidget( TrackView * parent ) :
131131
operationsLayout->addWidget(muteWidget);
132132
operationsLayout->addWidget(soloWidget);
133133

134-
layout->addWidget(operationsWidget, 0, Qt::AlignCenter | Qt::AlignLeading);
134+
layout->addWidget(operationsWidget, 0, Qt::AlignTop | Qt::AlignLeading);
135135

136136
connect( this, SIGNAL(trackRemovalScheduled(lmms::gui::TrackView*)),
137137
m_trackView->trackContainerView(),
@@ -145,11 +145,6 @@ TrackOperationsWidget::TrackOperationsWidget( TrackView * parent ) :
145145
}
146146

147147

148-
149-
150-
151-
152-
153148
/*! \brief Respond to trackOperationsWidget mouse events
154149
*
155150
* If it's the left mouse button, and Ctrl is held down, and we're
@@ -180,8 +175,6 @@ void TrackOperationsWidget::mousePressEvent( QMouseEvent * me )
180175
}
181176

182177

183-
184-
185178
/*!
186179
* \brief Repaint the trackOperationsWidget
187180
*
@@ -222,17 +215,9 @@ bool TrackOperationsWidget::confirmRemoval()
222215
mb.setCheckBox(askAgainCheckBox);
223216
mb.setDefaultButton(QMessageBox::Cancel);
224217

225-
int answer = mb.exec();
226-
227-
if( answer == QMessageBox::Ok )
228-
{
229-
return true;
230-
}
231-
return false;
218+
return mb.exec() == QMessageBox::Ok;
232219
}
233220

234-
235-
236221
/*! \brief Clone this track
237222
*
238223
*/
@@ -270,7 +255,6 @@ void TrackOperationsWidget::clearTrack()
270255
}
271256

272257

273-
274258
/*! \brief Remove this track from the track list
275259
*
276260
*/
@@ -324,6 +308,7 @@ void TrackOperationsWidget::resetClipColors()
324308
Engine::getSong()->setModified();
325309
}
326310

311+
327312
/*! \brief Update the trackOperationsWidget context menu
328313
*
329314
* For all track types, we have the Clone and Remove options.
@@ -390,7 +375,6 @@ void TrackOperationsWidget::toggleRecording( bool on )
390375
}
391376

392377

393-
394378
void TrackOperationsWidget::recordingOn()
395379
{
396380
toggleRecording( true );

0 commit comments

Comments
 (0)