diff --git a/docs/window.dox b/docs/window.dox index fc8bf8ad..e3915a3f 100644 --- a/docs/window.dox +++ b/docs/window.dox @@ -1169,7 +1169,7 @@ glfwSetWindowTaskbarProgress(window, GLFW_TASKBAR_PROGRESS_NORMAL, 50); @endcode There are different taskbar progress states available for you to use: - - @ref GLFW_TASKBAR_PROGRESS_NOPROGRESS + - @ref GLFW_TASKBAR_PROGRESS_DISABLED - @ref GLFW_TASKBAR_PROGRESS_INDETERMINATE - @ref GLFW_TASKBAR_PROGRESS_NORMAL - @ref GLFW_TASKBAR_PROGRESS_ERROR diff --git a/include/GLFW/glfw3.h b/include/GLFW/glfw3.h index 6ac16c82..8854af9c 100644 --- a/include/GLFW/glfw3.h +++ b/include/GLFW/glfw3.h @@ -1280,7 +1280,7 @@ extern "C" { * * Used by @ref window_taskbar_progress. */ -#define GLFW_TASKBAR_PROGRESS_NOPROGRESS 0 +#define GLFW_TASKBAR_PROGRESS_DISABLED 0 /*! @brief Display the progress bar in an indeterminate state. * * Display the progress bar in an indeterminate state. @@ -3362,11 +3362,11 @@ GLFWAPI void glfwSetWindowIcon(GLFWwindow* window, int count, const GLFWimage* i * * @param[in] window The window whose taskbar progress to set. * @param[in] progressState State of the progress to be displayed in the taskbar. Valid values are: - * @ref GLFW_TASKBAR_PROGRESS_NOPROGRESS, @ref GLFW_TASKBAR_PROGRESS_INDETERMINATE, + * @ref GLFW_TASKBAR_PROGRESS_DISABLED, @ref GLFW_TASKBAR_PROGRESS_INDETERMINATE, * @ref GLFW_TASKBAR_PROGRESS_NORMAL, @ref GLFW_TASKBAR_PROGRESS_ERROR * and @ref GLFW_TASKBAR_PROGRESS_PAUSED. * @param[in] completed The amount of completed progress to set. Valid range is 0 to 100. - * This is ignored if progressState is set to @ref GLFW_TASKBAR_PROGRESS_NOPROGRESS. + * This is ignored if progressState is set to @ref GLFW_TASKBAR_PROGRESS_DISABLED. * * @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref * GLFW_INVALID_VALUE, @ref GLFW_INVALID_ENUM, @ref GLFW_PLATFORM_ERROR, @@ -6510,4 +6510,3 @@ GLFWAPI VkResult glfwCreateWindowSurface(VkInstance instance, GLFWwindow* window #endif #endif /* _glfw3_h_ */ - diff --git a/src/posix_dbus.c b/src/posix_dbus.c index 701eac5e..ba494ffd 100644 --- a/src/posix_dbus.c +++ b/src/posix_dbus.c @@ -109,8 +109,8 @@ void _glfwInitDBusPOSIX(void) if(_glfw.dbus.connection) { //Window NULL is safe here because it won't get - //used inside th eSetWindowTaskbarProgress function - _glfw.platform.setWindowTaskbarProgress(NULL, GLFW_TASKBAR_PROGRESS_NOPROGRESS, 0); + //used inside the SetWindowTaskbarProgress function + _glfw.platform.setWindowTaskbarProgress(NULL, GLFW_TASKBAR_PROGRESS_DISABLED, 0); } } diff --git a/src/window.c b/src/window.c index f74cb521..aeeb45f8 100644 --- a/src/window.c +++ b/src/window.c @@ -577,7 +577,7 @@ GLFWAPI void glfwSetWindowTaskbarProgress(GLFWwindow* handle, const int progress return; } - if (progressState != GLFW_TASKBAR_PROGRESS_NOPROGRESS && progressState != GLFW_TASKBAR_PROGRESS_INDETERMINATE && + if (progressState != GLFW_TASKBAR_PROGRESS_DISABLED && progressState != GLFW_TASKBAR_PROGRESS_INDETERMINATE && progressState != GLFW_TASKBAR_PROGRESS_NORMAL && progressState != GLFW_TASKBAR_PROGRESS_ERROR && progressState != GLFW_TASKBAR_PROGRESS_PAUSED) { @@ -1182,4 +1182,3 @@ GLFWAPI void glfwPostEmptyEvent(void) _GLFW_REQUIRE_INIT(); _glfw.platform.postEmptyEvent(); } - diff --git a/src/wl_window.c b/src/wl_window.c index dd00d5d3..dacecfcb 100644 --- a/src/wl_window.c +++ b/src/wl_window.c @@ -1906,8 +1906,8 @@ void _glfwSetWindowTaskbarProgressWayland(_GLFWwindow* window, const int taskbar { (void)window; - const dbus_bool_t progressVisible = (taskbarState != GLFW_TASKBAR_PROGRESS_NOPROGRESS); const double progressValue = (double)completed / 100.0; + const dbus_bool_t progressVisible = (taskbarState != GLFW_TASKBAR_PROGRESS_DISABLED); _glfwUpdateTaskbarProgressDBusPOSIX(progressVisible, progressValue); } @@ -2901,4 +2901,3 @@ GLFWAPI struct wl_surface* glfwGetWaylandWindow(GLFWwindow* handle) } #endif // _GLFW_WAYLAND - diff --git a/src/x11_window.c b/src/x11_window.c index e54c2c9d..e95cf588 100644 --- a/src/x11_window.c +++ b/src/x11_window.c @@ -2156,8 +2156,8 @@ void _glfwSetWindowTaskbarProgressX11(_GLFWwindow* window, const int taskbarStat { (void)window; - const dbus_bool_t progressVisible = (taskbarState != GLFW_TASKBAR_PROGRESS_NOPROGRESS); const double progressValue = (double)completed / 100.0; + const dbus_bool_t progressVisible = (taskbarState != GLFW_TASKBAR_PROGRESS_DISABLED); _glfwUpdateTaskbarProgressDBusPOSIX(progressVisible, progressValue); } @@ -3362,4 +3362,3 @@ GLFWAPI const char* glfwGetX11SelectionString(void) } #endif // _GLFW_X11 - diff --git a/tests/window.c b/tests/window.c index 53fb655f..c7631246 100644 --- a/tests/window.c +++ b/tests/window.c @@ -420,7 +420,7 @@ int main(int argc, char** argv) static int progress = 0; if(nk_button_label(nk, "No progress")) - glfwSetWindowTaskbarProgress(window, GLFW_TASKBAR_PROGRESS_NOPROGRESS, progress); + glfwSetWindowTaskbarProgress(window, GLFW_TASKBAR_PROGRESS_DISABLED, progress); if (nk_button_label(nk, "Indeterminate")) glfwSetWindowTaskbarProgress(window, GLFW_TASKBAR_PROGRESS_INDETERMINATE, progress); if (nk_button_label(nk, "Normal"))