From d8a73cbd03118e94bd75f5fa183a646fecb053ce Mon Sep 17 00:00:00 2001 From: Marco Melorio Date: Fri, 15 Jul 2022 18:18:26 +0200 Subject: [PATCH] picture: Add content-fit property It allows to specify the resize mode of the paintable inside the GtkPicture allocation. This also deprecates the keep-aspect-ratio property. Fixes #5027. --- demos/gtk-demo/sliding_puzzle.c | 2 +- demos/node-editor/node-editor-window.ui | 1 - demos/widget-factory/widget-factory.ui | 2 + gtk/gtkenums.h | 30 ++++ gtk/gtkpicture.c | 152 +++++++++++++++--- gtk/gtkpicture.h | 10 +- ...nter-100x100-picture-in-100x200-overlay.ui | 2 +- ...enter-center-100x100-picture-in-100x200.ui | 2 +- ...nter-100x100-picture-in-200x100-overlay.ui | 2 +- ...enter-center-100x100-picture-in-200x100.ui | 2 +- ...nter-150x150-picture-in-100x200-overlay.ui | 2 +- ...enter-center-150x150-picture-in-100x200.ui | 2 +- ...nter-150x150-picture-in-200x100-overlay.ui | 2 +- ...enter-center-150x150-picture-in-200x100.ui | 2 +- ...nter-200x200-picture-in-100x200-overlay.ui | 2 +- ...enter-center-200x200-picture-in-100x200.ui | 2 +- ...nter-200x200-picture-in-200x100-overlay.ui | 2 +- ...enter-center-200x200-picture-in-200x100.ui | 2 +- ...center-20x20-picture-in-100x200-overlay.ui | 2 +- .../center-center-20x20-picture-in-100x200.ui | 2 +- ...center-20x20-picture-in-200x100-overlay.ui | 2 +- .../center-center-20x20-picture-in-200x100.ui | 2 +- ...nter-300x300-picture-in-100x200-overlay.ui | 2 +- ...enter-center-300x300-picture-in-100x200.ui | 2 +- ...nter-300x300-picture-in-200x100-overlay.ui | 2 +- ...enter-center-300x300-picture-in-200x100.ui | 2 +- 26 files changed, 192 insertions(+), 45 deletions(-) diff --git a/demos/gtk-demo/sliding_puzzle.c b/demos/gtk-demo/sliding_puzzle.c index 1af4e2b48a..b65bc428fb 100644 --- a/demos/gtk-demo/sliding_puzzle.c +++ b/demos/gtk-demo/sliding_puzzle.c @@ -330,7 +330,7 @@ start_puzzle (GdkPaintable *paintable) x, y, width, height); picture = gtk_picture_new_for_paintable (piece); - gtk_picture_set_keep_aspect_ratio (GTK_PICTURE (picture), FALSE); + gtk_picture_set_content_fit (GTK_PICTURE (picture), GTK_CONTENT_FIT_FILL); gtk_grid_attach (GTK_GRID (grid), picture, x, y, diff --git a/demos/node-editor/node-editor-window.ui b/demos/node-editor/node-editor-window.ui index 74c87ce8e7..34d4452a4a 100644 --- a/demos/node-editor/node-editor-window.ui +++ b/demos/node-editor/node-editor-window.ui @@ -216,7 +216,6 @@ 0 - 1 center center diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui index 2963266e2a..015ff4c791 100644 --- a/demos/widget-factory/widget-factory.ui +++ b/demos/widget-factory/widget-factory.ui @@ -1265,6 +1265,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus. resource:///org/gtk/WidgetFactory4/sunset.jpg + cover + hidden diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h index 29c703762f..44e246fc9e 100644 --- a/gtk/gtkenums.h +++ b/gtk/gtkenums.h @@ -110,6 +110,36 @@ typedef enum GTK_BASELINE_POSITION_BOTTOM } GtkBaselinePosition; +/** + * GtkContentFit: + * @GTK_CONTENT_FIT_FILL: Make the content fill the entire allocation, + * without taking its aspect ratio in consideration. The resulting + * content will appear as stretched if its aspect ratio is different + * from the allocation aspect ratio. + * @GTK_CONTENT_FIT_CONTAIN: Scale the content to fit the allocation, + * while taking its aspect ratio in consideration. The resulting + * content will appear as letterboxed if its aspect ratio is different + * from the allocation aspect ratio. + * @GTK_CONTENT_FIT_COVER: Cover the entire allocation, while taking + * the content aspect ratio in consideration. This can result in an overflow + * if the content aspect ratio is different from the allocation aspect ratio. + * For this reason, you may also want to set [property@Gtk.Widget:overflow] + * to %GTK_OVERFLOW_HIDDEN. + * @GTK_CONTENT_FIT_SCALE_DOWN: The content is scaled down to fit the + * allocation, if needed, otherwise its original size is used. + * + * Controls how a content should be made to fit inside an allocation. + * + * Since: 4.8 + */ +typedef enum +{ + GTK_CONTENT_FIT_FILL, + GTK_CONTENT_FIT_CONTAIN, + GTK_CONTENT_FIT_COVER, + GTK_CONTENT_FIT_SCALE_DOWN, +} GtkContentFit; + /** * GtkDeleteType: * @GTK_DELETE_CHARS: Delete characters. diff --git a/gtk/gtkpicture.c b/gtk/gtkpicture.c index 0712d1844f..eaabda7c74 100644 --- a/gtk/gtkpicture.c +++ b/gtk/gtkpicture.c @@ -27,6 +27,7 @@ #include "gtkintl.h" #include "gtkprivate.h" #include "gtksnapshot.h" +#include "gtktypebuiltins.h" #include "gtkwidgetprivate.h" #include "gdkpixbufutilsprivate.h" @@ -89,6 +90,7 @@ enum PROP_ALTERNATIVE_TEXT, PROP_KEEP_ASPECT_RATIO, PROP_CAN_SHRINK, + PROP_CONTENT_FIT, NUM_PROPERTIES }; @@ -100,8 +102,8 @@ struct _GtkPicture GFile *file; char *alternative_text; - guint keep_aspect_ratio : 1; guint can_shrink : 1; + GtkContentFit content_fit; }; struct _GtkPictureClass @@ -129,23 +131,47 @@ gtk_picture_snapshot (GtkWidget *widget, height = gtk_widget_get_height (widget); ratio = gdk_paintable_get_intrinsic_aspect_ratio (self->paintable); - if (!self->keep_aspect_ratio || ratio == 0) + if (self->content_fit == GTK_CONTENT_FIT_FILL || ratio == 0) { gdk_paintable_snapshot (self->paintable, snapshot, width, height); } else { double picture_ratio = (double) width / height; + int paintable_width = gdk_paintable_get_intrinsic_width (self->paintable); + int paintable_height = gdk_paintable_get_intrinsic_height (self->paintable); - if (ratio > picture_ratio) + if (self->content_fit == GTK_CONTENT_FIT_SCALE_DOWN && + width >= paintable_width && height >= paintable_height) { - w = width; - h = width / ratio; + w = paintable_width; + h = paintable_height; + } + else if (ratio > picture_ratio) + { + if (self->content_fit == GTK_CONTENT_FIT_COVER) + { + w = height * ratio; + h = height; + } + else + { + w = width; + h = width / ratio; + } } else { - w = height * ratio; - h = height; + if (self->content_fit == GTK_CONTENT_FIT_COVER) + { + w = width; + h = width / ratio; + } + else + { + w = height * ratio; + h = height; + } } x = (width - ceil (w)) / 2; @@ -246,13 +272,19 @@ gtk_picture_set_property (GObject *object, break; case PROP_KEEP_ASPECT_RATIO: + G_GNUC_BEGIN_IGNORE_DEPRECATIONS gtk_picture_set_keep_aspect_ratio (self, g_value_get_boolean (value)); + G_GNUC_END_IGNORE_DEPRECATIONS break; case PROP_CAN_SHRINK: gtk_picture_set_can_shrink (self, g_value_get_boolean (value)); break; + case PROP_CONTENT_FIT: + gtk_picture_set_content_fit (self, g_value_get_enum (value)); + break; + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -282,13 +314,19 @@ gtk_picture_get_property (GObject *object, break; case PROP_KEEP_ASPECT_RATIO: - g_value_set_boolean (value, self->keep_aspect_ratio); + G_GNUC_BEGIN_IGNORE_DEPRECATIONS + g_value_set_boolean (value, gtk_picture_get_keep_aspect_ratio (self)); + G_GNUC_END_IGNORE_DEPRECATIONS break; case PROP_CAN_SHRINK: g_value_set_boolean (value, self->can_shrink); break; + case PROP_CONTENT_FIT: + g_value_set_enum (value, self->content_fit); + break; + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -394,11 +432,15 @@ gtk_picture_class_init (GtkPictureClass *class) * * Whether the GtkPicture will render its contents trying to preserve the aspect * ratio. + * + * Deprecated: 4.8: Use [property@Gtk.Picture:content-fit] instead. */ properties[PROP_KEEP_ASPECT_RATIO] = g_param_spec_boolean ("keep-aspect-ratio", NULL, NULL, TRUE, - GTK_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY); + GTK_PARAM_READWRITE | + G_PARAM_EXPLICIT_NOTIFY | + G_PARAM_DEPRECATED); /** * GtkPicture:can-shrink: (attributes org.gtk.Property.get=gtk_picture_get_can_shrink org.gtk.Property.set=gtk_picture_set_can_shrink) @@ -410,6 +452,17 @@ gtk_picture_class_init (GtkPictureClass *class) TRUE, GTK_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY); + /** + * GtkPicture:content-fit: (attributes org.gtk.Property.get=gtk_picture_get_content_fit org.gtk.Property.set=gtk_picture_set_content_fit) + * + * How the content should be resized to fit inside the `GtkPicture`. + */ + properties[PROP_CONTENT_FIT] = + g_param_spec_enum ("content-fit", NULL, NULL, + GTK_TYPE_CONTENT_FIT, + GTK_CONTENT_FIT_CONTAIN, + GTK_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY); + g_object_class_install_properties (gobject_class, NUM_PROPERTIES, properties); gtk_widget_class_set_css_name (widget_class, I_("picture")); @@ -420,7 +473,7 @@ static void gtk_picture_init (GtkPicture *self) { self->can_shrink = TRUE; - self->keep_aspect_ratio = TRUE; + self->content_fit = GTK_CONTENT_FIT_CONTAIN; } /** @@ -827,21 +880,20 @@ gtk_picture_get_paintable (GtkPicture *self) * * If set to %FALSE or if the contents provide no aspect ratio, * the contents will be stretched over the picture's whole area. + * + * Deprecated: 4.8: Use [method@Gtk.Picture.set_content_fit] instead. If still + * used, this method will always set the [property@Gtk.Picture:content-fit] + * property to `GTK_CONTENT_FIT_CONTAIN` if @keep_aspect_ratio is true, + * otherwise it will set it to `GTK_CONTENT_FIT_FILL`. */ void gtk_picture_set_keep_aspect_ratio (GtkPicture *self, gboolean keep_aspect_ratio) { - g_return_if_fail (GTK_IS_PICTURE (self)); - - if (self->keep_aspect_ratio == keep_aspect_ratio) - return; - - self->keep_aspect_ratio = keep_aspect_ratio; - - gtk_widget_queue_draw (GTK_WIDGET (self)); - - g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_KEEP_ASPECT_RATIO]); + if (keep_aspect_ratio) + gtk_picture_set_content_fit (self, GTK_CONTENT_FIT_CONTAIN); + else + gtk_picture_set_content_fit (self, GTK_CONTENT_FIT_FILL); } /** @@ -851,13 +903,17 @@ gtk_picture_set_keep_aspect_ratio (GtkPicture *self, * Returns whether the `GtkPicture` preserves its contents aspect ratio. * * Returns: %TRUE if the self tries to keep the contents' aspect ratio + * + * Deprecated: 4.8: Use [method@Gtk.Picture.get_content_fit] instead. This will + * now return `FALSE` only if [property@Gtk.Picture:content-fit] is + * `GTK_CONTENT_FIT_FILL`. Returns `TRUE` otherwise. */ gboolean gtk_picture_get_keep_aspect_ratio (GtkPicture *self) { g_return_val_if_fail (GTK_IS_PICTURE (self), TRUE); - return self->keep_aspect_ratio; + return self->content_fit != GTK_CONTENT_FIT_FILL; } /** @@ -908,6 +964,60 @@ gtk_picture_get_can_shrink (GtkPicture *self) return self->can_shrink; } +/** + * gtk_picture_set_content_fit: (attributes org.gtk.Method.set_property=content-fit) + * @self: a `GtkPicture` + * @content_fit: the content fit mode + * + * Sets how the content should be resized to fit the `GtkPicture`. + * + * See [enum@Gtk.ContentFit] for details. + * + * If you use `GTK_CONTENT_FIT_COVER`, you may also want to set the + * [property@Gtk.Widget:overflow] to `GTK_OVERFLOW_HIDDEN`, otherwise the + * paintable will overflow the widget allocation if the aspect ratio of the + * paintable is different from the one of the `GtkPicture` allocation. + */ +void +gtk_picture_set_content_fit (GtkPicture *self, + GtkContentFit content_fit) +{ + g_return_if_fail (GTK_IS_PICTURE (self)); + + if (self->content_fit == content_fit) + return; + + gboolean notify_keep_aspect_ratio = (content_fit == GTK_CONTENT_FIT_FILL || + self->content_fit == GTK_CONTENT_FIT_FILL); + + self->content_fit = content_fit; + + gtk_widget_queue_draw (GTK_WIDGET (self)); + + g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_CONTENT_FIT]); + + if (notify_keep_aspect_ratio) + g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_KEEP_ASPECT_RATIO]); +} + +/** + * gtk_picture_get_content_fit: (attributes org.gtk.Method.get_property=content-fit) + * @self: a `GtkPicture` + * + * Returns the fit mode for the content of the `GtkPicture`. + * + * See [enum@Gtk.ContentFit] for details. + * + * Returns: the content fit mode + */ +GtkContentFit +gtk_picture_get_content_fit (GtkPicture *self) +{ + g_return_val_if_fail (GTK_IS_PICTURE (self), FALSE); + + return self->content_fit; +} + /** * gtk_picture_set_alternative_text: (attributes org.gtk.Method.set_property=alternative-text) * @self: a `GtkPicture` diff --git a/gtk/gtkpicture.h b/gtk/gtkpicture.h index 80f0334f0e..5d6078071d 100644 --- a/gtk/gtkpicture.h +++ b/gtk/gtkpicture.h @@ -69,10 +69,10 @@ GDK_AVAILABLE_IN_ALL void gtk_picture_set_pixbuf (GtkPicture *self, GdkPixbuf *pixbuf); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_8_FOR(gtk_picture_set_fit_mode) void gtk_picture_set_keep_aspect_ratio (GtkPicture *self, gboolean keep_aspect_ratio); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_8_FOR(gtk_picture_get_fit_mode) gboolean gtk_picture_get_keep_aspect_ratio (GtkPicture *self); GDK_AVAILABLE_IN_ALL void gtk_picture_set_can_shrink (GtkPicture *self, @@ -80,6 +80,12 @@ void gtk_picture_set_can_shrink (GtkPicture GDK_AVAILABLE_IN_ALL gboolean gtk_picture_get_can_shrink (GtkPicture *self); +GDK_AVAILABLE_IN_4_8 +void gtk_picture_set_content_fit (GtkPicture *self, + GtkContentFit content_fit); +GDK_AVAILABLE_IN_4_8 +GtkContentFit gtk_picture_get_content_fit (GtkPicture *self); + GDK_AVAILABLE_IN_ALL void gtk_picture_set_alternative_text (GtkPicture *self, const char *alternative_text); diff --git a/testsuite/reftests/center-center-100x100-picture-in-100x200-overlay.ui b/testsuite/reftests/center-center-100x100-picture-in-100x200-overlay.ui index 5826455256..3dc3b575c9 100644 --- a/testsuite/reftests/center-center-100x100-picture-in-100x200-overlay.ui +++ b/testsuite/reftests/center-center-100x100-picture-in-100x200-overlay.ui @@ -9,7 +9,7 @@ green-100x100.png - 0 + fill 1 center center diff --git a/testsuite/reftests/center-center-100x100-picture-in-100x200.ui b/testsuite/reftests/center-center-100x100-picture-in-100x200.ui index 2acb5704ba..add6cbc520 100644 --- a/testsuite/reftests/center-center-100x100-picture-in-100x200.ui +++ b/testsuite/reftests/center-center-100x100-picture-in-100x200.ui @@ -7,7 +7,7 @@ green-100x100.png - 0 + fill 1 center center diff --git a/testsuite/reftests/center-center-100x100-picture-in-200x100-overlay.ui b/testsuite/reftests/center-center-100x100-picture-in-200x100-overlay.ui index 06a17662a3..df8035707e 100644 --- a/testsuite/reftests/center-center-100x100-picture-in-200x100-overlay.ui +++ b/testsuite/reftests/center-center-100x100-picture-in-200x100-overlay.ui @@ -9,7 +9,7 @@ green-100x100.png - 0 + fill 1 center center diff --git a/testsuite/reftests/center-center-100x100-picture-in-200x100.ui b/testsuite/reftests/center-center-100x100-picture-in-200x100.ui index c5bc7b0882..5f27966763 100644 --- a/testsuite/reftests/center-center-100x100-picture-in-200x100.ui +++ b/testsuite/reftests/center-center-100x100-picture-in-200x100.ui @@ -7,7 +7,7 @@ green-100x100.png - 0 + fill 1 center center diff --git a/testsuite/reftests/center-center-150x150-picture-in-100x200-overlay.ui b/testsuite/reftests/center-center-150x150-picture-in-100x200-overlay.ui index 9f02233bbd..b981c7c188 100644 --- a/testsuite/reftests/center-center-150x150-picture-in-100x200-overlay.ui +++ b/testsuite/reftests/center-center-150x150-picture-in-100x200-overlay.ui @@ -9,7 +9,7 @@ green-150x150.png - 0 + fill 1 center center diff --git a/testsuite/reftests/center-center-150x150-picture-in-100x200.ui b/testsuite/reftests/center-center-150x150-picture-in-100x200.ui index d7f8295550..39424049cd 100644 --- a/testsuite/reftests/center-center-150x150-picture-in-100x200.ui +++ b/testsuite/reftests/center-center-150x150-picture-in-100x200.ui @@ -7,7 +7,7 @@ green-150x150.png - 0 + fill 1 center center diff --git a/testsuite/reftests/center-center-150x150-picture-in-200x100-overlay.ui b/testsuite/reftests/center-center-150x150-picture-in-200x100-overlay.ui index 1213e9249e..767afa2460 100644 --- a/testsuite/reftests/center-center-150x150-picture-in-200x100-overlay.ui +++ b/testsuite/reftests/center-center-150x150-picture-in-200x100-overlay.ui @@ -9,7 +9,7 @@ green-150x150.png - 0 + fill 1 center center diff --git a/testsuite/reftests/center-center-150x150-picture-in-200x100.ui b/testsuite/reftests/center-center-150x150-picture-in-200x100.ui index 3c74776bd3..1a86775400 100644 --- a/testsuite/reftests/center-center-150x150-picture-in-200x100.ui +++ b/testsuite/reftests/center-center-150x150-picture-in-200x100.ui @@ -7,7 +7,7 @@ green-150x150.png - 0 + fill 1 center center diff --git a/testsuite/reftests/center-center-200x200-picture-in-100x200-overlay.ui b/testsuite/reftests/center-center-200x200-picture-in-100x200-overlay.ui index f15b48b5d5..867c973979 100644 --- a/testsuite/reftests/center-center-200x200-picture-in-100x200-overlay.ui +++ b/testsuite/reftests/center-center-200x200-picture-in-100x200-overlay.ui @@ -9,7 +9,7 @@ green-200x200.png - 0 + fill 1 center center diff --git a/testsuite/reftests/center-center-200x200-picture-in-100x200.ui b/testsuite/reftests/center-center-200x200-picture-in-100x200.ui index 0f4ead1f86..4c641bbf72 100644 --- a/testsuite/reftests/center-center-200x200-picture-in-100x200.ui +++ b/testsuite/reftests/center-center-200x200-picture-in-100x200.ui @@ -7,7 +7,7 @@ green-200x200.png - 0 + fill 1 center center diff --git a/testsuite/reftests/center-center-200x200-picture-in-200x100-overlay.ui b/testsuite/reftests/center-center-200x200-picture-in-200x100-overlay.ui index 6e787008fa..4f0e6a4e48 100644 --- a/testsuite/reftests/center-center-200x200-picture-in-200x100-overlay.ui +++ b/testsuite/reftests/center-center-200x200-picture-in-200x100-overlay.ui @@ -9,7 +9,7 @@ green-200x200.png - 0 + fill 1 center center diff --git a/testsuite/reftests/center-center-200x200-picture-in-200x100.ui b/testsuite/reftests/center-center-200x200-picture-in-200x100.ui index 82b7b89f4e..ecb9d7be7c 100644 --- a/testsuite/reftests/center-center-200x200-picture-in-200x100.ui +++ b/testsuite/reftests/center-center-200x200-picture-in-200x100.ui @@ -7,7 +7,7 @@ green-200x200.png - 0 + fill 1 center center diff --git a/testsuite/reftests/center-center-20x20-picture-in-100x200-overlay.ui b/testsuite/reftests/center-center-20x20-picture-in-100x200-overlay.ui index 55177f2749..34f844d226 100644 --- a/testsuite/reftests/center-center-20x20-picture-in-100x200-overlay.ui +++ b/testsuite/reftests/center-center-20x20-picture-in-100x200-overlay.ui @@ -9,7 +9,7 @@ green-20x20.png - 0 + fill 1 center center diff --git a/testsuite/reftests/center-center-20x20-picture-in-100x200.ui b/testsuite/reftests/center-center-20x20-picture-in-100x200.ui index 80ecb6f2f1..b9a0b7bdf5 100644 --- a/testsuite/reftests/center-center-20x20-picture-in-100x200.ui +++ b/testsuite/reftests/center-center-20x20-picture-in-100x200.ui @@ -7,7 +7,7 @@ green-20x20.png - 0 + fill 1 center center diff --git a/testsuite/reftests/center-center-20x20-picture-in-200x100-overlay.ui b/testsuite/reftests/center-center-20x20-picture-in-200x100-overlay.ui index e5835423fb..984f304555 100644 --- a/testsuite/reftests/center-center-20x20-picture-in-200x100-overlay.ui +++ b/testsuite/reftests/center-center-20x20-picture-in-200x100-overlay.ui @@ -9,7 +9,7 @@ green-20x20.png - 0 + fill 1 center center diff --git a/testsuite/reftests/center-center-20x20-picture-in-200x100.ui b/testsuite/reftests/center-center-20x20-picture-in-200x100.ui index 239c680026..72e36587ad 100644 --- a/testsuite/reftests/center-center-20x20-picture-in-200x100.ui +++ b/testsuite/reftests/center-center-20x20-picture-in-200x100.ui @@ -7,7 +7,7 @@ green-20x20.png - 0 + fill 1 center center diff --git a/testsuite/reftests/center-center-300x300-picture-in-100x200-overlay.ui b/testsuite/reftests/center-center-300x300-picture-in-100x200-overlay.ui index 2fff2c91d3..41951b220c 100644 --- a/testsuite/reftests/center-center-300x300-picture-in-100x200-overlay.ui +++ b/testsuite/reftests/center-center-300x300-picture-in-100x200-overlay.ui @@ -9,7 +9,7 @@ green-300x300.png - 0 + fill 1 center center diff --git a/testsuite/reftests/center-center-300x300-picture-in-100x200.ui b/testsuite/reftests/center-center-300x300-picture-in-100x200.ui index 12b254670f..4ca7f38453 100644 --- a/testsuite/reftests/center-center-300x300-picture-in-100x200.ui +++ b/testsuite/reftests/center-center-300x300-picture-in-100x200.ui @@ -7,7 +7,7 @@ green-300x300.png - 0 + fill 1 center center diff --git a/testsuite/reftests/center-center-300x300-picture-in-200x100-overlay.ui b/testsuite/reftests/center-center-300x300-picture-in-200x100-overlay.ui index 5c2e1735e6..350618202a 100644 --- a/testsuite/reftests/center-center-300x300-picture-in-200x100-overlay.ui +++ b/testsuite/reftests/center-center-300x300-picture-in-200x100-overlay.ui @@ -9,7 +9,7 @@ green-300x300.png - 0 + fill 1 center center diff --git a/testsuite/reftests/center-center-300x300-picture-in-200x100.ui b/testsuite/reftests/center-center-300x300-picture-in-200x100.ui index 4182b9d821..14e42ad03e 100644 --- a/testsuite/reftests/center-center-300x300-picture-in-200x100.ui +++ b/testsuite/reftests/center-center-300x300-picture-in-200x100.ui @@ -7,7 +7,7 @@ green-300x300.png - 0 + fill 1 center center