mirror of
https://github.com/glfw/glfw.git
synced 2024-11-26 06:14:35 +00:00
Added boilerplate glfwSetWindowTaskbarBadge()
This commit is contained in:
parent
9f17a69a67
commit
94fb107c24
@ -3395,6 +3395,9 @@ GLFWAPI void glfwSetWindowIcon(GLFWwindow* window, int count, const GLFWimage* i
|
|||||||
*/
|
*/
|
||||||
GLFWAPI void glfwSetWindowTaskbarProgress(GLFWwindow* window, int progressState, double value);
|
GLFWAPI void glfwSetWindowTaskbarProgress(GLFWwindow* window, int progressState, double value);
|
||||||
|
|
||||||
|
//Use count = GLFW_DONT_CARE to disable overlay/badge icon
|
||||||
|
GLFWAPI void glfwSetWindowTaskbarBadge(GLFWwindow* window, int count);
|
||||||
|
|
||||||
/*! @brief Retrieves the position of the content area of the specified window.
|
/*! @brief Retrieves the position of the content area of the specified window.
|
||||||
*
|
*
|
||||||
* This function retrieves the position, in screen coordinates, of the
|
* This function retrieves the position, in screen coordinates, of the
|
||||||
|
@ -529,6 +529,7 @@ GLFWbool _glfwConnectCocoa(int platformID, _GLFWplatform* platform)
|
|||||||
_glfwSetWindowTitleCocoa,
|
_glfwSetWindowTitleCocoa,
|
||||||
_glfwSetWindowIconCocoa,
|
_glfwSetWindowIconCocoa,
|
||||||
_glfwSetWindowTaskbarProgressCocoa,
|
_glfwSetWindowTaskbarProgressCocoa,
|
||||||
|
_glfwSetWindowTaskbarBadgeCocoa,
|
||||||
_glfwGetWindowPosCocoa,
|
_glfwGetWindowPosCocoa,
|
||||||
_glfwSetWindowPosCocoa,
|
_glfwSetWindowPosCocoa,
|
||||||
_glfwGetWindowSizeCocoa,
|
_glfwGetWindowSizeCocoa,
|
||||||
|
@ -231,6 +231,7 @@ void _glfwDestroyWindowCocoa(_GLFWwindow* window);
|
|||||||
void _glfwSetWindowTitleCocoa(_GLFWwindow* window, const char* title);
|
void _glfwSetWindowTitleCocoa(_GLFWwindow* window, const char* title);
|
||||||
void _glfwSetWindowIconCocoa(_GLFWwindow* window, int count, const GLFWimage* images);
|
void _glfwSetWindowIconCocoa(_GLFWwindow* window, int count, const GLFWimage* images);
|
||||||
void _glfwSetWindowTaskbarProgressCocoa(_GLFWwindow* window, int progressState, double value);
|
void _glfwSetWindowTaskbarProgressCocoa(_GLFWwindow* window, int progressState, double value);
|
||||||
|
void _glfwSetWindowTaskbarBadgeCocoa(_GLFWwindow* window, int count);
|
||||||
void _glfwGetWindowPosCocoa(_GLFWwindow* window, int* xpos, int* ypos);
|
void _glfwGetWindowPosCocoa(_GLFWwindow* window, int* xpos, int* ypos);
|
||||||
void _glfwSetWindowPosCocoa(_GLFWwindow* window, int xpos, int ypos);
|
void _glfwSetWindowPosCocoa(_GLFWwindow* window, int xpos, int ypos);
|
||||||
void _glfwGetWindowSizeCocoa(_GLFWwindow* window, int* width, int* height);
|
void _glfwGetWindowSizeCocoa(_GLFWwindow* window, int* width, int* height);
|
||||||
|
@ -1167,6 +1167,10 @@ void _glfwSetWindowTaskbarProgressCocoa(_GLFWwindow* window, int progressState,
|
|||||||
window->ns.dockProgressIndicator.value = value;
|
window->ns.dockProgressIndicator.value = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void _glfwSetWindowTaskbarBadgeCocoa(_GLFWwindow* window, int count)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
void _glfwGetWindowPosCocoa(_GLFWwindow* window, int* xpos, int* ypos)
|
void _glfwGetWindowPosCocoa(_GLFWwindow* window, int* xpos, int* ypos)
|
||||||
{
|
{
|
||||||
@autoreleasepool {
|
@autoreleasepool {
|
||||||
|
@ -707,6 +707,7 @@ struct _GLFWplatform
|
|||||||
void (*setWindowTitle)(_GLFWwindow*,const char*);
|
void (*setWindowTitle)(_GLFWwindow*,const char*);
|
||||||
void (*setWindowIcon)(_GLFWwindow*,int,const GLFWimage*);
|
void (*setWindowIcon)(_GLFWwindow*,int,const GLFWimage*);
|
||||||
void (*setWindowTaskbarProgress)(_GLFWwindow*,const int,double);
|
void (*setWindowTaskbarProgress)(_GLFWwindow*,const int,double);
|
||||||
|
void (*setWindowTaskbarBadge)(_GLFWwindow*,int);
|
||||||
void (*getWindowPos)(_GLFWwindow*,int*,int*);
|
void (*getWindowPos)(_GLFWwindow*,int*,int*);
|
||||||
void (*setWindowPos)(_GLFWwindow*,int,int);
|
void (*setWindowPos)(_GLFWwindow*,int,int);
|
||||||
void (*getWindowSize)(_GLFWwindow*,int*,int*);
|
void (*getWindowSize)(_GLFWwindow*,int*,int*);
|
||||||
|
@ -74,6 +74,7 @@ GLFWbool _glfwConnectNull(int platformID, _GLFWplatform* platform)
|
|||||||
_glfwSetWindowTitleNull,
|
_glfwSetWindowTitleNull,
|
||||||
_glfwSetWindowIconNull,
|
_glfwSetWindowIconNull,
|
||||||
_glfwSetWindowTaskbarProgressNull,
|
_glfwSetWindowTaskbarProgressNull,
|
||||||
|
_glfwSetWindowTaskbarBadgeNull,
|
||||||
_glfwGetWindowPosNull,
|
_glfwGetWindowPosNull,
|
||||||
_glfwSetWindowPosNull,
|
_glfwSetWindowPosNull,
|
||||||
_glfwGetWindowSizeNull,
|
_glfwGetWindowSizeNull,
|
||||||
|
@ -90,6 +90,7 @@ void _glfwDestroyWindowNull(_GLFWwindow* window);
|
|||||||
void _glfwSetWindowTitleNull(_GLFWwindow* window, const char* title);
|
void _glfwSetWindowTitleNull(_GLFWwindow* window, const char* title);
|
||||||
void _glfwSetWindowIconNull(_GLFWwindow* window, int count, const GLFWimage* images);
|
void _glfwSetWindowIconNull(_GLFWwindow* window, int count, const GLFWimage* images);
|
||||||
void _glfwSetWindowTaskbarProgressNull(_GLFWwindow* window, int progressState, double value);
|
void _glfwSetWindowTaskbarProgressNull(_GLFWwindow* window, int progressState, double value);
|
||||||
|
void _glfwSetWindowTaskbarBadgeNull(_GLFWwindow* window, int count);
|
||||||
void _glfwSetWindowMonitorNull(_GLFWwindow* window, _GLFWmonitor* monitor, int xpos, int ypos, int width, int height, int refreshRate);
|
void _glfwSetWindowMonitorNull(_GLFWwindow* window, _GLFWmonitor* monitor, int xpos, int ypos, int width, int height, int refreshRate);
|
||||||
void _glfwGetWindowPosNull(_GLFWwindow* window, int* xpos, int* ypos);
|
void _glfwGetWindowPosNull(_GLFWwindow* window, int* xpos, int* ypos);
|
||||||
void _glfwSetWindowPosNull(_GLFWwindow* window, int xpos, int ypos);
|
void _glfwSetWindowPosNull(_GLFWwindow* window, int xpos, int ypos);
|
||||||
|
@ -191,6 +191,10 @@ void _glfwSetWindowTaskbarProgressNull(_GLFWwindow* window, int progressState, d
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void _glfwSetWindowTaskbarBadgeNull(_GLFWwindow* window, int count)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
void _glfwSetWindowMonitorNull(_GLFWwindow* window,
|
void _glfwSetWindowMonitorNull(_GLFWwindow* window,
|
||||||
_GLFWmonitor* monitor,
|
_GLFWmonitor* monitor,
|
||||||
int xpos, int ypos,
|
int xpos, int ypos,
|
||||||
|
@ -639,6 +639,7 @@ GLFWbool _glfwConnectWin32(int platformID, _GLFWplatform* platform)
|
|||||||
_glfwSetWindowTitleWin32,
|
_glfwSetWindowTitleWin32,
|
||||||
_glfwSetWindowIconWin32,
|
_glfwSetWindowIconWin32,
|
||||||
_glfwSetWindowTaskbarProgressWin32,
|
_glfwSetWindowTaskbarProgressWin32,
|
||||||
|
_glfwSetWindowTaskbarBadgeWin32,
|
||||||
_glfwGetWindowPosWin32,
|
_glfwGetWindowPosWin32,
|
||||||
_glfwSetWindowPosWin32,
|
_glfwSetWindowPosWin32,
|
||||||
_glfwGetWindowSizeWin32,
|
_glfwGetWindowSizeWin32,
|
||||||
|
@ -619,6 +619,7 @@ void _glfwDestroyWindowWin32(_GLFWwindow* window);
|
|||||||
void _glfwSetWindowTitleWin32(_GLFWwindow* window, const char* title);
|
void _glfwSetWindowTitleWin32(_GLFWwindow* window, const char* title);
|
||||||
void _glfwSetWindowIconWin32(_GLFWwindow* window, int count, const GLFWimage* images);
|
void _glfwSetWindowIconWin32(_GLFWwindow* window, int count, const GLFWimage* images);
|
||||||
void _glfwSetWindowTaskbarProgressWin32(_GLFWwindow* window, int progressState, double value);
|
void _glfwSetWindowTaskbarProgressWin32(_GLFWwindow* window, int progressState, double value);
|
||||||
|
void _glfwSetWindowTaskbarBadgeWin32(_GLFWwindow* window, int count);
|
||||||
void _glfwGetWindowPosWin32(_GLFWwindow* window, int* xpos, int* ypos);
|
void _glfwGetWindowPosWin32(_GLFWwindow* window, int* xpos, int* ypos);
|
||||||
void _glfwSetWindowPosWin32(_GLFWwindow* window, int xpos, int ypos);
|
void _glfwSetWindowPosWin32(_GLFWwindow* window, int xpos, int ypos);
|
||||||
void _glfwGetWindowSizeWin32(_GLFWwindow* window, int* width, int* height);
|
void _glfwGetWindowSizeWin32(_GLFWwindow* window, int* width, int* height);
|
||||||
|
@ -1643,6 +1643,11 @@ void _glfwSetWindowTaskbarProgressWin32(_GLFWwindow* window, int progressState,
|
|||||||
_glfwInputErrorWin32(GLFW_PLATFORM_ERROR, "Win32: Failed to set taskbar progress state");
|
_glfwInputErrorWin32(GLFW_PLATFORM_ERROR, "Win32: Failed to set taskbar progress state");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void _glfwSetWindowTaskbarBadgeWin32(_GLFWwindow* window, int count)
|
||||||
|
{
|
||||||
|
//TODO
|
||||||
|
}
|
||||||
|
|
||||||
void _glfwGetWindowPosWin32(_GLFWwindow* window, int* xpos, int* ypos)
|
void _glfwGetWindowPosWin32(_GLFWwindow* window, int* xpos, int* ypos)
|
||||||
{
|
{
|
||||||
POINT pos = { 0, 0 };
|
POINT pos = { 0, 0 };
|
||||||
|
17
src/window.c
17
src/window.c
@ -583,6 +583,23 @@ GLFWAPI void glfwSetWindowTaskbarProgress(GLFWwindow* handle, int progressState,
|
|||||||
_glfw.platform.setWindowTaskbarProgress(window, progressState, value);
|
_glfw.platform.setWindowTaskbarProgress(window, progressState, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
GLFWAPI void glfwSetWindowTaskbarBadge(GLFWwindow* handle, int count)
|
||||||
|
{
|
||||||
|
_GLFWwindow* window = (_GLFWwindow*)handle;
|
||||||
|
|
||||||
|
assert(window != NULL);
|
||||||
|
|
||||||
|
_GLFW_REQUIRE_INIT();
|
||||||
|
|
||||||
|
if (count != GLFW_DONT_CARE && (count < 0 || count > 99))
|
||||||
|
{
|
||||||
|
_glfwInputError(GLFW_INVALID_VALUE, "Invalid badge count %d", count);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
_glfw.platform.setWindowTaskbarBadge(window, count);
|
||||||
|
}
|
||||||
|
|
||||||
GLFWAPI void glfwGetWindowPos(GLFWwindow* handle, int* xpos, int* ypos)
|
GLFWAPI void glfwGetWindowPos(GLFWwindow* handle, int* xpos, int* ypos)
|
||||||
{
|
{
|
||||||
_GLFWwindow* window = (_GLFWwindow*) handle;
|
_GLFWwindow* window = (_GLFWwindow*) handle;
|
||||||
|
@ -420,6 +420,7 @@ GLFWbool _glfwConnectWayland(int platformID, _GLFWplatform* platform)
|
|||||||
_glfwSetWindowTitleWayland,
|
_glfwSetWindowTitleWayland,
|
||||||
_glfwSetWindowIconWayland,
|
_glfwSetWindowIconWayland,
|
||||||
_glfwSetWindowTaskbarProgressWayland,
|
_glfwSetWindowTaskbarProgressWayland,
|
||||||
|
_glfwSetWindowTaskbarBadgeWayland,
|
||||||
_glfwGetWindowPosWayland,
|
_glfwGetWindowPosWayland,
|
||||||
_glfwSetWindowPosWayland,
|
_glfwSetWindowPosWayland,
|
||||||
_glfwGetWindowSizeWayland,
|
_glfwGetWindowSizeWayland,
|
||||||
|
@ -447,6 +447,7 @@ void _glfwDestroyWindowWayland(_GLFWwindow* window);
|
|||||||
void _glfwSetWindowTitleWayland(_GLFWwindow* window, const char* title);
|
void _glfwSetWindowTitleWayland(_GLFWwindow* window, const char* title);
|
||||||
void _glfwSetWindowIconWayland(_GLFWwindow* window, int count, const GLFWimage* images);
|
void _glfwSetWindowIconWayland(_GLFWwindow* window, int count, const GLFWimage* images);
|
||||||
void _glfwSetWindowTaskbarProgressWayland(_GLFWwindow* window, int progressState, double value);
|
void _glfwSetWindowTaskbarProgressWayland(_GLFWwindow* window, int progressState, double value);
|
||||||
|
void _glfwSetWindowTaskbarBadgeWayland(_GLFWwindow* window, int count);
|
||||||
void _glfwGetWindowPosWayland(_GLFWwindow* window, int* xpos, int* ypos);
|
void _glfwGetWindowPosWayland(_GLFWwindow* window, int* xpos, int* ypos);
|
||||||
void _glfwSetWindowPosWayland(_GLFWwindow* window, int xpos, int ypos);
|
void _glfwSetWindowPosWayland(_GLFWwindow* window, int xpos, int ypos);
|
||||||
void _glfwGetWindowSizeWayland(_GLFWwindow* window, int* width, int* height);
|
void _glfwGetWindowSizeWayland(_GLFWwindow* window, int* width, int* height);
|
||||||
|
@ -1911,6 +1911,10 @@ void _glfwSetWindowTaskbarProgressWayland(_GLFWwindow* window, const int progres
|
|||||||
_glfwUpdateTaskbarProgressDBusPOSIX(progressVisible, value);
|
_glfwUpdateTaskbarProgressDBusPOSIX(progressVisible, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void _glfwSetWindowTaskbarBadgeWayland(_GLFWwindow* window, int count)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
void _glfwGetWindowPosWayland(_GLFWwindow* window, int* xpos, int* ypos)
|
void _glfwGetWindowPosWayland(_GLFWwindow* window, int* xpos, int* ypos)
|
||||||
{
|
{
|
||||||
// A Wayland client is not aware of its position, so just warn and leave it
|
// A Wayland client is not aware of its position, so just warn and leave it
|
||||||
|
@ -1210,6 +1210,7 @@ GLFWbool _glfwConnectX11(int platformID, _GLFWplatform* platform)
|
|||||||
_glfwSetWindowTitleX11,
|
_glfwSetWindowTitleX11,
|
||||||
_glfwSetWindowIconX11,
|
_glfwSetWindowIconX11,
|
||||||
_glfwSetWindowTaskbarProgressX11,
|
_glfwSetWindowTaskbarProgressX11,
|
||||||
|
_glfwSetWindowTaskbarBadgeX11,
|
||||||
_glfwGetWindowPosX11,
|
_glfwGetWindowPosX11,
|
||||||
_glfwSetWindowPosX11,
|
_glfwSetWindowPosX11,
|
||||||
_glfwGetWindowSizeX11,
|
_glfwGetWindowSizeX11,
|
||||||
|
@ -906,6 +906,7 @@ void _glfwDestroyWindowX11(_GLFWwindow* window);
|
|||||||
void _glfwSetWindowTitleX11(_GLFWwindow* window, const char* title);
|
void _glfwSetWindowTitleX11(_GLFWwindow* window, const char* title);
|
||||||
void _glfwSetWindowIconX11(_GLFWwindow* window, int count, const GLFWimage* images);
|
void _glfwSetWindowIconX11(_GLFWwindow* window, int count, const GLFWimage* images);
|
||||||
void _glfwSetWindowTaskbarProgressX11(_GLFWwindow* window, int progressState, double value);
|
void _glfwSetWindowTaskbarProgressX11(_GLFWwindow* window, int progressState, double value);
|
||||||
|
void _glfwSetWindowTaskbarBadgeX11(_GLFWwindow* window, int count);
|
||||||
void _glfwGetWindowPosX11(_GLFWwindow* window, int* xpos, int* ypos);
|
void _glfwGetWindowPosX11(_GLFWwindow* window, int* xpos, int* ypos);
|
||||||
void _glfwSetWindowPosX11(_GLFWwindow* window, int xpos, int ypos);
|
void _glfwSetWindowPosX11(_GLFWwindow* window, int xpos, int ypos);
|
||||||
void _glfwGetWindowSizeX11(_GLFWwindow* window, int* width, int* height);
|
void _glfwGetWindowSizeX11(_GLFWwindow* window, int* width, int* height);
|
||||||
|
@ -2161,6 +2161,10 @@ void _glfwSetWindowTaskbarProgressX11(_GLFWwindow* window, int progressState, do
|
|||||||
_glfwUpdateTaskbarProgressDBusPOSIX(progressVisible, value);
|
_glfwUpdateTaskbarProgressDBusPOSIX(progressVisible, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void _glfwSetWindowTaskbarProgressX11(_GLFWwindow* window, int count)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
void _glfwGetWindowPosX11(_GLFWwindow* window, int* xpos, int* ypos)
|
void _glfwGetWindowPosX11(_GLFWwindow* window, int* xpos, int* ypos)
|
||||||
{
|
{
|
||||||
Window dummy;
|
Window dummy;
|
||||||
|
Loading…
Reference in New Issue
Block a user