Funkwhale
/
strawberry-audio-player-windows-mac-linux
mirror of https://github.com/strawberrymusicplayer/strawberry
1
0
Fork 0
Code Issues Releases Wiki Activity

Only update buttons once

This commit is contained in:
Jonas Kvinge 2020-10-17 04:21:11 +02:00
parent 7426399aa2
commit 0235b19801
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/core/windows7thumbbar.cpp
View File

@ -26,6 +26,7 @@
#include <QList> #include <QList>
#include <QPixmap> #include <QPixmap>
#include <QAction> #include <QAction>
#include <QTimer>
#include <QtDebug> #include <QtDebug>
#ifndef _WIN32_WINNT #ifndef _WIN32_WINNT
@ -47,7 +48,14 @@ const int Windows7ThumbBar::kMaxButtonCount = 7;
Windows7ThumbBar::Windows7ThumbBar(QWidget *widget) Windows7ThumbBar::Windows7ThumbBar(QWidget *widget)
: QObject(widget), : QObject(widget),
widget_(widget), widget_(widget),
button_created_message_id_(0) {} timer_(new QTimer(this)),
button_created_message_id_(0) {
timer_->setSingleShot(true);
timer_->setInterval(300);
connect(timer_, SIGNAL(timeout()), SLOT(ActionChanged()));
}
void Windows7ThumbBar::SetActions(const QList<QAction*> &actions) { void Windows7ThumbBar::SetActions(const QList<QAction*> &actions) {
@ -57,7 +65,7 @@ void Windows7ThumbBar::SetActions(const QList<QAction*> &actions) {
actions_ = actions; actions_ = actions;
for (QAction *action : actions) { for (QAction *action : actions) {
if (action) { if (action) {
connect(action, SIGNAL(changed()), SLOT(ActionChanged())); connect(action, SIGNAL(changed()), SLOT(ActionChangedTriggered()));
} }
} }
qLog(Debug) << "Done"; qLog(Debug) << "Done";
@ -80,7 +88,7 @@ ITaskbarList3 *Windows7ThumbBar::CreateTaskbarList() {
hr = taskbar_list->HrInit(); hr = taskbar_list->HrInit();
if (hr != S_OK) { if (hr != S_OK) {
qLog(Warning) << "Error initialising taskbar list" << Qt::hex << DWORD (hr); qLog(Warning) << "Error initializing taskbar list" << Qt::hex << DWORD (hr);
taskbar_list->Release(); taskbar_list->Release();
return nullptr; return nullptr;
} }
@ -162,6 +170,10 @@ void Windows7ThumbBar::HandleWinEvent(MSG *msg) {
} }
void Windows7ThumbBar::ActionChangedTriggered() {
if (!timer_->isActive()) timer_->start();
}
void Windows7ThumbBar::ActionChanged() { void Windows7ThumbBar::ActionChanged() {
ITaskbarList3 *taskbar_list = CreateTaskbarList(); ITaskbarList3 *taskbar_list = CreateTaskbarList();

7
src/core/windows7thumbbar.h
View File

@ -28,8 +28,9 @@
#include <QObject> #include <QObject>
#include <QWidget> #include <QWidget>
#include <QList> #include <QList>
#include <QString>
#include <QAction> class QTimer;
class QAction;
class Windows7ThumbBar : public QObject { class Windows7ThumbBar : public QObject {
Q_OBJECT Q_OBJECT
@ -52,10 +53,12 @@ class Windows7ThumbBar : public QObject {
void SetupButton(const QAction *action, THUMBBUTTON *button); void SetupButton(const QAction *action, THUMBBUTTON *button);
private slots: private slots:
void ActionChangedTriggered();
void ActionChanged(); void ActionChanged();
private: private:
QWidget *widget_; QWidget *widget_;
QTimer *timer_;
QList<QAction*> actions_; QList<QAction*> actions_;
unsigned int button_created_message_id_; unsigned int button_created_message_id_;