Merge branch 'texture-new-return-types' into 'main'

gir: Annotate `GdkTexture` constructors for reading from a...

See merge request GNOME/gtk!4365
This commit is contained in:
Matthias Clasen 2022-01-12 02:42:17 +00:00
commit 9d6ccc0fe0

View File

@ -348,7 +348,7 @@ gdk_texture_init (GdkTexture *self)
* *
* @surface must be an image surface with format `CAIRO_FORMAT_ARGB32`. * @surface must be an image surface with format `CAIRO_FORMAT_ARGB32`.
* *
* Returns: a new `GdkTexture` * Returns: (type GdkMemoryTexture): a new `GdkTexture`
*/ */
GdkTexture * GdkTexture *
gdk_texture_new_for_surface (cairo_surface_t *surface) gdk_texture_new_for_surface (cairo_surface_t *surface)
@ -387,7 +387,7 @@ gdk_texture_new_for_surface (cairo_surface_t *surface)
* and [method@Gio.Task.run_in_thread] to avoid blocking the main thread * and [method@Gio.Task.run_in_thread] to avoid blocking the main thread
* while loading a big image. * while loading a big image.
* *
* Returns: a new `GdkTexture` * Returns: (type GdkMemoryTexture): a new `GdkTexture`
*/ */
GdkTexture * GdkTexture *
gdk_texture_new_for_pixbuf (GdkPixbuf *pixbuf) gdk_texture_new_for_pixbuf (GdkPixbuf *pixbuf)
@ -433,7 +433,7 @@ gdk_texture_new_for_pixbuf (GdkPixbuf *pixbuf)
* and [method@Gio.Task.run_in_thread] to avoid blocking the main thread * and [method@Gio.Task.run_in_thread] to avoid blocking the main thread
* while loading a big image. * while loading a big image.
* *
* Return value: A newly-created `GdkTexture` * Return value: (type GdkMemoryTexture): A newly-created `GdkTexture`
*/ */
GdkTexture * GdkTexture *
gdk_texture_new_from_resource (const char *resource_path) gdk_texture_new_from_resource (const char *resource_path)
@ -475,7 +475,7 @@ gdk_texture_new_from_resource (const char *resource_path)
* and [method@Gio.Task.run_in_thread] to avoid blocking the main thread * and [method@Gio.Task.run_in_thread] to avoid blocking the main thread
* while loading a big image. * while loading a big image.
* *
* Return value: A newly-created `GdkTexture` * Return value: (type GdkMemoryTexture): A newly-created `GdkTexture`
*/ */
GdkTexture * GdkTexture *
gdk_texture_new_from_file (GFile *file, gdk_texture_new_from_file (GFile *file,
@ -568,7 +568,7 @@ gdk_texture_new_from_bytes_pixbuf (GBytes *bytes,
* and [method@Gio.Task.run_in_thread] to avoid blocking the main thread * and [method@Gio.Task.run_in_thread] to avoid blocking the main thread
* while loading a big image. * while loading a big image.
* *
* Return value: A newly-created `GdkTexture` * Return value: (type GdkMemoryTexture): A newly-created `GdkTexture`
* *
* Since: 4.6 * Since: 4.6
*/ */
@ -614,7 +614,7 @@ gdk_texture_new_from_bytes (GBytes *bytes,
* and [method@Gio.Task.run_in_thread] to avoid blocking the main thread * and [method@Gio.Task.run_in_thread] to avoid blocking the main thread
* while loading a big image. * while loading a big image.
* *
* Return value: A newly-created `GdkTexture` * Return value: (type GdkMemoryTexture): A newly-created `GdkTexture`
* *
* Since: 4.6 * Since: 4.6
*/ */