TaskbarItem API Fixes

NickvisionApps · Jan 30, 2024 · 7fac12f · 7fac12f
1 parent 821c450
commit 7fac12f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/docs/taskbar.md b/docs/taskbar.md
@@ -68,7 +68,6 @@ Path: `Nickvision::Taskbar::TaskbarItem`
   long Count: get, set
   ```
     - The count shown on the taskbar item.
-    - Note: Setting the count will set the count visible to true if count > 0, else will set count visible to false.
 
 ### Methods
 - ```cpp

diff --git a/include/taskbar/taskbaritem.h b/include/taskbar/taskbaritem.h
@@ -77,7 +77,7 @@ namespace Nickvision::Taskbar
          */
         long getCount() const;
         /**
-         * @brief Sets the count shown on the taskbar item. Setting the count will set the count visible to true if count > 0, else will set count visible to false.
+         * @brief Sets the count shown on the taskbar item.
          * @param count The new count value
          */
         void setCount(long count);

diff --git a/src/taskbar/taskbaritem.cpp b/src/taskbar/taskbaritem.cpp
@@ -67,7 +67,7 @@ namespace Nickvision::Taskbar
 
     void TaskbarItem::setProgress(double progress)
     {
-        setProgressState(progress == 0 ? ProgressState::NoProgress : ProgressState::Normal);
+        setProgressState(progress > 0 ? ProgressState::Normal : ProgressState::NoProgress);
         std::lock_guard<std::mutex> lock{ m_mutex };
         m_progress = progress;
 #ifdef _WIN32
@@ -141,11 +141,13 @@ namespace Nickvision::Taskbar
 
     void TaskbarItem::setCount(long count)
     {
-        setCountVisible(count > 0);
         std::lock_guard<std::mutex> lock{ m_mutex };
         m_count = count;
 #ifdef _WIN32
-        drawCountIcon();
+        if(m_countVisible)
+        {
+            drawCountIcon();
+        }
 #elif defined(__linux__)
         sendDBusUpdate();
 #endif