diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-01-16 20:36:44 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-01-16 20:36:44 +0000 |
| commit | 61a7ebf980f1287e5f84ebdd0776f908169b3a3b (patch) | |
| tree | d4d23585ea90714a012639276c3020e4cf663e2c | |
| parent | 1641d365f5b3b08b7588b84fa2556aefd2b155b3 (diff) | |
| parent | a5e929ce36adc385dfcfcf600e97fd9c11c38e12 (diff) | |
| download | gtk+-61a7ebf980f1287e5f84ebdd0776f908169b3a3b.tar.gz | |
Merge branch 'matthiasc/for-master' into 'master'
docs: Add details
See merge request GNOME/gtk!3084
| -rw-r--r-- | gtk/gtkimage.c | 6 | ||||
| -rw-r--r-- | gtk/gtkpicture.c | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c index 730660ff06..5c53a5ede1 100644 --- a/gtk/gtkimage.c +++ b/gtk/gtkimage.c @@ -44,7 +44,7 @@ * SECTION:gtkimage * @Short_description: A widget displaying an image * @Title: GtkImage - * @SeeAlso: #GdkTexture + * @SeeAlso: #GdkTexture, #GtkPicture * * The #GtkImage widget displays an image. Various kinds of object * can be displayed as an image; most typically, you would load a @@ -67,6 +67,10 @@ * In this case, the #GtkImage:resource, gtk_image_new_from_resource() and * gtk_image_set_from_resource() should be used. * + * GtkImage displays its image as an icon, with a size that is determined + * by the application. See #GtkPicture if you want to show an image at is + * actual size. + * * # CSS nodes * * GtkImage has a single CSS node with the name image. The style classes diff --git a/gtk/gtkpicture.c b/gtk/gtkpicture.c index 6f0eb83240..0668cad14b 100644 --- a/gtk/gtkpicture.c +++ b/gtk/gtkpicture.c @@ -56,6 +56,9 @@ * In this case, gtk_picture_new_for_resource() and gtk_picture_set_resource() * should be used. * + * GtkPicture displays an image at its natural size. See #GtkImage if you want + * to display a fixed-size image, such as an icon. + * * # Sizing the paintable * * You can influence how the paintable is displayed inside the #GtkPicture. |