AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-27 14:10:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'win32-hotspot' into 'main'

Browse Source 
gdk/win32: fix cursor hotspot

See merge request GNOME/gtk!5216
This commit is contained in:
Luca Bacci 2022-11-17 09:06:55 +00:00
commit 7c62eaa528
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gdk/win32/gdkcursor-win32.c
View File

@ -911,7 +911,7 @@ gdk_win32hcursor_create_for_texture (GdkWin32Display *display,
pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0, width, height); pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0, width, height);
icon = pixbuf_to_hicon (pixbuf, TRUE, 0, 0); icon = pixbuf_to_hicon (pixbuf, FALSE, x, y);
g_object_unref (pixbuf); g_object_unref (pixbuf);
@ -1472,16 +1472,6 @@ _gdk_win32_texture_to_hicon (GdkTexture *texture)
return icon; return icon;
} }
HICON
_gdk_win32_pixbuf_to_hcursor (GdkPixbuf *pixbuf,
int x_hotspot,
int y_hotspot)
{
return pixbuf_to_hicon (pixbuf, FALSE, x_hotspot, y_hotspot);
}
/** /**
* gdk_win32_display_get_win32hcursor: * gdk_win32_display_get_win32hcursor:
* @display: (type GdkWin32Display): a `GdkDisplay` * @display: (type GdkWin32Display): a `GdkDisplay`

3
gdk/win32/gdkprivate-win32.h
View File

@ -330,9 +330,6 @@ void _gdk_win32_end_modal_call (GdkWin32ModalOpKind kind);
* Windows XP, thresholds alpha otherwise. * Windows XP, thresholds alpha otherwise.
*/ */
HICON _gdk_win32_texture_to_hicon (GdkTexture *texture); HICON _gdk_win32_texture_to_hicon (GdkTexture *texture);
HICON _gdk_win32_pixbuf_to_hcursor (GdkPixbuf *pixbuf,
int x_hotspot,
int y_hotspot);
void _gdk_win32_display_init_cursors (GdkWin32Display *display); void _gdk_win32_display_init_cursors (GdkWin32Display *display);
void _gdk_win32_display_finalize_cursors (GdkWin32Display *display); void _gdk_win32_display_finalize_cursors (GdkWin32Display *display);