Skip to content

Switch loop marker shortcuts, add context menu #6021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Spekular wants to merge 11 commits into from
Closed

Switch loop marker shortcuts, add context menu #6021

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e298df7
Switch shortcuts, add context menu
Spekular May 18, 2021
027fdc3
Bindings and new selection mode
Spekular May 27, 2021
40c9aaa
Quick fixes
Spekular May 27, 2021
73b29f3
Switch break
Spekular May 27, 2021
7e2fa9a
Comments from review
Spekular Jun 3, 2021
65c458e
Properly prepare for changeable quantization
Spekular Jun 3, 2021
fae51c6
Apply suggestions from code review
Spekular Jun 21, 2021
d8d6091
Correct Ctrl+LMB action.
Spekular Jun 21, 2021
8a25aff
Function for setting loop marker (#7)
Sep 7, 2021
d126d7c
Separate drag/click (#8)
Oct 3, 2021
8078a00
Start/end actions in menu (#9)
Oct 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/TimeLineWidget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ public slots:
void mousePressEvent( QMouseEvent * _me ) override;
void mouseMoveEvent( QMouseEvent * _me ) override;
void mouseReleaseEvent( QMouseEvent * _me ) override;
void contextMenuEvent( QContextMenuEvent * _cme ) override;


private:
Expand Down
59 changes: 44 additions & 15 deletions src/gui/TimeLineWidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#include <QMouseEvent>
#include <QPainter>
#include <QToolBar>
#include <QMenu>


#include "TimeLineWidget.h"
Expand Down Expand Up @@ -93,6 +94,8 @@ TimeLineWidget::TimeLineWidget( const int xoff, const int yoff, const float ppb,
updateTimer->start( 1000 / 60 ); // 60 fps
connect( Engine::getSong(), SIGNAL( timeSignatureChanged( int,int ) ),
this, SLOT( update() ) );

setContextMenuPolicy(Qt::PreventContextMenu);
}


Expand Down Expand Up @@ -304,30 +307,43 @@ void TimeLineWidget::paintEvent( QPaintEvent * )



void TimeLineWidget::contextMenuEvent(QContextMenuEvent*)
{
QMenu contextMenu(tr("Timeline"), this);
QAction selectLoopPoints(tr("Select between loop points"), this);
connect(&selectLoopPoints, &QAction::triggered, this, [this](){
emit regionSelectedFromPixels(
m_xOffset + m_loopPos[0] * m_ppb / TimePos::ticksPerBar(),
m_xOffset + m_loopPos[1] * m_ppb / TimePos::ticksPerBar()
);
emit selectionFinished();
});
contextMenu.addAction(&selectLoopPoints);
contextMenu.exec( QCursor::pos() );
}




void TimeLineWidget::mousePressEvent( QMouseEvent* event )
{
if( event->x() < m_xOffset )
{
return;
}
if( event->button() == Qt::LeftButton && !(event->modifiers() & Qt::ShiftModifier) )
auto button = event->button();
auto mods = event->modifiers();

if (event->x() < m_xOffset) { return; }
if (mods & Qt::ShiftModifier)
{
m_action = MovePositionMarker;
if( event->x() - m_xOffset < s_posMarkerPixmap->width() )
{
m_moveXOff = event->x() - m_xOffset;
}
else
{
m_moveXOff = s_posMarkerPixmap->width() / 2;
if (button == Qt::LeftButton) { m_action = MoveLoopBegin; }
if (button == Qt::RightButton) {
m_action = MoveLoopEnd;
}
}
else if( event->button() == Qt::LeftButton && (event->modifiers() & Qt::ShiftModifier) )
else if (button == Qt::LeftButton && mods == Qt::ControlModifier)
{
m_action = SelectSongTCO;
m_initalXSelect = event->x();
}
else if( event->button() == Qt::RightButton )
else if (button == Qt::RightButton && mods == Qt::ControlModifier)
{
m_moveXOff = s_posMarkerPixmap->width() / 2;
const TimePos t = m_begin + static_cast<int>( qMax( event->x() - m_xOffset - m_moveXOff, 0 ) * TimePos::ticksPerBar() / m_ppb );
Expand All @@ -349,6 +365,19 @@ void TimeLineWidget::mousePressEvent( QMouseEvent* event )

m_loopPos[( m_action == MoveLoopBegin ) ? 0 : 1] = t;
}
else if (button == Qt::LeftButton)
{
m_action = MovePositionMarker;
if( event->x() - m_xOffset < s_posMarkerPixmap->width() )
{
m_moveXOff = event->x() - m_xOffset;
}
else
{
m_moveXOff = s_posMarkerPixmap->width() / 2;
}
}
else if (button == Qt::RightButton) { contextMenuEvent(nullptr); }

if( m_action == MoveLoopBegin || m_action == MoveLoopEnd )
{
Expand Down