diff options
| author | Benjamin Otte <otte@redhat.com> | 2017-11-03 01:59:15 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2017-11-04 00:07:13 +0100 |
| commit | 5adf21a17d7674ef4a8b39575d05570d7fe55fbc (patch) | |
| tree | cdcee3bf97fd7d14d4451b5e84017b8bf869ff5e /gdk/broadway | |
| parent | 0cad0caf7dcdc29955ed7dde644a762d2f327d7f (diff) | |
| download | gtk+-5adf21a17d7674ef4a8b39575d05570d7fe55fbc.tar.gz | |
cursor: Turn new_from_surface() into new_from_texture()
Also turn all the arguments into read-only properties on the GdkCursor
object.
Diffstat (limited to 'gdk/broadway')
| -rw-r--r-- | gdk/broadway/gdkcursor-broadway.c | 11 | ||||
| -rw-r--r-- | gdk/broadway/gdkdisplay-broadway.c | 2 | ||||
| -rw-r--r-- | gdk/broadway/gdkprivate-broadway.h | 8 |
3 files changed, 12 insertions, 9 deletions
diff --git a/gdk/broadway/gdkcursor-broadway.c b/gdk/broadway/gdkcursor-broadway.c index bf40d290e7..86911e3f40 100644 --- a/gdk/broadway/gdkcursor-broadway.c +++ b/gdk/broadway/gdkcursor-broadway.c @@ -76,16 +76,19 @@ _gdk_broadway_cursor_update_theme (GdkCursor *cursor) } GdkCursor * -_gdk_broadway_display_get_cursor_for_surface (GdkDisplay *display, - cairo_surface_t *surface, - gdouble x, - gdouble y) +_gdk_broadway_display_get_cursor_for_texture (GdkDisplay *display, + GdkTexture *texture, + int x, + int y) { GdkBroadwayCursor *private; GdkCursor *cursor; private = g_object_new (GDK_TYPE_BROADWAY_CURSOR, "display", display, + "texture", texture, + "x", x, + "y", y, NULL); cursor = (GdkCursor *) private; diff --git a/gdk/broadway/gdkdisplay-broadway.c b/gdk/broadway/gdkdisplay-broadway.c index 78db641bc6..e02e1e306e 100644 --- a/gdk/broadway/gdkdisplay-broadway.c +++ b/gdk/broadway/gdkdisplay-broadway.c @@ -359,7 +359,7 @@ gdk_broadway_display_class_init (GdkBroadwayDisplayClass * class) display_class->supports_shapes = gdk_broadway_display_supports_shapes; display_class->supports_input_shapes = gdk_broadway_display_supports_input_shapes; display_class->get_cursor_for_name = _gdk_broadway_display_get_cursor_for_name; - display_class->get_cursor_for_surface = _gdk_broadway_display_get_cursor_for_surface; + display_class->get_cursor_for_texture = _gdk_broadway_display_get_cursor_for_texture; display_class->get_default_cursor_size = _gdk_broadway_display_get_default_cursor_size; display_class->get_maximal_cursor_size = _gdk_broadway_display_get_maximal_cursor_size; display_class->supports_cursor_alpha = _gdk_broadway_display_supports_cursor_alpha; diff --git a/gdk/broadway/gdkprivate-broadway.h b/gdk/broadway/gdkprivate-broadway.h index d994ab7ee8..4b1ee656ad 100644 --- a/gdk/broadway/gdkprivate-broadway.h +++ b/gdk/broadway/gdkprivate-broadway.h @@ -101,10 +101,10 @@ GdkDragProtocol _gdk_broadway_window_get_drag_protocol (GdkWindow *window, GdkWindow **target); GdkCursor*_gdk_broadway_display_get_cursor_for_name (GdkDisplay *display, const gchar *name); -GdkCursor *_gdk_broadway_display_get_cursor_for_surface (GdkDisplay *display, - cairo_surface_t *surface, - gdouble x, - gdouble y); +GdkCursor *_gdk_broadway_display_get_cursor_for_texture (GdkDisplay *display, + GdkTexture *texture, + int x, + int y); gboolean _gdk_broadway_display_supports_cursor_alpha (GdkDisplay *display); gboolean _gdk_broadway_display_supports_cursor_color (GdkDisplay *display); void _gdk_broadway_display_get_default_cursor_size (GdkDisplay *display, |