Skip to content
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

Jump to bottom

Libarycontrol: backport of #3198: fix crash when trying to refocus th… #3201

Merged
merged 1 commit into from
Oct 29, 2020
Merged

Libarycontrol: backport of #3198: fix crash when trying to refocus th… #3201

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 18 additions & 8 deletions src/library/librarycontrol.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,16 +405,26 @@ void LibraryControl::emitKeyEvent(QKeyEvent&& event) {
}

void LibraryControl::setLibraryFocus() {
if (m_pSidebarWidget) {
// XXX: Set the focus of the library panel directly instead of sending tab from sidebar
m_pSidebarWidget->setFocus();
QKeyEvent event(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier);
QApplication::sendEvent(m_pSidebarWidget, &event);
// TODO: Set the focus of the library panel directly instead of sending tab from sidebar
VERIFY_OR_DEBUG_ASSERT(m_pSidebarWidget) {
return;
}
// Try to focus the sidebar.
m_pSidebarWidget->setFocus();
// This may have failed, for example when a Cover window still has focus,
// so make sure the sidebar is focused or we'll crash.
if (!m_pSidebarWidget->hasFocus()) {
return;
}
// Send Tab to move focus to the Tracks table.
// Obviously only works as desired if the skin widgets are arranged
// accordingly.
QKeyEvent event(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier);
QApplication::sendEvent(m_pSidebarWidget, &event);
}

void LibraryControl::slotSelectSidebarItem(double v) {
if (m_pSidebarWidget == NULL) {
VERIFY_OR_DEBUG_ASSERT(m_pSidebarWidget) {
return;
}
if (v > 0) {
Expand Down Expand Up @@ -472,8 +482,8 @@ void LibraryControl::slotGoToItem(double v) {
slotToggleSelectedSidebarItem(v);
}
}
// TODO(xxx) instead of remote control the widgets individual, we should
// translate this into Alt+Return and handle it at each library widget
// TODO(xxx) instead of remote control the widgets individual, we should
// translate this into Alt+Return and handle it at each library widget
// individual https://bugs.launchpad.net/mixxx/+bug/1758618
//emitKeyEvent(QKeyEvent{QEvent::KeyPress, Qt::Key_Return, Qt::AltModifier});
}
Expand Down