[gtk: 16/16] Merge branch 'wip/ebassi/grid-layout' into 'master'
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 16/16] Merge branch 'wip/ebassi/grid-layout' into 'master'
- Date: Fri, 5 Apr 2019 02:43:21 +0000 (UTC)
commit 69d4081ff8b1ca4d58e005f8f2176623d9ce3134
Merge: cf6f9ad4cf c9d8ff21d2
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Apr 5 02:42:55 2019 +0000
Merge branch 'wip/ebassi/grid-layout' into 'master'
Implement GtkGridLayout
See merge request GNOME/gtk!714
demos/gtk-demo/application.ui | 33 +-
demos/gtk-demo/appmenu.ui | 1 +
demos/gtk-demo/blendmodes.ui | 201 +-
demos/gtk-demo/cursors.ui | 1 +
demos/gtk-demo/demo.ui | 1 +
demos/gtk-demo/filtermodel.ui | 49 +-
demos/gtk-demo/fishbowl.ui | 7 +-
demos/gtk-demo/font-features.ui | 1 +
demos/gtk-demo/listbox.ui | 51 +-
demos/gtk-demo/main.ui | 1 +
demos/gtk-demo/menus.ui | 1 +
demos/gtk-demo/modelbutton.ui | 1 +
demos/gtk-demo/popover.ui | 1 +
demos/gtk-demo/revealer.ui | 73 +-
demos/gtk-demo/scale.ui | 49 +-
demos/gtk-demo/shortcuts-boxes.ui | 1 +
demos/gtk-demo/shortcuts-builder.ui | 1 +
demos/gtk-demo/shortcuts-clocks.ui | 1 +
demos/gtk-demo/shortcuts-gedit.ui | 1 +
demos/gtk-demo/shortcuts.ui | 1 +
demos/gtk-demo/spinbutton.ui | 97 +-
demos/gtk-demo/stack.ui | 17 +-
demos/gtk-demo/theming.ui | 1 +
demos/icon-browser/window.ui | 99 +-
demos/widget-factory/widget-factory.ui | 252 +-
docs/reference/gtk/gtk4-docs.xml | 4 +
docs/reference/gtk/gtk4-sections.txt | 82 +
docs/reference/gtk/gtk4.types.in | 2 +
examples/application10/prefs.ui | 36 +-
examples/application6/prefs.ui | 36 +-
examples/application7/prefs.ui | 36 +-
examples/application8/prefs.ui | 36 +-
examples/application9/prefs.ui | 36 +-
examples/builder.ui | 27 +-
gtk/gtk.h | 1 +
gtk/gtkgrid.c | 1992 ++-------
gtk/gtkgrid.h | 7 +
gtk/gtkgridlayout.c | 2045 ++++++++++
gtk/gtkgridlayout.h | 101 +
gtk/meson.build | 2 +
gtk/tools/gtk-builder-tool-simplify.c | 118 +-
gtk/ui/gtkaboutdialog.ui | 1 +
gtk/ui/gtkappchooserdialog.ui | 1 +
gtk/ui/gtkappchooserwidget.ui | 1 +
gtk/ui/gtkapplication-quartz.ui | 1 +
gtk/ui/gtkassistant.ui | 1 +
gtk/ui/gtkcolorchooserdialog.ui | 1 +
gtk/ui/gtkcoloreditor.ui | 117 +-
gtk/ui/gtkcombobox.ui | 1 +
gtk/ui/gtkdialog.ui | 1 +
gtk/ui/gtkemojichooser.ui | 25 +-
gtk/ui/gtkemojicompletion.ui | 1 +
gtk/ui/gtkfilechooserdialog.ui | 1 +
gtk/ui/gtkfilechooserwidget.ui | 95 +-
gtk/ui/gtkfontchooserdialog.ui | 1 +
gtk/ui/gtkfontchooserwidget.ui | 101 +-
gtk/ui/gtkinfobar.ui | 1 +
gtk/ui/gtklockbutton.ui | 1 +
gtk/ui/gtkmediacontrols.ui | 1 +
gtk/ui/gtkmessagedialog.ui | 1 +
gtk/ui/gtkpagesetupunixdialog.ui | 87 +-
gtk/ui/gtkpathbar.ui | 1 +
gtk/ui/gtkplacesview.ui | 17 +-
gtk/ui/gtkplacesviewrow.ui | 1 +
gtk/ui/gtkprintunixdialog.ui | 385 +-
gtk/ui/gtkscalebutton.ui | 1 +
gtk/ui/gtksidebarrow.ui | 1 +
gtk/ui/gtkstatusbar.ui | 1 +
gtk/ui/gtktooltipwindow.ui | 1 +
gtk/ui/gtkvolumebutton.ui | 1 +
tests/dialog.ui | 70 +-
tests/popupat.ui | 4241 ++++++++------------
tests/testsplitheaders.ui | 38 +-
testsuite/a11y/buttons.ui | 130 +-
testsuite/a11y/pickers.ui | 41 +-
testsuite/a11y/range.ui | 26 +-
testsuite/css/nodes/box.ltr.ui | 7 -
testsuite/css/nodes/box.rtl.ui | 7 -
testsuite/css/nodes/buttons.ui | 130 +-
testsuite/css/nodes/checkbutton.ltr.ui | 7 -
testsuite/css/nodes/checkbutton.rtl.ui | 7 -
testsuite/css/nodes/combobox.ui | 6 +-
testsuite/css/nodes/entries.ui | 21 +-
testsuite/css/nodes/expander.ltr.ui | 8 +-
testsuite/css/nodes/expander.rtl.ui | 8 +-
testsuite/css/nodes/levelbar.ltr.ui | 15 +-
testsuite/css/nodes/levelbar.rtl.ui | 15 +-
testsuite/css/nodes/notebook-arrows.ui | 1 +
testsuite/css/nodes/notebook-arrows2.ui | 1 +
testsuite/css/nodes/notebook.bottom.ltr.ui | 1 +
testsuite/css/nodes/notebook.bottom.rtl.ui | 1 +
testsuite/css/nodes/notebook.left.ltr.ui | 1 +
testsuite/css/nodes/notebook.left.rtl.ui | 1 +
testsuite/css/nodes/notebook.right.ltr.ui | 1 +
testsuite/css/nodes/notebook.right.rtl.ui | 1 +
testsuite/css/nodes/notebook.top.ltr.ui | 1 +
testsuite/css/nodes/notebook.top.rtl.ui | 1 +
testsuite/css/nodes/paned.ltr.ui | 1 +
testsuite/css/nodes/paned.rtl.ui | 1 +
testsuite/css/nodes/progressbar.ui | 15 +-
testsuite/gtk/grid.c | 117 +-
testsuite/reftests/721800-0px-dotted-border.ref.ui | 5 -
testsuite/reftests/721800-0px-dotted-border.ui | 5 -
testsuite/reftests/actionbar.ref.ui | 19 +-
testsuite/reftests/actionbar.ui | 5 +-
testsuite/reftests/animation-direction.ref.ui | 388 +-
testsuite/reftests/animation-direction.ui | 324 +-
.../animation-fill-mode-iteration-count.ref.ui | 644 ++-
.../animation-fill-mode-iteration-count.ui | 644 ++-
testsuite/reftests/background-area.ref.ui | 70 +-
testsuite/reftests/background-area.ui | 55 +-
.../background-blend-mode-clip-interaction.ref.ui | 7 +-
.../background-blend-mode-clip-interaction.ui | 7 +-
.../reftests/background-color-transparent.ref.ui | 40 +-
testsuite/reftests/background-color-transparent.ui | 40 +-
.../reftests/background-image-multiple.ref.ui | 155 +-
testsuite/reftests/background-image-multiple.ui | 89 +-
testsuite/reftests/background-origin.ref.ui | 9 +-
testsuite/reftests/background-origin.ui | 157 +-
.../reftests/background-position-repeat.ref.ui | 7 +-
testsuite/reftests/background-position-repeat.ui | 7 +-
.../reftests/background-position-simple.ref.ui | 2 -
testsuite/reftests/background-position-simple.ui | 2 -
testsuite/reftests/background-position.ref.ui | 125 +-
testsuite/reftests/background-position.ui | 159 +-
.../background-positioning-area-empty.ref.ui | 6 +-
.../reftests/background-positioning-area-empty.ui | 6 +-
testsuite/reftests/background-repeat.ref.ui | 60 +-
testsuite/reftests/background-repeat.ui | 46 +-
testsuite/reftests/background-size-keywords.ref.ui | 208 +-
testsuite/reftests/background-size-keywords.ui | 208 +-
testsuite/reftests/background-size-zero.ref.ui | 2 -
testsuite/reftests/background-size-zero.ui | 2 -
testsuite/reftests/background-size.ref.ui | 208 +-
testsuite/reftests/background-size.ui | 208 +-
.../reftests/background-window-transparent.ref.ui | 5 +-
.../reftests/background-window-transparent.ui | 5 +-
testsuite/reftests/bad-color-names.ref.ui | 2 -
testsuite/reftests/bad-color-names.ui | 2 -
testsuite/reftests/border-color-default.ref.ui | 7 +-
testsuite/reftests/border-color-default.ui | 7 +-
.../border-corner-zero-width-rendering.ref.ui | 212 +-
.../reftests/border-corner-zero-width-rendering.ui | 212 +-
testsuite/reftests/border-half-pixel.ref.ui | 7 +-
testsuite/reftests/border-half-pixel.ui | 7 +-
testsuite/reftests/border-image-excess-size.ref.ui | 72 +-
testsuite/reftests/border-image-excess-size.ui | 7 +-
testsuite/reftests/border-image-url-scaled.ref.ui | 23 +-
testsuite/reftests/border-image-url-scaled.ui | 9 +-
testsuite/reftests/border-image-url.ref.ui | 9 +-
testsuite/reftests/border-image-url.ui | 9 +-
testsuite/reftests/border-radius-clamp.ref.ui | 4 -
testsuite/reftests/border-radius-clamp.ui | 4 -
testsuite/reftests/border-style-none.ref.ui | 9 +-
testsuite/reftests/border-style-none.ui | 9 +-
testsuite/reftests/border-style.ref.ui | 21 +-
testsuite/reftests/border-style.ui | 72 +-
testsuite/reftests/box-order.ref.ui | 124 +-
testsuite/reftests/box-order.ui | 127 +-
testsuite/reftests/box-pseudo-classes.ref.ui | 89 +-
testsuite/reftests/box-pseudo-classes.ui | 89 +-
.../reftests/box-shadow-changes-modify-clip.ref.ui | 4 -
.../reftests/box-shadow-changes-modify-clip.ui | 6 -
testsuite/reftests/box-shadow-spec-inset.ref.ui | 304 +-
testsuite/reftests/box-shadow-spec-inset.ui | 112 +-
testsuite/reftests/box-shadow-spread.ref.ui | 5 -
testsuite/reftests/box-shadow-spread.ui | 5 -
.../reftests/box-shadow-with-blend-mode.ref.ui | 7 +-
testsuite/reftests/box-shadow-with-blend-mode.ui | 7 +-
testsuite/reftests/button-wrapping.ref.ui | 25 +-
testsuite/reftests/button-wrapping.ui | 25 +-
testsuite/reftests/color-transition.ref.ui | 2 -
testsuite/reftests/color-transition.ui | 10 +-
testsuite/reftests/css-currentcolor-alpha.ref.ui | 2 -
testsuite/reftests/css-currentcolor-alpha.ui | 2 -
testsuite/reftests/css-em-label-size.ref.ui | 220 +-
testsuite/reftests/css-em-label-size.ui | 178 +-
testsuite/reftests/css-image-aspect-ratio.ref.ui | 2 -
testsuite/reftests/css-image-aspect-ratio.ui | 2 -
.../reftests/css-image-color-aspect-ratio.ref.ui | 2 -
testsuite/reftests/css-image-color-aspect-ratio.ui | 2 -
testsuite/reftests/css-match-class.ref.ui | 4 -
testsuite/reftests/css-match-class.ui | 4 +-
.../reftests/css-match-descendant-later.ref.ui | 4 -
testsuite/reftests/css-match-descendant-later.ui | 32 +-
testsuite/reftests/css-match-exact.ref.ui | 2 -
testsuite/reftests/css-match-exact.ui | 18 +-
testsuite/reftests/css-match-import.ref.ui | 4 -
testsuite/reftests/css-match-import.ui | 4 -
.../css-match-inherit-different-state.ref.ui | 11 +-
.../reftests/css-match-inherit-different-state.ui | 11 +-
testsuite/reftests/css-match-inherit.ref.ui | 9 +-
testsuite/reftests/css-match-inherit.ui | 9 +-
testsuite/reftests/css-match-name.ref.ui | 4 -
testsuite/reftests/css-match-name.ui | 4 +-
testsuite/reftests/css-match-siblings.ref.ui | 14 -
testsuite/reftests/css-match-siblings.ui | 14 -
testsuite/reftests/css-match-type.ref.ui | 4 -
testsuite/reftests/css-match-type.ui | 4 +-
testsuite/reftests/css-multi-state.ref.ui | 13 +-
testsuite/reftests/css-multi-state.ui | 13 +-
testsuite/reftests/css-rem-label-size.ref.ui | 4 -
testsuite/reftests/css-rem-label-size.ui | 4 -
testsuite/reftests/expander.ref.ui | 6 +-
testsuite/reftests/expander.ui | 7 +-
testsuite/reftests/fixed-widget-stacking.ref.ui | 18 +-
testsuite/reftests/fixed-widget-stacking.ui | 20 +-
testsuite/reftests/flipping-icons.ref.ui | 27 +-
testsuite/reftests/flipping-icons.ui | 27 +-
testsuite/reftests/font-sizes-names.ref.ui | 30 -
testsuite/reftests/font-sizes-names.ui | 30 -
testsuite/reftests/grid-empty-with-spacing.ref.ui | 4 -
testsuite/reftests/grid-empty-with-spacing.ui | 19 +-
testsuite/reftests/grid-expand.ref.ui | 46 +-
testsuite/reftests/grid-expand.ui | 64 +-
testsuite/reftests/grid-homogeneous.ref.ui | 144 +-
testsuite/reftests/grid-homogeneous.ui | 180 +-
testsuite/reftests/grid-spacing1.ref.ui | 38 +-
testsuite/reftests/grid-spacing1.ui | 98 +-
testsuite/reftests/grid-spacing2.ref.ui | 30 +-
testsuite/reftests/grid-spacing2.ui | 116 +-
testsuite/reftests/grid-spacing3.ref.ui | 60 +-
testsuite/reftests/grid-spacing3.ui | 61 +-
testsuite/reftests/grid-wfh.ref.ui | 32 +-
testsuite/reftests/grid-wfh.ui | 34 +-
testsuite/reftests/gtk-icontheme-sizing.ref.ui | 4 -
testsuite/reftests/gtk-icontheme-sizing.ui | 4 -
testsuite/reftests/gtk-image-effect-inherit.ref.ui | 11 -
testsuite/reftests/gtk-image-effect-inherit.ui | 53 +-
testsuite/reftests/icon-effect-missing.ref.ui | 10 -
testsuite/reftests/icon-effect-missing.ui | 10 -
testsuite/reftests/icon-shadow-no-transform.ref.ui | 7 +-
testsuite/reftests/icon-shadow-no-transform.ui | 4 -
testsuite/reftests/icon-style-basics.ref.ui | 533 +--
testsuite/reftests/icon-style-basics.ui | 533 +--
testsuite/reftests/icon-vfuncs.ref.ui | 104 +-
testsuite/reftests/icon-vfuncs.ui | 113 +-
testsuite/reftests/iconview-empty.ref.ui | 228 +-
testsuite/reftests/iconview-empty.ui | 236 +-
.../reftests/image-icon-name-use-fallback.ref.ui | 6 +-
testsuite/reftests/image-icon-name-use-fallback.ui | 6 +-
.../reftests/image-icon-shadow-clipping.ref.ui | 4 -
testsuite/reftests/image-icon-shadow-clipping.ui | 6 -
testsuite/reftests/image-load-from-file.ref.ui | 2 -
testsuite/reftests/image-load-from-file.ui | 1 -
testsuite/reftests/inherit-and-initial.ref.ui | 133 +-
testsuite/reftests/inherit-and-initial.ui | 137 +-
.../reftests/label-attribute-preference.ref.ui | 18 +-
testsuite/reftests/label-attribute-preference.ui | 12 +-
testsuite/reftests/label-background.ref.ui | 4 -
testsuite/reftests/label-background.ui | 8 -
testsuite/reftests/label-box-shadow-clip.ref.ui | 4 -
testsuite/reftests/label-box-shadow-clip.ui | 4 -
testsuite/reftests/label-clipping.ref.ui | 4 -
testsuite/reftests/label-clipping.ui | 6 -
testsuite/reftests/label-ellipsize-small.ref.ui | 4 -
testsuite/reftests/label-ellipsize-small.ui | 4 -
testsuite/reftests/label-ellipsize-with-big.ref.ui | 8 +-
testsuite/reftests/label-ellipsize-with-big.ui | 8 +-
testsuite/reftests/label-shadows.ref.ui | 132 +-
testsuite/reftests/label-shadows.ui | 60 +-
testsuite/reftests/label-sizing.ref.ui | 3945 +++++++++---------
testsuite/reftests/label-sizing.ui | 3945 +++++++++---------
testsuite/reftests/label-small-ellipsized.ref.ui | 4 -
testsuite/reftests/label-small-ellipsized.ui | 4 -
.../label-text-shadow-changes-modify-clip.ref.ui | 4 -
.../label-text-shadow-changes-modify-clip.ui | 6 -
.../reftests/label-text-shadow-clipping.ref.ui | 4 -
testsuite/reftests/label-text-shadow-clipping.ui | 6 -
.../reftests/label-width-chars-dont-shrink.ref.ui | 10 -
.../reftests/label-width-chars-dont-shrink.ui | 10 -
testsuite/reftests/label-wrap-justify.ref.ui | 68 +-
testsuite/reftests/label-wrap-justify.ui | 74 +-
testsuite/reftests/letter-spacing.ref.ui | 4 -
testsuite/reftests/letter-spacing.ui | 4 -
.../linear-gradient-transition-to-other.ref.ui | 2 -
.../linear-gradient-transition-to-other.ui | 2 -
testsuite/reftests/linear-gradient.ref.ui | 24 +-
testsuite/reftests/linear-gradient.ui | 24 +-
testsuite/reftests/link-coloring.ref.ui | 23 +-
testsuite/reftests/link-coloring.ui | 24 +-
.../reftests/messagedialog-secondarytext.ref.ui | 4 +-
testsuite/reftests/messagedialog-secondarytext.ui | 5 +-
testsuite/reftests/named-colors.ref.ui | 2104 +++++-----
testsuite/reftests/named-colors.ui | 2104 +++++-----
testsuite/reftests/no-colors.ref.ui | 4 -
testsuite/reftests/no-colors.ui | 4 -
testsuite/reftests/nonresizable-size.ref.ui | 4 -
testsuite/reftests/nonresizable-size.ui | 6 +-
testsuite/reftests/notebook-tab-position.ref.ui | 29 +-
testsuite/reftests/notebook-tab-position.ui | 29 +-
testsuite/reftests/nth-child.ref.ui | 54 -
testsuite/reftests/nth-child.ui | 54 -
testsuite/reftests/opacity-initial.ref.ui | 2 -
testsuite/reftests/opacity-initial.ui | 1 +
testsuite/reftests/opacity.ref.ui | 22 +-
testsuite/reftests/opacity.ui | 26 +-
testsuite/reftests/overlay-no-main-widget.ref.ui | 1 +
testsuite/reftests/overlay-no-main-widget.ui | 1 +
testsuite/reftests/paned-undersized.ref.ui | 7 +-
testsuite/reftests/paned-undersized.ui | 14 +-
.../reftests/picture-load-invalid-file.ref.ui | 4 +-
testsuite/reftests/picture-load-invalid-file.ui | 1 -
testsuite/reftests/pseudoclass-on-box.ref.ui | 15 +-
testsuite/reftests/pseudoclass-on-box.ui | 13 +-
testsuite/reftests/pseudoclass-on-parent.ref.ui | 13 +-
testsuite/reftests/pseudoclass-on-parent.ui | 11 +-
testsuite/reftests/quit-mnemonic.ref.ui | 6 +-
testsuite/reftests/quit-mnemonic.ui | 34 +-
.../repeating-radial-gradient-at-beginning.ref.ui | 2 -
.../repeating-radial-gradient-at-beginning.ui | 2 -
testsuite/reftests/revealer-extra-size.ref.ui | 5 -
testsuite/reftests/revealer-extra-size.ui | 9 +-
.../reftests/revealer-wrappable-contents.ref.ui | 7 +-
testsuite/reftests/revealer-wrappable-contents.ui | 11 +-
testsuite/reftests/rotated-layout.ref.ui | 32 +-
testsuite/reftests/rotated-layout.ui | 32 +-
testsuite/reftests/separator-size.ref.ui | 116 +-
testsuite/reftests/separator-size.ui | 128 +-
testsuite/reftests/set-default-direction.ref.ui | 4 -
testsuite/reftests/set-default-direction.ui | 4 -
testsuite/reftests/shadow-clip-rounding.ref.ui | 4 -
testsuite/reftests/shadow-clip-rounding.ui | 4 -
testsuite/reftests/shorthand-entry-border.ref.ui | 5 +-
testsuite/reftests/shorthand-entry-border.ui | 5 +-
testsuite/reftests/sibling-pseudoclasses.ref.ui | 17 +-
testsuite/reftests/sibling-pseudoclasses.ui | 15 +-
testsuite/reftests/simple.ref.ui | 4 -
testsuite/reftests/simple.ui | 4 -
testsuite/reftests/sizegroups-basics.ref.ui | 73 +-
testsuite/reftests/sizegroups-basics.ui | 75 +-
.../sizegroups-evolution-identity-page.ref.ui | 249 +-
.../reftests/sizegroups-evolution-identity-page.ui | 254 +-
.../reftests/sizegroups-get-preferred-null.ref.ui | 23 +-
.../reftests/sizegroups-get-preferred-null.ui | 25 +-
testsuite/reftests/statusbar-remove-all.ref.ui | 4 -
testsuite/reftests/statusbar-remove-all.ui | 4 -
.../reftests/style-context-save-inheritance.ref.ui | 8 +-
.../reftests/style-context-save-inheritance.ui | 8 +-
.../reftests/style-properties-only-child.ref.ui | 7 +-
testsuite/reftests/style-properties-only-child.ui | 7 +-
.../symbolic-icon-translucent-color.ref.ui | 5 -
.../reftests/symbolic-icon-translucent-color.ui | 5 -
testsuite/reftests/textview-border-windows.ref.ui | 53 +-
testsuite/reftests/textview-border-windows.ui | 5 +-
testsuite/reftests/textview-margins.ref.ui | 5 +-
testsuite/reftests/textview-margins.ui | 5 +-
testsuite/reftests/textview-tags.ref.ui | 5 +-
testsuite/reftests/textview-tags.ui | 5 +-
testsuite/reftests/toplevel-vs-popup.ref.ui | 4 -
testsuite/reftests/toplevel-vs-popup.ui | 4 -
testsuite/reftests/treeview-crash-too-wide.ref.ui | 43 +-
testsuite/reftests/treeview-crash-too-wide.ui | 43 +-
testsuite/reftests/treeview-fixed-height.ref.ui | 8 +-
testsuite/reftests/treeview-fixed-height.ui | 10 +-
testsuite/reftests/treeview-headers-hidden.ref.ui | 8 +-
testsuite/reftests/treeview-headers-hidden.ui | 8 +-
testsuite/reftests/unresolvable.ref.ui | 2 -
testsuite/reftests/unresolvable.ui | 2 -
testsuite/reftests/window-border-width.ref.ui | 8 +-
testsuite/reftests/window-border-width.ui | 6 +-
testsuite/reftests/window-default-size.ref.ui | 2 -
testsuite/reftests/window-default-size.ui | 2 -
testsuite/reftests/window-height-for-width.ref.ui | 43 +-
testsuite/reftests/window-height-for-width.ui | 45 +-
.../reftests/window-show-contents-on-map.ref.ui | 6 +-
testsuite/reftests/window-show-contents-on-map.ui | 5 +-
367 files changed, 15768 insertions(+), 19434 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
