dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix windows thumbbar

Browse Source
This commit is contained in:
Jonas Kvinge
2019-08-29 21:32:52 +02:00
parent 9b45f0661e
commit b7e13c7b86
4 changed files with 31 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/core/windows7thumbbar.cpp
View File

@@ -27,15 +27,13 @@
#include <QAction>
#include <QtDebug>
#ifdef Q_OS_WIN32
#ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x0600
#endif
#include <windows.h>
#include <commctrl.h>
#include <shobjidl.h>
extern HICON qt_pixmapToWinHICON(const QPixmap &p);
#endif // Q_OS_WIN32
#ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x0600
#endif
#include <windows.h>
#include <commctrl.h>
#include <shobjidl.h>
extern HICON qt_pixmapToWinHICON(const QPixmap &p);
#include "core/logging.h"
#include "windows7thumbbar.h"
@@ -51,7 +49,6 @@ Windows7ThumbBar::Windows7ThumbBar(QWidget *widget)
void Windows7ThumbBar::SetActions(const QList<QAction*>& actions) {
#ifdef Q_OS_WIN32
qLog(Debug) << "Setting actions";
Q_ASSERT(actions.count() <= kMaxButtonCount);
@@ -62,11 +59,9 @@ void Windows7ThumbBar::SetActions(const QList<QAction*>& actions) {
}
}
qLog(Debug) << "Done";
#endif // Q_OS_WIN32
}
#ifdef Q_OS_WIN32
static void SetupButton(const QAction *action, THUMBBUTTON *button) {
if (action) {
@@ -87,12 +82,11 @@ static void SetupButton(const QAction *action, THUMBBUTTON *button) {
button->dwFlags = THBF_NOBACKGROUND;
button->dwMask = THUMBBUTTONMASK(THB_FLAGS);
}
}
#endif // Q_OS_WIN32
void Windows7ThumbBar::HandleWinEvent(MSG *msg) {
#ifdef Q_OS_WIN32
if (button_created_message_id_ == 0) {
// Compute the value for the TaskbarButtonCreated message
button_created_message_id_ = RegisterWindowMessage("TaskbarButtonCreated");
@@ -155,13 +149,11 @@ void Windows7ThumbBar::HandleWinEvent(MSG *msg) {
}
}
}
#endif // Q_OS_WIN32
}
void Windows7ThumbBar::ActionChanged() {
#ifdef Q_OS_WIN32
if (!taskbar_list_) return;
ITaskbarList3 *taskbar_list = reinterpret_cast<ITaskbarList3*>(taskbar_list_);
@@ -176,6 +168,5 @@ void Windows7ThumbBar::ActionChanged() {
}
taskbar_list->ThumbBarUpdateButtons((HWND)widget_->winId(), actions_.count(), buttons);
#endif // Q_OS_WIN32
}