qt: add Windows taskbar progress for Qt6

Author: kwsantiago

src/qt/bitcoingui.cpp

@@ -232,6 +232,9 @@ BitcoinGUI::BitcoinGUI(interfaces::Node& node, const PlatformStyle *_platformSty
 #endif
 #ifdef BITCOIN_QT_WIN_TASKBAR
     m_taskbar_progress = new WinTaskbarProgress();
+    if (windowHandle()) {
+        m_taskbar_progress->setWindow(windowHandle());
+    }
 #endif
 
     GUIUtil::handleCloseWindowShortcut(this);
@@ -1234,10 +1237,6 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVer
 
     tooltip = tr("Processed %n block(s) of transaction history.", "", count);
 
-#ifdef BITCOIN_QT_WIN_TASKBAR
-    m_taskbar_progress->setWindow(windowHandle());
-#endif
-
     // Set icon state: spinning if catching up, tick otherwise
     if (secs < MAX_BLOCK_TIME_GAP) {
         tooltip = tr("Up to date") + QString(".<br>") + tooltip;
@@ -1495,16 +1494,6 @@ bool BitcoinGUI::eventFilter(QObject *object, QEvent *event)
     return QMainWindow::eventFilter(object, event);
 }
 
-#ifdef BITCOIN_QT_WIN_TASKBAR
-bool BitcoinGUI::nativeEvent(const QByteArray &eventType, void *message, qintptr *result)
-{
-    if (m_taskbar_progress) {
-        m_taskbar_progress->nativeEventFilter(message);
-    }
-    return QMainWindow::nativeEvent(eventType, message, result);
-}
-#endif
-
 #ifdef ENABLE_WALLET
 bool BitcoinGUI::handlePaymentRequest(const SendCoinsRecipient& recipient)
 {

src/qt/bitcoingui.h

@@ -117,9 +117,6 @@ class BitcoinGUI : public QMainWindow
     void dragEnterEvent(QDragEnterEvent *event) override;
     void dropEvent(QDropEvent *event) override;
     bool eventFilter(QObject *object, QEvent *event) override;
-#ifdef BITCOIN_QT_WIN_TASKBAR
-    bool nativeEvent(const QByteArray &eventType, void *message, qintptr *result) override;
-#endif
 
 private:
     interfaces::Node& m_node;

src/qt/wintaskbarprogress.cpp

@@ -13,9 +13,6 @@
 
 WinTaskbarProgress::WinTaskbarProgress()
 {
-    // COM will be initialized by Qt or the application
-    // Register for TaskbarButtonCreated message
-    m_taskbarButtonCreatedMsg = RegisterWindowMessageW(L"TaskbarButtonCreated");
 }
 
 WinTaskbarProgress::~WinTaskbarProgress()
@@ -25,26 +22,20 @@ WinTaskbarProgress::~WinTaskbarProgress()
 
 void WinTaskbarProgress::setWindow(QWindow* window)
 {
-    if (!window) {
-        return;
-    }
-
-    // Get the native window handle
-    HWND newWinId = reinterpret_cast<HWND>(window->winId());
-
-    // Store window handle but DON'T initialize yet
-    // We must wait for TaskbarButtonCreated message
-    m_winId = newWinId;
+    m_window = window;
 }
 
 void WinTaskbarProgress::initializeTaskbar()
 {
-    if (m_initialized || !m_winId) {
+    if (m_initialized || !m_window) {
+        return;
+    }
+
+    HWND winId = reinterpret_cast<HWND>(m_window->winId());
+    if (!winId) {
         return;
     }
 
-    // Create ITaskbarList3 instance
-    // This should ONLY be called after TaskbarButtonCreated message
     HRESULT hr = CoCreateInstance(
         CLSID_TaskbarList,
         nullptr,
@@ -64,27 +55,15 @@ void WinTaskbarProgress::initializeTaskbar()
     }
 }
 
-bool WinTaskbarProgress::nativeEventFilter(void* message)
-{
-    MSG* msg = static_cast<MSG*>(message);
-
-    // Wait for TaskbarButtonCreated before using taskbar features
-    if (msg->message == m_taskbarButtonCreatedMsg) {
-        if (!m_initialized && m_winId) {
-            initializeTaskbar();
-        }
-        return false;
-    }
-
-    return false;
-}
-
 void WinTaskbarProgress::releaseTaskbar()
 {
     if (m_taskbarList) {
         // Clear progress state before releasing
-        if (m_winId) {
-            m_taskbarList->SetProgressState(m_winId, TBPF_NOPROGRESS);
+        if (m_window) {
+            HWND winId = reinterpret_cast<HWND>(m_window->winId());
+            if (winId) {
+                m_taskbarList->SetProgressState(winId, TBPF_NOPROGRESS);
+            }
         }
         m_taskbarList->Release();
         m_taskbarList = nullptr;
@@ -95,37 +74,60 @@ void WinTaskbarProgress::releaseTaskbar()
 
 void WinTaskbarProgress::setValue(int value)
 {
-    if (!m_initialized || !m_taskbarList || !m_winId) {
+    // Lazy initialization on first use
+    if (!m_initialized) {
+        initializeTaskbar();
+    }
+
+    if (!m_initialized || !m_taskbarList || !m_window) {
+        return;
+    }
+
+    HWND winId = reinterpret_cast<HWND>(m_window->winId());
+    if (!winId) {
         return;
     }
 
     // Clamp value to 0-100
     if (value < 0) value = 0;
     if (value > 100) value = 100;
 
-    // If not visible yet, make it visible first
+    // Use indeterminate mode for very low progress (< 1%) to show activity
+    // Otherwise progress of 0 is invisible on the taskbar
+    if (value < 1) {
+        m_taskbarList->SetProgressState(winId, TBPF_INDETERMINATE);
+        m_visible = true;
+        return;
+    }
+
+    // Switch to normal mode if not already visible
     if (!m_visible) {
-        m_taskbarList->SetProgressState(m_winId, TBPF_NORMAL);
+        m_taskbarList->SetProgressState(winId, TBPF_NORMAL);
         m_visible = true;
     }
 
     // Set progress value (current, maximum)
-    m_taskbarList->SetProgressValue(m_winId, value, 100);
+    m_taskbarList->SetProgressValue(winId, value, 100);
 }
 
 void WinTaskbarProgress::setVisible(bool visible)
 {
-    if (!m_initialized || !m_taskbarList || !m_winId) {
+    if (!m_initialized || !m_taskbarList || !m_window) {
+        return;
+    }
+
+    HWND winId = reinterpret_cast<HWND>(m_window->winId());
+    if (!winId) {
         return;
     }
 
     if (visible && !m_visible) {
         // Show normal progress
-        m_taskbarList->SetProgressState(m_winId, TBPF_NORMAL);
+        m_taskbarList->SetProgressState(winId, TBPF_NORMAL);
         m_visible = true;
     } else if (!visible && m_visible) {
         // Hide progress
-        m_taskbarList->SetProgressState(m_winId, TBPF_NOPROGRESS);
+        m_taskbarList->SetProgressState(winId, TBPF_NOPROGRESS);
         m_visible = false;
     }
 }

src/qt/wintaskbarprogress.h

@@ -37,17 +37,13 @@ class WinTaskbarProgress
     void reset();
 
 private:
+    QWindow* m_window{nullptr};
     ITaskbarList3* m_taskbarList{nullptr};
-    HWND m_winId{nullptr};
     bool m_initialized{false};
     bool m_visible{false};
-    UINT m_taskbarButtonCreatedMsg{0};
 
     void initializeTaskbar();
     void releaseTaskbar();
-    bool nativeEventFilter(void* message);
-
-    friend class BitcoinGUI;
 };
 
 #endif // WIN32