[gtk: 6/6] Merge branch 'expand-margin-cleanup' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 5430c80361afa4673b16ad31b33c3809994f24f3
Merge: 815e18e069 37a2cae10e
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Feb 26 14:27:47 2020 +0000

    Merge branch 'expand-margin-cleanup' into 'master'
    
    expand and margin cleanup
    
    See merge request GNOME/gtk!1479

 demos/constraint-editor/constraint-editor-window.c |   5 +-
 demos/constraint-editor/constraint-editor.ui       |   5 +-
 demos/constraint-editor/guide-editor.ui            |   5 +-
 demos/gtk-demo/assistant.c                         |  10 +-
 demos/gtk-demo/clipboard.c                         |  20 ++-
 demos/gtk-demo/colorsel.c                          |   5 +-
 demos/gtk-demo/combobox.c                          |  25 ++-
 demos/gtk-demo/cursors.ui                          | 185 ++++++++++++++++-----
 demos/gtk-demo/demo.ui                             |   3 +-
 demos/gtk-demo/dialog.c                            |  10 +-
 demos/gtk-demo/drawingarea.c                       |   5 +-
 demos/gtk-demo/editable_cells.c                    |   5 +-
 demos/gtk-demo/entry_completion.c                  |   5 +-
 demos/gtk-demo/entry_undo.c                        |   5 +-
 demos/gtk-demo/filtermodel.ui                      |   5 +-
 demos/gtk-demo/font-features.ui                    |  10 +-
 demos/gtk-demo/glarea.c                            |   5 +-
 demos/gtk-demo/iconscroll.c                        |   5 +-
 demos/gtk-demo/images.c                            |   5 +-
 demos/gtk-demo/infobar.c                           |  10 +-
 demos/gtk-demo/list_store.c                        |   5 +-
 demos/gtk-demo/main.ui                             |   3 +-
 demos/gtk-demo/modelbutton.ui                      |  20 ++-
 demos/gtk-demo/panes.c                             |  10 +-
 demos/gtk-demo/password_entry.c                    |   5 +-
 demos/gtk-demo/pickers.c                           |   5 +-
 demos/gtk-demo/popover.c                           |  10 +-
 demos/gtk-demo/scale.ui                            |   5 +-
 demos/gtk-demo/search_entry.c                      |   5 +-
 demos/gtk-demo/shortcuts.ui                        |   5 +-
 demos/gtk-demo/sizegroup.c                         |  15 +-
 demos/gtk-demo/sliding_puzzle.c                    |   5 +-
 demos/gtk-demo/spinbutton.ui                       |   5 +-
 demos/gtk-demo/spinner.c                           |   5 +-
 demos/gtk-demo/tagged_entry.c                      |   5 +-
 demos/gtk-demo/themes.ui                           |   5 +-
 demos/gtk-demo/theming.ui                          |   5 +-
 demos/gtk-demo/transparent.c                       |  10 +-
 demos/gtk-demo/tree_store.c                        |   5 +-
 demos/icon-browser/iconbrowserwin.c                |   5 +-
 demos/icon-browser/window.ui                       |  18 +-
 demos/node-editor/node-editor-window.ui            |   6 +-
 demos/widget-factory/widget-factory.c              |  20 ++-
 demos/widget-factory/widget-factory.ui             | 100 ++++++++---
 docs/tools/widgets.c                               |   8 +-
 examples/application10/prefs.ui                    |   5 +-
 examples/application6/prefs.ui                     |   5 +-
 examples/application7/prefs.ui                     |   5 +-
 examples/application8/prefs.ui                     |   5 +-
 examples/application9/prefs.ui                     |   5 +-
 gtk/gtkcustompaperunixdialog.c                     |   5 +-
 gtk/gtkmenusectionbox.c                            |   3 -
 gtk/gtkmodelbutton.c                               |   5 +-
 gtk/gtkplacessidebar.c                             |   5 +-
 gtk/gtkprintbackend.c                              |   5 +-
 gtk/gtkshortcutswindow.c                           |  13 +-
 gtk/gtktext.c                                      |   5 +-
 gtk/gtktextview.c                                  |   5 +-
 gtk/gtkwidget.c                                    |  58 -------
 gtk/inspector/actions.ui                           |   3 +-
 gtk/inspector/controllers.c                        |   5 +-
 gtk/inspector/css-editor.ui                        |   8 +-
 gtk/inspector/css-node-tree.ui                     |   3 +-
 gtk/inspector/data-list.ui                         |   8 +-
 gtk/inspector/general.c                            |   8 +-
 gtk/inspector/general.ui                           | 100 ++++++++---
 gtk/inspector/logs.ui                              |   5 +-
 gtk/inspector/magnifier.ui                         |   3 +-
 gtk/inspector/menu.ui                              |   3 +-
 gtk/inspector/misc-info.ui                         | 110 +++++++++---
 gtk/inspector/object-tree.ui                       |   3 +-
 gtk/inspector/prop-editor.c                        |   8 +-
 gtk/inspector/prop-list.ui                         |   3 +-
 gtk/inspector/recorder.c                           |  10 +-
 gtk/inspector/recorder.ui                          |   8 +-
 gtk/inspector/resource-list.ui                     |  14 +-
 gtk/inspector/size-groups.c                        |  15 +-
 gtk/inspector/statistics.ui                        |   3 +-
 gtk/inspector/type-info.c                          |  15 +-
 gtk/inspector/visual.ui                            | 105 +++++++++---
 gtk/inspector/window.ui                            |  25 ++-
 gtk/tools/gtk-builder-tool-simplify.c              |  41 ++++-
 gtk/ui/gtkaboutdialog.ui                           |  15 +-
 gtk/ui/gtkappchooserwidget.ui                      |   5 +-
 gtk/ui/gtkassistant.ui                             |   5 +-
 gtk/ui/gtkcolorchooserdialog.ui                    |  13 +-
 gtk/ui/gtkemojichooser.ui                          |   5 +-
 gtk/ui/gtkfilechooserdialog.ui                     |   8 +-
 gtk/ui/gtkfilechooserwidget.ui                     |  28 +++-
 gtk/ui/gtkfontchooserdialog.ui                     |   5 +-
 gtk/ui/gtkfontchooserwidget.ui                     |   5 +-
 gtk/ui/gtkpagesetupunixdialog.ui                   |  10 +-
 gtk/ui/gtkplacesview.ui                            |  10 +-
 gtk/ui/gtkprintunixdialog.ui                       |  35 +++-
 gtk/ui/gtkscalebutton.ui                           |   5 +-
 tests/gdkgears.c                                   |   6 +-
 tests/popover2.ui                                  |  15 +-
 tests/testadjustsize.c                             |   5 +-
 tests/testborderdrawing.c                          |   5 +-
 tests/testbox.c                                    |  15 +-
 tests/testdialog.c                                 |   5 +-
 tests/testdnd2.c                                   |   5 +-
 tests/testentryicons.c                             |  15 +-
 tests/testexpand.c                                 |  20 ++-
 tests/testfilechooserbutton.c                      |   5 +-
 tests/testframe.c                                  |   5 +-
 tests/testgtk.c                                    |  10 +-
 tests/testheaderbar.c                              |   5 +-
 tests/testheightforwidth.c                         |   5 +-
 tests/testlevelbar.c                               |   5 +-
 tests/testlist3.c                                  |   5 +-
 tests/testlogout.c                                 |   5 +-
 tests/testoutsetshadowdrawing.c                    |   5 +-
 tests/testoverlay.c                                |  47 +++++-
 tests/testpopover.c                                |   5 +-
 tests/testscrolledge.c                             |  10 +-
 tests/testselectionmode.c                          |   5 +-
 tests/testsplitheaders.ui                          |   5 +-
 tests/testtoolbar2.c                               |   6 +-
 testsuite/gtk/notify.c                             |  11 +-
 testsuite/tools/simplify-data-3to4/grid.expected   |  15 ++
 testsuite/tools/simplify-data-3to4/grid.ui         |   2 +
 .../simplify-data-3to4/office-runner.expected      |  18 +-
 .../tools/simplify-data-3to4/popover.expected      |   2 +-
 124 files changed, 1278 insertions(+), 396 deletions(-)
---