diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2023-05-29 15:24:27 +0200 |
|---|---|---|
| committer | Daniel Schürmann <daschuer@mixxx.org> | 2023-05-29 15:24:27 +0200 |
| commit | 71199e89f2c77257fea566cf8eb4f2f540b239d9 (patch) | |
| tree | 65cfa4aa7a6504af2394400620bd89d3798c6f13 | |
| parent | 019a681da254dcc26d95892f261cbf40e3ba6ffa (diff) | |
| parent | 7e2fc967cf4fb5db6343112c3acca458d2bee118 (diff) | |
Merge remote-tracking branch 'upstream/2.3' into 2.4
| -rw-r--r-- | res/controllers/Numark_DJ2GO2_Touch.midi.xml | 9 | ||||
| -rw-r--r-- | src/widget/wlibrarysidebar.cpp | 3 | ||||
| -rw-r--r-- | src/widget/wtracktableviewheader.cpp | 1 |
3 files changed, 12 insertions, 1 deletions
diff --git a/res/controllers/Numark_DJ2GO2_Touch.midi.xml b/res/controllers/Numark_DJ2GO2_Touch.midi.xml index 5242240161..7eafc03b6c 100644 --- a/res/controllers/Numark_DJ2GO2_Touch.midi.xml +++ b/res/controllers/Numark_DJ2GO2_Touch.midi.xml @@ -745,6 +745,15 @@ </control> <control> <group>[Channel2]</group> + <key>DJ2GO2Touch.rightDeck.loopOut.input</key> + <status>0x95</status> + <midino>0x22</midino> + <options> + <script-binding/> + </options> + </control> + <control> + <group>[Channel2]</group> <key>DJ2GO2Touch.rightDeck.reLoopStop.input</key> <status>0x95</status> <midino>0x24</midino> diff --git a/src/widget/wlibrarysidebar.cpp b/src/widget/wlibrarysidebar.cpp index 6bcbef9584..cab2646b00 100644 --- a/src/widget/wlibrarysidebar.cpp +++ b/src/widget/wlibrarysidebar.cpp @@ -34,12 +34,13 @@ WLibrarySidebar::WLibrarySidebar(QWidget* parent) void WLibrarySidebar::contextMenuEvent(QContextMenuEvent *event) { //if (event->state() & Qt::RightButton) { //Dis shiz don werk on windowze - const QModelIndex clickedIndex = indexAt(event->pos()); + QModelIndex clickedIndex = indexAt(event->pos()); if (!clickedIndex.isValid()) { return; } // Use this instead of setCurrentIndex() to keep current selection selectionModel()->setCurrentIndex(clickedIndex, QItemSelectionModel::NoUpdate); + event->accept(); emit rightClicked(event->globalPos(), clickedIndex); //} } diff --git a/src/widget/wtracktableviewheader.cpp b/src/widget/wtracktableviewheader.cpp index fae519c629..d911d5557e 100644 --- a/src/widget/wtracktableviewheader.cpp +++ b/src/widget/wtracktableviewheader.cpp @@ -103,6 +103,7 @@ WTrackTableViewHeader::WTrackTableViewHeader(Qt::Orientation orientation, } void WTrackTableViewHeader::contextMenuEvent(QContextMenuEvent* event) { + event->accept(); m_menu.popup(event->globalPos()); } |