diff options
Diffstat (limited to 'src/skins-qt/playlist-widget.cc')
| -rw-r--r-- | src/skins-qt/playlist-widget.cc | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/src/skins-qt/playlist-widget.cc b/src/skins-qt/playlist-widget.cc index b59e1b9..8847921 100644 --- a/src/skins-qt/playlist-widget.cc +++ b/src/skins-qt/playlist-widget.cc @@ -38,6 +38,7 @@ #include <libaudcore/i18n.h> #include <libaudcore/runtime.h> #include <libaudcore/playlist.h> +#include <libaudqt/libaudqt.h> enum { DRAG_SELECT = 1, @@ -411,9 +412,10 @@ bool PlaylistWidget::handle_keypress (QKeyEvent * event) { cancel_all (); - switch (event->modifiers () & (Qt::ShiftModifier | Qt::ControlModifier | Qt::AltModifier)) + auto CtrlShiftAlt = Qt::ShiftModifier | Qt::ControlModifier | Qt::AltModifier; + switch (event->modifiers () & CtrlShiftAlt) { - case 0: + case Qt::NoModifier: switch (event->key ()) { case Qt::Key_Up: @@ -746,25 +748,22 @@ bool PlaylistWidget::leave () void PlaylistWidget::popup_trigger (int pos) { -#if 0 - audgui_infopopup_hide (); - - auto show_cb = [] (void * me_) { - auto me = (PlaylistWidget *) me_; - audgui_infopopup_show (me->m_playlist, me->m_popup_pos); - }; + audqt::infopopup_hide (); m_popup_pos = pos; - m_popup_timer.queue (aud_get_int (nullptr, "filepopup_delay") * 100, show_cb, this); -#endif + m_popup_timer.queue (aud_get_int (nullptr, "filepopup_delay") * 100, + aud::obj_member<PlaylistWidget, & PlaylistWidget::popup_show>, this); +} + +void PlaylistWidget::popup_show () +{ + audqt::infopopup_show (m_playlist, m_popup_pos); } void PlaylistWidget::popup_hide () { -#if 0 - audgui_infopopup_hide (); + audqt::infopopup_hide (); m_popup_pos = -1; m_popup_timer.stop (); -#endif } |