[gtk: 2/2] Merge branch 'gtk-content-fit' into 'main'




commit 09f99ffb279db4045dcd0d167ef6711d73293e3c
Merge: 3cc3a73d97 d8a73cbd03
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Jul 15 22:28:42 2022 +0000

    Merge branch 'gtk-content-fit' into 'main'
    
    picture: Add content-fit property
    
    Closes #5027
    
    See merge request GNOME/gtk!4873

 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 +-
 ...er-center-100x100-picture-in-100x200-overlay.ui |   2 +-
 .../center-center-100x100-picture-in-100x200.ui    |   2 +-
 ...er-center-100x100-picture-in-200x100-overlay.ui |   2 +-
 .../center-center-100x100-picture-in-200x100.ui    |   2 +-
 ...er-center-150x150-picture-in-100x200-overlay.ui |   2 +-
 .../center-center-150x150-picture-in-100x200.ui    |   2 +-
 ...er-center-150x150-picture-in-200x100-overlay.ui |   2 +-
 .../center-center-150x150-picture-in-200x100.ui    |   2 +-
 ...er-center-200x200-picture-in-100x200-overlay.ui |   2 +-
 .../center-center-200x200-picture-in-100x200.ui    |   2 +-
 ...er-center-200x200-picture-in-200x100-overlay.ui |   2 +-
 .../center-center-200x200-picture-in-200x100.ui    |   2 +-
 ...nter-center-20x20-picture-in-100x200-overlay.ui |   2 +-
 .../center-center-20x20-picture-in-100x200.ui      |   2 +-
 ...nter-center-20x20-picture-in-200x100-overlay.ui |   2 +-
 .../center-center-20x20-picture-in-200x100.ui      |   2 +-
 ...er-center-300x300-picture-in-100x200-overlay.ui |   2 +-
 .../center-center-300x300-picture-in-100x200.ui    |   2 +-
 ...er-center-300x300-picture-in-200x100-overlay.ui |   2 +-
 .../center-center-300x300-picture-in-200x100.ui    |   2 +-
 26 files changed, 192 insertions(+), 45 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]