mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-22 21:14:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed GLFW_TASKBAR_PROGRESS_NOPROGRESS to GLFW_TASKBAR_PROGRESS_DISABLED

Browse Source
This commit is contained in:
GamesTrap 2023-03-01 22:22:01 +01:00
parent 1071cf1950
commit 3e7b016a00
No known key found for this signature in database
GPG Key ID: 31DFD452434ECDA3
7 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/window.dox
View File

@ -1169,7 +1169,7 @@ glfwSetWindowTaskbarProgress(window, GLFW_TASKBAR_PROGRESS_NORMAL, 50);
@endcode @endcode
There are different taskbar progress states available for you to use: 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_INDETERMINATE
- @ref GLFW_TASKBAR_PROGRESS_NORMAL - @ref GLFW_TASKBAR_PROGRESS_NORMAL
- @ref GLFW_TASKBAR_PROGRESS_ERROR - @ref GLFW_TASKBAR_PROGRESS_ERROR

7
include/GLFW/glfw3.h
View File

@ -1280,7 +1280,7 @@ extern "C" {
* *
* Used by @ref window_taskbar_progress. * 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. /*! @brief Display the progress bar in an indeterminate state.
* *
* 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] window The window whose taskbar progress to set.
* @param[in] progressState State of the progress to be displayed in the taskbar. Valid values are: * @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 * @ref GLFW_TASKBAR_PROGRESS_NORMAL, @ref GLFW_TASKBAR_PROGRESS_ERROR
* and @ref GLFW_TASKBAR_PROGRESS_PAUSED. * and @ref GLFW_TASKBAR_PROGRESS_PAUSED.
* @param[in] completed The amount of completed progress to set. Valid range is 0 to 100. * @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 * @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
* GLFW_INVALID_VALUE, @ref GLFW_INVALID_ENUM, @ref GLFW_PLATFORM_ERROR, * GLFW_INVALID_VALUE, @ref GLFW_INVALID_ENUM, @ref GLFW_PLATFORM_ERROR,
@ -6510,4 +6510,3 @@ GLFWAPI VkResult glfwCreateWindowSurface(VkInstance instance, GLFWwindow* window
#endif #endif
#endif /* _glfw3_h_ */ #endif /* _glfw3_h_ */

4
src/posix_dbus.c
View File

@ -109,8 +109,8 @@ void _glfwInitDBusPOSIX(void)
if(_glfw.dbus.connection) if(_glfw.dbus.connection)
{ {
//Window NULL is safe here because it won't get //Window NULL is safe here because it won't get
//used inside th eSetWindowTaskbarProgress function //used inside the SetWindowTaskbarProgress function
_glfw.platform.setWindowTaskbarProgress(NULL, GLFW_TASKBAR_PROGRESS_NOPROGRESS, 0); _glfw.platform.setWindowTaskbarProgress(NULL, GLFW_TASKBAR_PROGRESS_DISABLED, 0);
} }
} }

3
src/window.c
View File

@ -577,7 +577,7 @@ GLFWAPI void glfwSetWindowTaskbarProgress(GLFWwindow* handle, const int progress
return; 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_NORMAL && progressState != GLFW_TASKBAR_PROGRESS_ERROR &&
progressState != GLFW_TASKBAR_PROGRESS_PAUSED) progressState != GLFW_TASKBAR_PROGRESS_PAUSED)
{ {
@ -1182,4 +1182,3 @@ GLFWAPI void glfwPostEmptyEvent(void)
_GLFW_REQUIRE_INIT(); _GLFW_REQUIRE_INIT();
_glfw.platform.postEmptyEvent(); _glfw.platform.postEmptyEvent();
} }

3
src/wl_window.c
View File

@ -1906,8 +1906,8 @@ void _glfwSetWindowTaskbarProgressWayland(_GLFWwindow* window, const int taskbar
{ {
(void)window; (void)window;
const dbus_bool_t progressVisible = (taskbarState != GLFW_TASKBAR_PROGRESS_NOPROGRESS);
const double progressValue = (double)completed / 100.0; const double progressValue = (double)completed / 100.0;
const dbus_bool_t progressVisible = (taskbarState != GLFW_TASKBAR_PROGRESS_DISABLED);
_glfwUpdateTaskbarProgressDBusPOSIX(progressVisible, progressValue); _glfwUpdateTaskbarProgressDBusPOSIX(progressVisible, progressValue);
} }
@ -2901,4 +2901,3 @@ GLFWAPI struct wl_surface* glfwGetWaylandWindow(GLFWwindow* handle)
} }
#endif // _GLFW_WAYLAND #endif // _GLFW_WAYLAND

3
src/x11_window.c
View File

@ -2156,8 +2156,8 @@ void _glfwSetWindowTaskbarProgressX11(_GLFWwindow* window, const int taskbarStat
{ {
(void)window; (void)window;
const dbus_bool_t progressVisible = (taskbarState != GLFW_TASKBAR_PROGRESS_NOPROGRESS);
const double progressValue = (double)completed / 100.0; const double progressValue = (double)completed / 100.0;
const dbus_bool_t progressVisible = (taskbarState != GLFW_TASKBAR_PROGRESS_DISABLED);
_glfwUpdateTaskbarProgressDBusPOSIX(progressVisible, progressValue); _glfwUpdateTaskbarProgressDBusPOSIX(progressVisible, progressValue);
} }
@ -3362,4 +3362,3 @@ GLFWAPI const char* glfwGetX11SelectionString(void)
} }
#endif // _GLFW_X11 #endif // _GLFW_X11

2
tests/window.c
View File

@ -420,7 +420,7 @@ int main(int argc, char** argv)
static int progress = 0; static int progress = 0;
if(nk_button_label(nk, "No progress")) 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")) if (nk_button_label(nk, "Indeterminate"))
glfwSetWindowTaskbarProgress(window, GLFW_TASKBAR_PROGRESS_INDETERMINATE, progress); glfwSetWindowTaskbarProgress(window, GLFW_TASKBAR_PROGRESS_INDETERMINATE, progress);
if (nk_button_label(nk, "Normal")) if (nk_button_label(nk, "Normal"))