Change list widget to use a GtkSelectionModel

Change the type of the model property in GtkListView, GtkColumnView and GtkGridView to be GtkSelectionModel. The convenience of automatic interposition of a selection model is minor, compared to the confusion. Update all callers.
Merge branch 'matthiasc/for-master' into 'master'
2020-07-17 07:35:09 -04:00 · 2020-07-16 21:03:21 +00:00 · 2020-07-16 16:26:41 -04:00 · 2020-07-16 19:43:45 +00:00 · 2020-07-16 18:52:22 +00:00 · 2020-07-16 20:43:16 +02:00
309 changed files with 18965 additions and 16979 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,8 +19,8 @@ variables:
  COMMON_MESON_FLAGS: "--fatal-meson-warnings --werror"
  BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true -Dvulkan=yes"
  FEATURE_FLAGS: "-Dcloudproviders=true"
-  MESON_TEST_TIMEOUT_MULTIPLIER: 2
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v17"
+  MESON_TEST_TIMEOUT_MULTIPLIER: 3
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v20"
  FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"
  DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora-docs:v19"

@@ -180,6 +180,22 @@ static-scan:
      - _scan_build/meson-logs
  allow_failure: true

+# Run tests with the address sanitizer. We need to turn off introspection,
+# since it is incompatible with asan
+asan-build:
+  image: $FEDORA_IMAGE
+  tags: [ privileged ]
+  stage: analysis
+  variables:
+  script:
+    - CC=clang meson --buildtype=debugoptimized -Db_sanitize=address -Db_lundef=false -Dintrospection=false _build
+    - ninja -C _build
+    - .gitlab-ci/run-tests.sh _build wayland
+  artifacts:
+    paths:
+      - _build/meson-logs
+  allow_failure: true
+
 reference:
  image: $DOCS_IMAGE
  stage: docs
--- a/.gitlab-ci/.lock
+++ b/.gitlab-ci/.lock
--- a/.gitlab-ci/README.md
+++ b/.gitlab-ci/README.md
@@ -35,4 +35,13 @@ branch, as well as their available versions.
 - [ ] Add the new job to `.gitlab-ci.yml` referencing the image
 - [ ] Open a merge request with your changes and let it run

+### Checklist for Adding a new dependency to a CI image
+
+Our images are layered, and the base (called fedora-base) contains
+all the rpm payload. Therefore, adding a new dependency is a 2-step
+process:
+
+ 1. [ ] Build and upload fedora-base:$version+1
+ 1. [ ] Build and upload fedora:$version+1 based on fedora-base:version+1
+
 [registry]: https://gitlab.gnome.org/GNOME/gtk/container_registry
--- a/.gitlab-ci/fedora-base.Dockerfile
+++ b/.gitlab-ci/fedora-base.Dockerfile
@@ -41,12 +41,14 @@ RUN dnf -y install \
    itstool \
    json-glib-devel \
    lcov \
+    libasan \
    libattr-devel \
    libepoxy-devel \
    libffi-devel \
    libmount-devel \
    librsvg2 \
    libselinux-devel \
+    libubsan \
    libXcomposite-devel \
    libXcursor-devel \
    libXcursor-devel \
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v19
+FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v20

 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}
--- a/.gitlab-ci/run-tests.sh
+++ b/.gitlab-ci/run-tests.sh
@@ -7,10 +7,14 @@ srcdir=$( pwd )
 builddir=$1
 backend=$2

+# Ignore memory leaks lower in dependencies
+export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp
+
 case "${backend}" in
  x11)
    xvfb-run -a -s "-screen 0 1024x768x24" \
          meson test -C ${builddir} \
+                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
                --print-errorlogs \
                --setup=${backend} \
                --suite=gtk \
@@ -30,6 +34,7 @@ case "${backend}" in
    export WAYLAND_DISPLAY=wayland-5

    meson test -C ${builddir} \
+                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
                --print-errorlogs \
                --setup=${backend} \
                --suite=gtk \
@@ -48,6 +53,7 @@ case "${backend}" in
    export BROADWAY_DISPLAY=:5

    meson test -C ${builddir} \
+                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
                --print-errorlogs \
                --setup=${backend} \
                --suite=gtk \
--- a/77
+++ b/77
@@ -1,3 +1,80 @@
+Overview of Changes in GTK 3.99.0
+=================================
+
+* Add GtkEditableLabel
+
+* Add GtkBookmarkList, a list model for bookmarks
+
+* Add GtkStringList, a list model for strings
+
+* Add GtkBitset, and use it for representing selections
+
+* GtkTreeView:
+ - Make cell editing work again
+
+* GtkSpinButton:
+ - Make autosizing work again
+
+* Printing:
+ - Use GtkDropDown in the print dialog
+
+* GtkApplication
+ - Support opening files on OS X
+
+* GtkFileChooser:
+ - Fix libcloudproviders support
+ - Turn GtkFileFilter into a GtkFilter
+ - Simplify the api
+
+* GtkGridView, GtkListView:
+ - Improve scrolling behavior
+ - Autoscroll and autoexpand during DND
+
+* GtkScrolledWindow:
+ - Make autoscrolling work again
+
+* GtkFilterListModel:
+ - Add incremental filtering
+
+* GtkEntry:
+ - Make entry completion work again
+ - Drop action support from GtkEntryCompletion
+
+* Inspector:
+ - Improve list model support
+ - Add direct navigation between objects
+
+* GDK:
+ - Compress scroll events
+ - Keep a scroll history
+ - Clean up GdkDevice api
+ - Improve frame clock accuracy
+
+* GSK:
+ - Use GL_ARB_framebuffer_object
+
+* gtk-demo:
+ - Add incremental refill to the color grid
+ - Improve performance of the color grid
+ - Add an incrementally filtering word list
+ - Improve the sidebar
+
+* Install print-editor as another demo
+
+* Translation updates
+ Basque
+ Catalan
+ Chinese
+ Japanese
+ Kazakh
+ Lithuanian
+ Polish
+ Romanian
+ Spanish
+ Turkish
+ Ukrainian
+
+
 Overview of Changes in GTK 3.98.5
 =================================

--- a/build-aux/flatpak/org.gtk.WidgetFactory4.json
+++ b/build-aux/flatpak/org.gtk.WidgetFactory4.json
@@ -1,29 +1,38 @@
 {
-    "app-id": "org.gtk.WidgetFactory4",
-    "runtime": "org.gnome.Platform",
-    "runtime-version": "master",
-    "sdk": "org.gnome.Sdk",
-    "command": "gtk4-widget-factory",
-    "tags": ["devel", "development", "nightly"],
-    "desktop-file-name-prefix": "(Development) ",
-    "finish-args": [
+    "app-id" : "org.gtk.WidgetFactory4",
+    "runtime" : "org.gnome.Platform",
+    "runtime-version" : "master",
+    "sdk" : "org.gnome.Sdk",
+    "command" : "gtk4-widget-factory",
+    "tags" : [
+        "devel",
+        "development",
+        "nightly"
+    ],
+    "desktop-file-name-prefix" : "(Development) ",
+    "finish-args" : [
        "--device=dri",
        "--share=ipc",
        "--socket=fallback-x11",
        "--socket=wayland",
-        "--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*"
+        "--talk-name=org.gtk.vfs",
+        "--talk-name=org.gtk.vfs.*"
    ],
-    "cleanup": [
+    "cleanup" : [
        "/include",
-        "/lib/pkgconfig", "/share/pkgconfig",
+        "/lib/pkgconfig",
+        "/share/pkgconfig",
        "/share/aclocal",
-        "/man", "/share/man", "/share/gtk-doc",
-        "*.la", ".a",
+        "/man",
+        "/share/man",
+        "/share/gtk-doc",
+        "*.la",
+        ".a",
        "/lib/girepository-1.0",
        "/share/gir-1.0",
        "/share/doc"
    ],
-    "modules": [
+    "modules" : [
        {
            "name" : "wayland",
            "buildsystem" : "autotools",
@@ -39,18 +48,18 @@
            ]
        },
        {
-            "name": "graphene",
-            "buildsystem": "meson",
-            "builddir": true,
-            "config-opts": [
+            "name" : "graphene",
+            "buildsystem" : "meson",
+            "builddir" : true,
+            "config-opts" : [
                "--libdir=/app/lib",
                "-Dtests=false",
                "-Dbenchmarks=false"
            ],
-            "sources": [
+            "sources" : [
                {
-                    "type": "git",
-                    "url": "https://github.com/ebassi/graphene.git"
+                    "type" : "git",
+                    "url" : "https://github.com/ebassi/graphene.git"
                }
            ]
        },
@@ -58,7 +67,7 @@
            "name" : "libsass",
            "buildsystem" : "meson",
            "builddir" : true,
-            "config-opts": [
+            "config-opts" : [
                "--libdir=/app/lib"
            ],
            "sources" : [
@@ -73,7 +82,7 @@
            "name" : "sassc",
            "buildsystem" : "meson",
            "builddir" : true,
-            "config-opts": [
+            "config-opts" : [
                "--libdir=/app/lib"
            ],
            "sources" : [
@@ -85,18 +94,23 @@
            ]
        },
        {
-            "name": "gtk",
-            "buildsystem": "meson",
-            "builddir": true,
-            "config-opts": [
+            "name" : "gtk",
+            "buildsystem" : "meson",
+            "builddir" : true,
+            "config-opts" : [
                "--libdir=/app/lib"
            ],
-            "sources": [
+            "sources" : [
                {
-                    "type": "git",
-                    "url": "https://gitlab.gnome.org/GNOME/gtk.git"
+                    "type" : "git",
+                    "url" : "https://gitlab.gnome.org/GNOME/gtk.git"
                }
            ]
        }
-    ]
+    ],
+    "build-options" : {
+        "env" : {
+            "DBUS_SESSION_BUS_ADDRESS" : "''"
+        }
+    }
 }
--- a/build-aux/meson/post-install.py
+++ b/build-aux/meson/post-install.py
@@ -15,7 +15,13 @@ if 'DESTDIR' not in os.environ:
    gtk_immodule_dir = os.path.join(gtk_moduledir, 'immodules')

    print('Compiling GSettings schemas...')
-    subprocess.call(['glib-compile-schemas',
+    glib_compile_schemas = subprocess.check_output(['pkg-config',
+                                                   '--variable=glib_compile_schemas',
+                                                   'gio-2.0']).strip()
+    if not os.path.exists(glib_compile_schemas):
+        # pkg-config variables only available since GLib 2.62.0.
+        glib_compile_schemas = 'glib-compile-schemas'
+    subprocess.call([glib_compile_schemas,
                    os.path.join(gtk_datadir, 'glib-2.0', 'schemas')])

    print('Updating icon cache...')
@@ -24,8 +30,14 @@ if 'DESTDIR' not in os.environ:

    print('Updating module cache for print backends...')
    os.makedirs(gtk_printmodule_dir, exist_ok=True)
-    subprocess.call(['gio-querymodules', gtk_printmodule_dir])
+    gio_querymodules = subprocess.check_output(['pkg-config',
+                                                '--variable=gio_querymodules',
+                                                'gio-2.0']).strip()
+    if not os.path.exists(gio_querymodules):
+        # pkg-config variables only available since GLib 2.62.0.
+        gio_querymodules = 'gio-querymodules'
+    subprocess.call([gio_querymodules, gtk_printmodule_dir])

    print('Updating module cache for input methods...')
    os.makedirs(gtk_immodule_dir, exist_ok=True)
-    subprocess.call(['gio-querymodules', gtk_immodule_dir])
+    subprocess.call([gio_querymodules, gtk_immodule_dir])
--- a/demos/constraint-editor/constraint-editor-window.ui
+++ b/demos/constraint-editor/constraint-editor-window.ui
@@ -9,7 +9,6 @@
    <property name="default-height">768</property>
    <child type="titlebar">
      <object class="GtkHeaderBar" id="header">
-        <property name="show-title-buttons">1</property>
        <child type="start">
          <object class="GtkButton">
            <property name="icon-name">document-open-symbolic</property>
--- a/demos/constraint-editor/constraint-view.c
+++ b/demos/constraint-editor/constraint-view.c
@@ -188,7 +188,7 @@ constraint_view_init (ConstraintView *self)
  g_list_store_append (list, children);
  g_list_store_append (list, guides);
  g_list_store_append (list, constraints);
-  self->model = G_LIST_MODEL (gtk_flatten_list_model_new (G_TYPE_OBJECT, G_LIST_MODEL (list)));
+  self->model = G_LIST_MODEL (gtk_flatten_list_model_new (G_LIST_MODEL (list)));
  g_object_unref (children);
  g_object_unref (guides);
  g_object_unref (constraints);
--- a/demos/gtk-demo/demo.gresource.xml
+++ b/demos/gtk-demo/demo.gresource.xml
@@ -140,6 +140,7 @@
  </gresource>
  <gresource prefix="/listview_colors">
    <file compressed="true">color.names.txt</file>
+    <file>listview_colors.css</file>
  </gresource>
  <gresource prefix="/shortcuts">
    <file>shortcuts.ui</file>
--- a/demos/gtk-demo/dropdown.c
+++ b/demos/gtk-demo/dropdown.c
@@ -92,7 +92,7 @@ strings_setup_item_full (GtkSignalListItemFactory *factory,
  gtk_label_set_xalign (GTK_LABEL (title), 0.0);
  description = gtk_label_new ("");
  gtk_label_set_xalign (GTK_LABEL (description), 0.0);
-  gtk_style_context_add_class (gtk_widget_get_style_context (description), "dim-label");
+  gtk_widget_add_css_class (description, "dim-label");

  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
  box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
--- a/demos/gtk-demo/fishbowl.ui
+++ b/demos/gtk-demo/fishbowl.ui
@@ -6,7 +6,6 @@
    <property name="default-height">400</property>
    <child type="titlebar">
      <object class="GtkHeaderBar" id="">
-        <property name="show-title-buttons">1</property>
        <child>
          <object class="GtkBox">
            <style>
--- a/demos/gtk-demo/font-features.ui
+++ b/demos/gtk-demo/font-features.ui
@@ -7,7 +7,6 @@
    <property name="title">Font Explorer</property>
    <child type="titlebar">
      <object class="GtkHeaderBar">
-        <property name="show-title-buttons">1</property>
        <child>
          <object class="GtkButton" id="reset">
            <property name="receives-default">1</property>
--- a/demos/gtk-demo/headerbar.c
+++ b/demos/gtk-demo/headerbar.c
@@ -30,7 +30,6 @@ do_headerbar (GtkWidget *do_widget)
      gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);

      header = gtk_header_bar_new ();
-      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), TRUE);

      button = gtk_button_new ();
      icon = g_themed_icon_new ("mail-send-receive-symbolic");
--- a/demos/gtk-demo/iconscroll.ui
+++ b/demos/gtk-demo/iconscroll.ui
@@ -6,7 +6,6 @@
    <property name="default-height">500</property>
    <child type="titlebar">
      <object class="GtkHeaderBar">
-        <property name="show-title-buttons">1</property>
        <child>
          <object class="GtkBox">
            <style>
--- a/demos/gtk-demo/listview_applauncher.c
+++ b/demos/gtk-demo/listview_applauncher.c
@@ -144,6 +144,7 @@ do_listview_applauncher (GtkWidget *do_widget)
    {
      GtkWidget *list, *sw;
      GListModel *model;
+      GtkSelectionModel *selection;
      GtkListItemFactory *factory;

      /* Create a window and set a few defaults */
@@ -181,8 +182,10 @@ do_listview_applauncher (GtkWidget *do_widget)
       * to create as many listitems as it needs to show itself to the user.
       */
      model = create_application_list ();
-      gtk_list_view_set_model (GTK_LIST_VIEW (list), model);
+      selection = GTK_SELECTION_MODEL (gtk_single_selection_new (model));
+      gtk_list_view_set_model (GTK_LIST_VIEW (list), selection);
      g_object_unref (model);
+      g_object_unref (selection);

      /* List widgets should always be contained in a #GtkScrolledWindow,
       * because otherwise they might get too large or they might not
--- a/demos/gtk-demo/listview_clocks.c
+++ b/demos/gtk-demo/listview_clocks.c
@@ -491,7 +491,7 @@ do_listview_clocks (GtkWidget *do_widget)

      model = create_clocks_model ();
      selection = gtk_no_selection_new (model);
-      gtk_grid_view_set_model (GTK_GRID_VIEW (gridview), G_LIST_MODEL (selection));
+      gtk_grid_view_set_model (GTK_GRID_VIEW (gridview), GTK_SELECTION_MODEL (selection));
      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), gridview);
      g_object_unref (selection);
      g_object_unref (model);
--- a/demos/gtk-demo/listview_colors.c
+++ b/demos/gtk-demo/listview_colors.c
@@ -627,6 +627,23 @@ setup_listitem_cb (GtkListItemFactory *factory,
  gtk_expression_unref (color_expression);
 }

+static void
+setup_selection_listitem_cb (GtkListItemFactory *factory,
+                             GtkListItem        *list_item)
+{
+  GtkWidget *picture;
+  GtkExpression *color_expression, *expression;
+
+  expression = gtk_constant_expression_new (GTK_TYPE_LIST_ITEM, list_item);
+  color_expression = gtk_property_expression_new (GTK_TYPE_LIST_ITEM, expression, "item");
+
+  picture = gtk_picture_new ();
+  gtk_widget_set_size_request (picture, 8, 8);
+  gtk_expression_bind (color_expression, picture, "paintable", NULL);
+
+  gtk_list_item_set_child (list_item, picture);
+}
+
 static void
 set_title (gpointer    item,
           const char *title)
@@ -645,7 +662,8 @@ create_color_grid (void)
 {
  GtkWidget *gridview;
  GtkListItemFactory *factory;
-  GListModel *model, *selection;
+  GListModel *model;
+  GtkSelectionModel *selection;

  gridview = gtk_grid_view_new ();
  gtk_scrollable_set_hscroll_policy (GTK_SCROLLABLE (gridview), GTK_SCROLL_NATURAL);
@@ -661,7 +679,7 @@ create_color_grid (void)

  model = G_LIST_MODEL (gtk_sort_list_model_new (gtk_color_list_new (0), NULL));

-  selection = G_LIST_MODEL (gtk_multi_selection_new (model));
+  selection = GTK_SELECTION_MODEL (gtk_multi_selection_new (model));
  gtk_grid_view_set_model (GTK_GRID_VIEW (gridview), selection);
  g_object_unref (selection);
  g_object_unref (model);
@@ -777,6 +795,47 @@ bind_number_item (GtkSignalListItemFactory *factory,
  g_free (string);
 }

+static void
+update_selection_count (GListModel *model,
+                        guint       position,
+                        guint       removed,
+                        guint       added,
+                        gpointer    data)
+{
+  char *text;
+  text = g_strdup_printf ("%u", g_list_model_get_n_items (model));
+  gtk_label_set_label (GTK_LABEL (data), text);
+  g_free (text);
+}
+
+static void
+update_selection_average (GListModel *model,
+                          guint       position,
+                          guint       removed,
+                          guint       added,
+                          gpointer    data)
+{
+  guint n = g_list_model_get_n_items (model);
+  GdkRGBA c = { 0, 0, 0, 1 };
+  guint i;
+  GtkColor *color;
+
+  for (i = 0; i < n; i++)
+    {
+      color = g_list_model_get_item (model, i);
+
+      c.red += color->color.red;
+      c.green += color->color.green;
+      c.blue += color->color.blue;
+
+      g_object_unref (color);
+    }
+
+  color = gtk_color_new ("", c.red / n, c.green / n, c.blue / n);
+  gtk_picture_set_paintable (GTK_PICTURE (data), GDK_PAINTABLE (color));
+  g_object_unref (color);
+}
+
 static GtkWidget *window = NULL;

 GtkWidget *
@@ -797,11 +856,26 @@ do_listview_colors (GtkWidget *do_widget)
      PangoAttrList *attrs;
      char *string;
      guint len;
+      GtkWidget *selection_view;
+      GListModel *selection_filter;
+      GtkSelectionModel *selection;
+      GtkWidget *grid;
+      GtkWidget *selection_size_label;
+      GtkWidget *selection_average_picture;
+      GtkWidget *selection_info_toggle;
+      GtkWidget *selection_info_revealer;
+      GtkCssProvider *provider;
+
+      provider = gtk_css_provider_new ();
+      gtk_css_provider_load_from_resource (provider, "/listview_colors/listview_colors.css");
+      gtk_style_context_add_provider_for_display (gdk_display_get_default (),
+                                                  GTK_STYLE_PROVIDER (provider),
+                                                  800);
+      g_object_unref (provider);

      window = gtk_window_new ();
      gtk_window_set_title (GTK_WINDOW (window), "Colors");
      header = gtk_header_bar_new ();
-      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), TRUE);
      gtk_window_set_titlebar (GTK_WINDOW (window), header);

      gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
@@ -809,13 +883,85 @@ do_listview_colors (GtkWidget *do_widget)
                              gtk_widget_get_display (do_widget));
      g_object_add_weak_pointer (G_OBJECT (window), (gpointer*)&window);

+      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+      gtk_window_set_child (GTK_WINDOW (window), box);
+
+      selection_info_revealer = gtk_revealer_new ();
+      gtk_box_append (GTK_BOX (box), selection_info_revealer);
+
+      grid = gtk_grid_new ();
+      gtk_revealer_set_child (GTK_REVEALER (selection_info_revealer), grid);
+      gtk_widget_set_margin_start (grid, 10);
+      gtk_widget_set_margin_end (grid, 10);
+      gtk_widget_set_margin_top (grid, 10);
+      gtk_widget_set_margin_bottom (grid, 10);
+      gtk_grid_set_row_spacing (GTK_GRID (grid), 10);
+      gtk_grid_set_column_spacing (GTK_GRID (grid), 10);
+
+      label = gtk_label_new ("Selection");
+      gtk_widget_set_hexpand (label, TRUE);
+      gtk_widget_add_css_class (label, "title-3");
+      gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 5, 1);
+
+      gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Size:"), 0, 2, 1, 1);
+
+      selection_size_label = gtk_label_new ("0");
+      gtk_grid_attach (GTK_GRID (grid), selection_size_label, 1, 2, 1, 1);
+
+      gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Average:"), 2, 2, 1, 1);
+
+      selection_average_picture = gtk_picture_new ();
+      gtk_widget_set_size_request (selection_average_picture, 32, 32);
+      gtk_grid_attach (GTK_GRID (grid), selection_average_picture, 3, 2, 1, 1);
+
+      label = gtk_label_new ("");
+      gtk_widget_set_hexpand (label, TRUE);
+      gtk_grid_attach (GTK_GRID (grid), label, 4, 2, 1, 1);
+
      sw = gtk_scrolled_window_new ();
-      gtk_window_set_child (GTK_WINDOW (window), sw);
+      gtk_widget_set_hexpand (sw, TRUE);
+
+      gtk_grid_attach (GTK_GRID (grid), sw, 0, 1, 5, 1);
+      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
+                                      GTK_POLICY_NEVER,
+                                      GTK_POLICY_AUTOMATIC);
+
+      factory = gtk_signal_list_item_factory_new ();
+      g_signal_connect (factory, "setup", G_CALLBACK (setup_selection_listitem_cb), NULL);
+      selection_view = gtk_grid_view_new_with_factory (factory);
+      gtk_widget_add_css_class (selection_view, "compact");
+      gtk_grid_view_set_max_columns (GTK_GRID_VIEW (selection_view), 200);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), selection_view);
+
+      sw = gtk_scrolled_window_new ();
+      gtk_box_append (GTK_BOX (box), sw);

      gridview = create_color_grid ();
      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), gridview);
+      gtk_widget_set_hexpand (sw, TRUE);
+      gtk_widget_set_vexpand (sw, TRUE);
      model = gtk_grid_view_get_model (GTK_GRID_VIEW (gridview));
-      g_object_get (model, "model", &model, NULL);
+
+      selection_filter = G_LIST_MODEL (gtk_selection_filter_model_new (GTK_SELECTION_MODEL (model)));
+      g_signal_connect (selection_filter, "items-changed", G_CALLBACK (update_selection_count), selection_size_label);
+      g_signal_connect (selection_filter, "items-changed", G_CALLBACK (update_selection_average), selection_average_picture);
+
+      selection = GTK_SELECTION_MODEL (gtk_no_selection_new (selection_filter));
+      gtk_grid_view_set_model (GTK_GRID_VIEW (selection_view), selection);
+      g_object_unref (selection_filter);
+      g_object_unref (selection);
+
+      model = gtk_multi_selection_get_model (GTK_MULTI_SELECTION (model));
+      g_object_ref (model);
+
+      selection_info_toggle = gtk_toggle_button_new ();
+      gtk_button_set_icon_name (GTK_BUTTON (selection_info_toggle), "emblem-important-symbolic");
+      gtk_widget_set_tooltip_text (selection_info_toggle, "Show selection info");
+      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), selection_info_toggle);
+
+      g_object_bind_property (selection_info_toggle, "active",
+                              selection_info_revealer, "reveal-child",
+                              G_BINDING_DEFAULT);

      button = gtk_button_new_with_mnemonic ("_Refill");
      g_signal_connect (button, "clicked",
--- a/demos/gtk-demo/listview_colors.css
+++ b/demos/gtk-demo/listview_colors.css
@@ -0,0 +1,3 @@
+.view.compact > child {
+  padding: 1px;
+}
--- a/demos/gtk-demo/listview_filebrowser.css
+++ b/demos/gtk-demo/listview_filebrowser.css
@@ -1,11 +1,11 @@
-list.viewswitcher {
+listview.viewswitcher {
  border: 1px solid gray;
 }

-list.viewswitcher > row {
+listview.viewswitcher > row {
  padding: 5px;
 }

-list.viewswitcher row:selected {
+listview.viewswitcher row:selected {
  background: gray;
 }
--- a/demos/gtk-demo/listview_filebrowser.ui
+++ b/demos/gtk-demo/listview_filebrowser.ui
@@ -174,7 +174,6 @@
    <property name="default-height">400</property>
    <child type="titlebar">
      <object class="GtkHeaderBar" id="">
-        <property name="show-title-buttons">1</property>
        <child>
          <object class="GtkButton">
            <property name="icon-name">go-up-symbolic</property>
--- a/demos/gtk-demo/listview_minesweeper.ui
+++ b/demos/gtk-demo/listview_minesweeper.ui
@@ -6,7 +6,6 @@
    <property name="title" translatable="yes">Minesweeper</property>
    <child type="titlebar">
      <object class="GtkHeaderBar" id="">
-        <property name="show-title-buttons">1</property>
        <child>
          <object class="GtkButton">
            <property name="label">New Game</property>
--- a/demos/gtk-demo/listview_settings.c
+++ b/demos/gtk-demo/listview_settings.c
@@ -215,7 +215,6 @@ transform_settings_to_keys (GBinding     *binding,
  GtkFilterListModel *filter_model;
  GtkFilter *filter;
  GtkNoSelection *selection_model;
-  GtkExpression *expression;
  char **keys;
  guint i;

@@ -246,11 +245,8 @@ transform_settings_to_keys (GBinding     *binding,
                                        gtk_column_view_get_sorter (GTK_COLUMN_VIEW (data)));
  g_object_unref (store);

-  expression = gtk_property_expression_new (SETTINGS_TYPE_KEY, NULL, "name");
-  filter = gtk_string_filter_new ();
-  gtk_string_filter_set_expression (GTK_STRING_FILTER (filter), expression);
+  filter = gtk_string_filter_new (gtk_property_expression_new (SETTINGS_TYPE_KEY, NULL, "name"));
  filter_model = gtk_filter_list_model_new (G_LIST_MODEL (sort_model), filter);
-  gtk_expression_unref (expression);
  g_object_unref (sort_model);

  g_set_object (&current_filter, filter);
@@ -349,7 +345,7 @@ do_listview_settings (GtkWidget *do_widget)
      GtkWidget *listview, *columnview;
      GListModel *model;
      GtkTreeListModel *treemodel;
-      GtkSingleSelection *selection;
+      GtkSelectionModel *selection;
      GtkBuilderScope *scope;
      GtkBuilder *builder;
      GtkColumnViewColumn *name_column;
@@ -413,14 +409,14 @@ do_listview_settings (GtkWidget *do_widget)
                                           create_settings_model,
                                           NULL,
                                           NULL);
-      selection = gtk_single_selection_new (G_LIST_MODEL (treemodel));
+      selection = GTK_SELECTION_MODEL (gtk_single_selection_new (G_LIST_MODEL (treemodel)));
      g_object_bind_property_full (selection, "selected-item",
                                   columnview, "model",
                                   G_BINDING_SYNC_CREATE,
                                   transform_settings_to_keys,
                                   NULL,
                                   columnview, NULL);
-      gtk_list_view_set_model (GTK_LIST_VIEW (listview), G_LIST_MODEL (selection));
+      gtk_list_view_set_model (GTK_LIST_VIEW (listview), selection);
      g_object_unref (selection);
      g_object_unref (treemodel);
      g_object_unref (model);
--- a/demos/gtk-demo/listview_settings.ui
+++ b/demos/gtk-demo/listview_settings.ui
@@ -6,7 +6,6 @@
    <property name="default-height">480</property>
    <child type="titlebar">
      <object class="GtkHeaderBar">
-        <property name="show-title-buttons">1</property>
        <child type="end">
          <object class="GtkToggleButton" id="search_button">
            <property name="icon-name">system-search-symbolic</property>
--- a/demos/gtk-demo/listview_weather.c
+++ b/demos/gtk-demo/listview_weather.c
@@ -194,8 +194,8 @@ create_weather_model (void)
 }

 static void
-setup_widget (GtkListItem *list_item,
-              gpointer     unused)
+setup_widget (GtkSignalListItemFactory *factory,
+              GtkListItem              *list_item)
 {
  GtkWidget *box, *child;

@@ -218,8 +218,8 @@ setup_widget (GtkListItem *list_item,
 }

 static void
-bind_widget (GtkListItem *list_item,
-             gpointer     unused)
+bind_widget (GtkSignalListItemFactory *factory,
+             GtkListItem              *list_item)
 {
  GtkWidget *box, *child;
  GtkWeatherInfo *info;
@@ -281,16 +281,18 @@ GtkWidget *
 create_weather_view (void)
 {
  GtkWidget *listview;
-  GListModel *model, *selection;
+  GListModel *model;
+  GtkSelectionModel *selection;
+  GtkListItemFactory *factory;

-  listview = gtk_list_view_new_with_factory (
-  gtk_functions_list_item_factory_new (setup_widget,
-                                       bind_widget,
-                                       NULL, NULL));
+  factory = gtk_signal_list_item_factory_new ();
+  g_signal_connect (factory, "setup", G_CALLBACK (setup_widget), NULL);
+  g_signal_connect (factory, "bind", G_CALLBACK (bind_widget), NULL);
+  listview = gtk_list_view_new_with_factory (factory);
  gtk_orientable_set_orientation (GTK_ORIENTABLE (listview), GTK_ORIENTATION_HORIZONTAL);
  gtk_list_view_set_show_separators (GTK_LIST_VIEW (listview), TRUE);
  model = create_weather_model ();
-  selection = G_LIST_MODEL (gtk_no_selection_new (model));
+  selection = GTK_SELECTION_MODEL (gtk_no_selection_new (model));
  gtk_list_view_set_model (GTK_LIST_VIEW (listview), selection);
  g_object_unref (selection);
  g_object_unref (model);
--- a/demos/gtk-demo/listview_words.c
+++ b/demos/gtk-demo/listview_words.c
@@ -157,10 +157,9 @@ do_listview_words (GtkWidget *do_widget)
    {
      GtkWidget *header, *listview, *sw, *vbox, *search_entry, *open_button, *overlay;
      GtkFilterListModel *filter_model;
-      GtkNoSelection *selection;
+      GtkSelectionModel *selection;
      GtkStringList *stringlist;
      GtkFilter *filter;
-      GtkExpression *expression;
      GFile *file;

      file = g_file_new_for_path ("/usr/share/dict/words");
@@ -177,10 +176,7 @@ do_listview_words (GtkWidget *do_widget)
          g_strfreev (words);
        }

-      filter = gtk_string_filter_new ();
-      expression = gtk_property_expression_new (GTK_TYPE_STRING_OBJECT, NULL, "string");
-      gtk_string_filter_set_expression (GTK_STRING_FILTER (filter), expression);
-      gtk_expression_unref (expression);
+      filter = gtk_string_filter_new (gtk_property_expression_new (GTK_TYPE_STRING_OBJECT, NULL, "string"));
      filter_model = gtk_filter_list_model_new (G_LIST_MODEL (stringlist), filter);
      gtk_filter_list_model_set_incremental (filter_model, TRUE);

@@ -215,14 +211,15 @@ do_listview_words (GtkWidget *do_widget)
      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), progress);

      sw = gtk_scrolled_window_new ();
+      gtk_widget_set_vexpand (sw, TRUE);
      gtk_overlay_set_child (GTK_OVERLAY (overlay), sw);

      listview = gtk_list_view_new_with_factory (
          gtk_builder_list_item_factory_new_from_bytes (NULL,
              g_bytes_new_static (factory_text, strlen (factory_text))));
      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), listview);
-      selection = gtk_no_selection_new (G_LIST_MODEL (filter_model));
-      gtk_list_view_set_model (GTK_LIST_VIEW (listview), G_LIST_MODEL (selection));
+      selection = GTK_SELECTION_MODEL (gtk_no_selection_new (G_LIST_MODEL (filter_model)));
+      gtk_list_view_set_model (GTK_LIST_VIEW (listview), selection);
      g_object_unref (selection);

      g_signal_connect (filter_model, "items-changed", G_CALLBACK (update_title_cb), progress);
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -16,8 +16,9 @@ static GtkWidget *source_view;
 static gchar *current_file = NULL;

 static GtkWidget *notebook;
-static GtkSingleSelection *selection;
+static GtkSelectionModel *selection;
 static GtkWidget *toplevel;
+static char **search_needle;

 typedef struct _GtkDemo GtkDemo;
 struct _GtkDemo
@@ -219,7 +220,7 @@ activate_run (GSimpleAction *action,
              GVariant      *parameter,
              gpointer       window)
 {
-  GtkTreeListRow *row = gtk_single_selection_get_selected_item (selection);
+  GtkTreeListRow *row = gtk_single_selection_get_selected_item (GTK_SINGLE_SELECTION (selection));
  GtkDemo *demo = gtk_tree_list_row_get_item (row);

  gtk_demo_run (demo, window);
@@ -931,7 +932,7 @@ activate_cb (GtkWidget *widget,
             guint      position,
             gpointer   window)
 {
-  GtkTreeListRow *row = g_list_model_get_item (gtk_list_view_get_model (GTK_LIST_VIEW (widget)), position);
+  GtkTreeListRow *row = g_list_model_get_item (G_LIST_MODEL (gtk_list_view_get_model (GTK_LIST_VIEW (widget))), position);
  GtkDemo *demo = gtk_tree_list_row_get_item (row);

  gtk_demo_run (demo, window);
@@ -945,7 +946,18 @@ selection_cb (GtkSingleSelection *sel,
              gpointer            user_data)
 {
  GtkTreeListRow *row = gtk_single_selection_get_selected_item (sel);
-  GtkDemo *demo = gtk_tree_list_row_get_item (row);
+  GtkDemo *demo;
+
+  gtk_widget_set_sensitive (GTK_WIDGET (notebook), !!row);
+
+  if (!row)
+    {
+      gtk_window_set_title (GTK_WINDOW (toplevel), "No match");
+
+      return;
+    }
+
+  demo = gtk_tree_list_row_get_item (row);

  if (demo->filename)
    load_file (demo->name, demo->filename);
@@ -953,6 +965,84 @@ selection_cb (GtkSingleSelection *sel,
  gtk_window_set_title (GTK_WINDOW (toplevel), demo->title);
 }

+static gboolean
+filter_demo (GtkDemo *demo)
+{
+  int i;
+
+  /* Show only if the name maches every needle */
+  for (i = 0; search_needle[i]; i++)
+    {
+      if (!demo->title)
+        return FALSE;
+
+      if (g_str_match_string (search_needle[i], demo->title, TRUE))
+        continue;
+
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+static gboolean
+demo_filter_by_name (GtkTreeListRow     *row,
+                     GtkFilterListModel *model)
+{
+  GListModel *children;
+  GtkDemo *demo;
+  guint i, n;
+
+  /* Show all items if search is empty */
+  if (!search_needle || !search_needle[0] || !*search_needle[0])
+    return TRUE;
+
+  g_assert (GTK_IS_TREE_LIST_ROW (row));
+  g_assert (GTK_IS_FILTER_LIST_MODEL (model));
+
+  children = gtk_tree_list_row_get_children (row);
+  if (children)
+    {
+      n = g_list_model_get_n_items (children);
+      for (i = 0; i < n; i++)
+        {
+          demo = g_list_model_get_item (children, i);
+          g_assert (GTK_IS_DEMO (demo));
+
+          if (filter_demo (demo))
+            {
+              g_object_unref (demo);
+              return TRUE;
+            }
+          g_object_unref (demo);
+        }
+    }
+
+  demo = gtk_tree_list_row_get_item (row);
+  g_assert (GTK_IS_DEMO (demo));
+
+  return filter_demo (demo);
+}
+
+static void
+demo_search_changed_cb (GtkSearchEntry *entry,
+                        GtkFilter      *filter)
+{
+  const char *text;
+
+  g_assert (GTK_IS_SEARCH_ENTRY (entry));
+  g_assert (GTK_IS_FILTER (filter));
+
+  text = gtk_editable_get_text (GTK_EDITABLE (entry));
+
+  g_clear_pointer (&search_needle, g_strfreev);
+
+  if (text && *text)
+    search_needle = g_strsplit (text, " ", 0);
+
+  gtk_filter_changed (filter, GTK_FILTER_CHANGE_DIFFERENT);
+}
+
 static GListModel *
 create_demo_model (void)
 {
@@ -1007,13 +1097,25 @@ get_child_model (gpointer item,
  return NULL;
 }

+static void
+clear_search (GtkSearchBar *bar)
+{
+  if (!gtk_search_bar_get_search_mode (bar))
+    {
+      GtkWidget *entry = gtk_search_bar_get_child (GTK_SEARCH_BAR (bar));
+      gtk_editable_set_text (GTK_EDITABLE (entry), "");
+    }
+}
+
 static void
 activate (GApplication *app)
 {
  GtkBuilder *builder;
  GListModel *listmodel;
  GtkTreeListModel *treemodel;
-  GtkWidget *window, *listview;
+  GtkWidget *window, *listview, *search_entry, *search_bar;
+  GtkFilterListModel *filter_model;
+  GtkFilter *filter;

  static GActionEntry win_entries[] = {
    { "run", activate_run, NULL, NULL, NULL }
@@ -1034,6 +1136,8 @@ activate (GApplication *app)
  toplevel = GTK_WIDGET (window);
  listview = GTK_WIDGET (gtk_builder_get_object (builder, "listview"));
  g_signal_connect (listview, "activate", G_CALLBACK (activate_cb), window);
+  search_bar = GTK_WIDGET (gtk_builder_get_object (builder, "searchbar"));
+  g_signal_connect (search_bar, "notify::search-mode-enabled", G_CALLBACK (clear_search), NULL);

  listmodel = create_demo_model ();
  treemodel = gtk_tree_list_model_new (FALSE,
@@ -1042,11 +1146,17 @@ activate (GApplication *app)
                                       get_child_model,
                                       NULL,
                                       NULL);
-  selection = gtk_single_selection_new (G_LIST_MODEL (treemodel));
-  g_signal_connect (selection, "notify::selected-item", G_CALLBACK (selection_cb), NULL);
-  gtk_list_view_set_model (GTK_LIST_VIEW (listview), G_LIST_MODEL (selection));
+  filter_model = gtk_filter_list_model_new (G_LIST_MODEL (treemodel), NULL);
+  filter = gtk_custom_filter_new ((GtkCustomFilterFunc)demo_filter_by_name, filter_model, NULL);
+  gtk_filter_list_model_set_filter (filter_model, filter);
+  search_entry = GTK_WIDGET (gtk_builder_get_object (builder, "search-entry"));
+  g_signal_connect (search_entry, "search-changed", G_CALLBACK (demo_search_changed_cb), filter);

-  selection_cb (selection, NULL, NULL);
+  selection = GTK_SELECTION_MODEL (gtk_single_selection_new (G_LIST_MODEL (filter_model)));
+  g_signal_connect (selection, "notify::selected-item", G_CALLBACK (selection_cb), NULL);
+  gtk_list_view_set_model (GTK_LIST_VIEW (listview), selection);
+
+  selection_cb (GTK_SINGLE_SELECTION (selection), NULL, NULL);

  g_object_unref (builder);
 }
@@ -1139,7 +1249,6 @@ out:
      demo = (func) (window);

      gtk_window_set_transient_for (GTK_WINDOW (demo), GTK_WINDOW (window));
-      gtk_window_set_modal (GTK_WINDOW (demo), TRUE);

      g_signal_connect_swapped (G_OBJECT (demo), "destroy", G_CALLBACK (g_application_quit), app);
    }
--- a/demos/gtk-demo/main.ui
+++ b/demos/gtk-demo/main.ui
@@ -24,7 +24,6 @@
    <property name="default-height">600</property>
    <child type="titlebar">
      <object class="GtkHeaderBar" id="headerbar">
-        <property name="show-title-buttons">1</property>
        <child>
          <object class="GtkButton">
            <property name="valign">center</property>
@@ -56,12 +55,29 @@
            <property name="hscrollbar-policy">never</property>
            <property name="min-content-width">150</property>
            <child>
-              <object class="GtkListView" id="listview">
-                <property name="factory">
-                  <object class="GtkBuilderListItemFactory">
-                    <property name="resource">/ui/main-listitem.ui</property>
+              <object class="GtkBox">
+                <property name="width-request">220</property>
+                <property name="orientation">vertical</property>
+
+                <child>
+                  <object class="GtkSearchBar" id="searchbar">
+                    <property name="key-capture-widget">window</property>
+                    <child>
+                      <object class="GtkSearchEntry" id="search-entry"/>
+                    </child>
                  </object>
-                </property>
+                </child>
+
+                <child>
+                  <object class="GtkListView" id="listview">
+                    <property name="factory">
+                      <object class="GtkBuilderListItemFactory">
+                        <property name="resource">/ui/main-listitem.ui</property>
+                      </object>
+                    </property>
+                  </object>
+                </child>
+
              </object>
            </child>
          </object>
--- a/demos/gtk-demo/markup.c
+++ b/demos/gtk-demo/markup.c
@@ -69,7 +69,6 @@ do_markup (GtkWidget *do_widget)
      g_signal_connect (show_source, "toggled", G_CALLBACK (source_toggled), stack);

      header = gtk_header_bar_new ();
-      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), TRUE);
      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), show_source);
      gtk_window_set_titlebar (GTK_WINDOW (window), header);

--- a/demos/gtk-demo/modelbutton.ui
+++ b/demos/gtk-demo/modelbutton.ui
@@ -4,9 +4,7 @@
    <property name="title" translatable="yes">Model Button</property>
    <property name="resizable">0</property>
    <child type="titlebar">
-      <object class="GtkHeaderBar">
-        <property name="show-title-buttons">1</property>
-      </object>
+      <object class="GtkHeaderBar"/>
    </child>
    <child>
      <object class="GtkBox">
--- a/demos/gtk-demo/paint.c
+++ b/demos/gtk-demo/paint.c
@@ -392,7 +392,6 @@ do_paint (GtkWidget *toplevel)
      gtk_window_set_child (GTK_WINDOW (window), draw_area);

      headerbar = gtk_header_bar_new ();
-      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (headerbar), TRUE);

      colorbutton = gtk_color_button_new ();
      g_signal_connect (colorbutton, "color-set",
--- a/demos/gtk-demo/peg_solitaire.c
+++ b/demos/gtk-demo/peg_solitaire.c
@@ -276,7 +276,6 @@ do_peg_solitaire (GtkWidget *do_widget)
      g_signal_connect (restart, "clicked", G_CALLBACK (restart), NULL);

      header = gtk_header_bar_new ();
-      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), TRUE);
      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), restart);
      window = gtk_window_new ();
      gtk_window_set_display (GTK_WINDOW (window),
--- a/demos/gtk-demo/sidebar.c
+++ b/demos/gtk-demo/sidebar.c
@@ -40,7 +40,6 @@ do_sidebar (GtkWidget *do_widget)
      gtk_widget_set_size_request (window, 500, 350);

      header = gtk_header_bar_new ();
-      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR(header), TRUE);
      gtk_window_set_titlebar (GTK_WINDOW(window), header);
      gtk_window_set_title (GTK_WINDOW(window), "Stack Sidebar");
      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
--- a/demos/gtk-demo/sliding_puzzle.c
+++ b/demos/gtk-demo/sliding_puzzle.c
@@ -470,7 +470,6 @@ do_sliding_puzzle (GtkWidget *do_widget)
      g_signal_connect (restart, "clicked", G_CALLBACK (reshuffle), NULL);

      header = gtk_header_bar_new ();
-      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), TRUE);
      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), restart);
      gtk_header_bar_pack_end (GTK_HEADER_BAR (header), tweak);
      window = gtk_window_new ();
--- a/demos/gtk-demo/themes.ui
+++ b/demos/gtk-demo/themes.ui
@@ -4,7 +4,6 @@
    <property name="resizable">0</property>
    <child type="titlebar">
      <object class="GtkHeaderBar" id="header">
-        <property name="show-title-buttons">1</property>
        <child type="start">
          <object class="GtkToggleButton" id="toggle">
            <property name="label">Cycle</property>
--- a/demos/gtk-demo/video_player.c
+++ b/demos/gtk-demo/video_player.c
@@ -73,7 +73,6 @@ do_video_player (GtkWidget *do_widget)
      gtk_window_set_child (GTK_WINDOW (window), video);

      title = gtk_header_bar_new ();
-      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (title), TRUE);
      gtk_window_set_titlebar (GTK_WINDOW (window), title);

      open_button = gtk_button_new_with_mnemonic ("_Open");
--- a/demos/icon-browser/window.ui
+++ b/demos/icon-browser/window.ui
@@ -21,7 +21,6 @@
    <property name="default-height">768</property>
    <child type="titlebar">
      <object class="GtkHeaderBar" id="header">
-        <property name="show-title-buttons">1</property>
        <child type="title">
          <object class="GtkBox">
            <style>
--- a/demos/node-editor/data/scalable/apps/org.gtk.gtk4.NodeEditor.Devel.svg
+++ b/demos/node-editor/data/scalable/apps/org.gtk.gtk4.NodeEditor.Devel.svg
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="128px" viewBox="0 0 128 128" width="128px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <linearGradient id="a" gradientUnits="userSpaceOnUse" x1="43.000351" x2="85.000351" y1="39.000164" y2="39.000164">
+        <stop offset="0" stop-color="#26a269"/>
+        <stop offset="0.0934161" stop-color="#84e3b7"/>
+        <stop offset="0.330831" stop-color="#26a269"/>
+        <stop offset="0.686952" stop-color="#26a269"/>
+        <stop offset="0.89736" stop-color="#175e3c"/>
+        <stop offset="1" stop-color="#26a269"/>
+    </linearGradient>
+    <linearGradient id="b" gradientUnits="userSpaceOnUse">
+        <stop offset="0" stop-color="#c0bfbc"/>
+        <stop offset="0.154754" stop-color="#ffffff"/>
+        <stop offset="0.433722" stop-color="#bdbbb5"/>
+        <stop offset="0.650505" stop-color="#c1c0ba"/>
+        <stop offset="0.825253" stop-color="#ffffff"/>
+        <stop offset="1" stop-color="#c0bfbc"/>
+    </linearGradient>
+    <linearGradient id="c" gradientTransform="matrix(0.0811899 -0.046875 0.069079 0.119648 307.03142 127.069456)" x1="-1710.210571" x2="-1774.45166" xlink:href="#b" y1="-1202.376709" y2="-1202.376709"/>
+    <linearGradient id="d" gradientTransform="matrix(-0.0811899 -0.046875 -0.069079 0.119648 -177.242852 127.069447)" x1="-1710.210571" x2="-1774.45166" xlink:href="#b" y1="-1202.376709" y2="-1202.376709"/>
+    <linearGradient id="e" gradientUnits="userSpaceOnUse" x1="14" x2="56" y1="94.999964" y2="94.999964">
+        <stop offset="0" stop-color="#813d9c"/>
+        <stop offset="0.109119" stop-color="#b378ca"/>
+        <stop offset="0.241583" stop-color="#813d9c"/>
+        <stop offset="0.731841" stop-color="#813d9c"/>
+        <stop offset="0.872163" stop-color="#4d255d"/>
+        <stop offset="1" stop-color="#813d9c"/>
+    </linearGradient>
+    <linearGradient id="f" gradientUnits="userSpaceOnUse" x1="72" x2="114" y1="94.999964" y2="94.999964">
+        <stop offset="0" stop-color="#e66100"/>
+        <stop offset="0.0678478" stop-color="#ff903e"/>
+        <stop offset="0.168852" stop-color="#e66100"/>
+        <stop offset="0.886626" stop-color="#e66100"/>
+        <stop offset="1" stop-color="#9d4200"/>
+    </linearGradient>
+    <clipPath id="g">
+        <rect height="128" width="128"/>
+    </clipPath>
+    <clipPath id="h">
+        <rect height="128" width="128"/>
+    </clipPath>
+    <filter id="i" height="100%" width="100%" x="0%" y="0%">
+        <feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+    </filter>
+    <mask id="j">
+        <g clip-path="url(#h)" filter="url(#i)">
+            <g clip-path="url(#g)">
+                <path d="m 51 18 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="url(#a)"/>
+                <path d="m 51 12 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#57e389"/>
+                <path d="m 76.976562 55.453125 c 1.480469 -0.855469 3.371094 -0.347656 4.226563 1.132813 l 6.742187 11.679687 c 0.855469 1.480469 0.347657 3.371094 -1.132812 4.226563 c -1.480469 0.851562 -3.371094 0.347656 -4.226562 -1.132813 l -6.742188 -11.679687 c -0.855469 -1.480469 -0.347656 -3.371094 1.132812 -4.226563 z m 0 0" fill="url(#c)"/>
+                <path d="m 52.8125 55.453125 c -1.480469 -0.855469 -3.371094 -0.347656 -4.226562 1.132813 l -6.742188 11.679687 c -0.855469 1.480469 -0.347656 3.371094 1.132812 4.226563 c 1.480469 0.851562 3.371094 0.347656 4.226563 -1.132813 l 6.742187 -11.679687 c 0.855469 -1.480469 0.347657 -3.371094 -1.132812 -4.226563 z m 0 0" fill="url(#d)"/>
+                <path d="m 22 74 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="url(#e)"/>
+                <path d="m 22 68 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#dc8add"/>
+                <path d="m 80 74 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="url(#f)"/>
+                <path d="m 80 68 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#ffa348"/>
+            </g>
+        </g>
+    </mask>
+    <mask id="k">
+        <g filter="url(#i)">
+            <rect fill-opacity="0.8" height="128" width="128"/>
+        </g>
+    </mask>
+    <linearGradient id="l" gradientTransform="matrix(0 0.37 -0.98462 0 295.38501 -30.360001)" gradientUnits="userSpaceOnUse" x1="300" x2="428" y1="235" y2="235">
+        <stop offset="0" stop-color="#f9f06b"/>
+        <stop offset="1" stop-color="#f5c211"/>
+    </linearGradient>
+    <clipPath id="m">
+        <rect height="128" width="128"/>
+    </clipPath>
+    <clipPath id="n">
+        <rect height="128" width="128"/>
+    </clipPath>
+    <path d="m 51 18 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="url(#a)"/>
+    <path d="m 51 12 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#57e389"/>
+    <path d="m 76.976562 55.453125 c 1.480469 -0.855469 3.371094 -0.347656 4.226563 1.132813 l 6.742187 11.679687 c 0.855469 1.480469 0.347657 3.371094 -1.132812 4.226563 c -1.480469 0.851562 -3.371094 0.347656 -4.226562 -1.132813 l -6.742188 -11.679687 c -0.855469 -1.480469 -0.347656 -3.371094 1.132812 -4.226563 z m 0 0" fill="url(#c)"/>
+    <path d="m 52.8125 55.453125 c -1.480469 -0.855469 -3.371094 -0.347656 -4.226562 1.132813 l -6.742188 11.679687 c -0.855469 1.480469 -0.347656 3.371094 1.132812 4.226563 c 1.480469 0.851562 3.371094 0.347656 4.226563 -1.132813 l 6.742187 -11.679687 c 0.855469 -1.480469 0.347657 -3.371094 -1.132812 -4.226563 z m 0 0" fill="url(#d)"/>
+    <path d="m 22 74 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="url(#e)"/>
+    <path d="m 22 68 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#dc8add"/>
+    <path d="m 80 74 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="url(#f)"/>
+    <path d="m 80 68 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#ffa348"/>
+    <g clip-path="url(#n)" mask="url(#j)">
+        <g clip-path="url(#m)" mask="url(#k)">
+            <path d="m 128 80.640625 v 47.359375 h -128 v -47.359375 z m 0 0" fill="url(#l)"/>
+            <path d="m 13.308594 80.640625 l 47.355468 47.359375 h 21.214844 l -47.359375 -47.359375 z m 42.421875 0 l 47.363281 47.359375 h 21.214844 l -47.363282 -47.359375 z m 42.429687 0 l 29.839844 29.839844 v -21.210938 l -8.628906 -8.628906 z m -98.160156 7.90625 v 21.214844 l 18.238281 18.238281 h 21.214844 z m 0 0"/>
+        </g>
+    </g>
+</svg>
--- a/demos/node-editor/data/scalable/apps/org.gtk.gtk4.NodeEditor.svg
+++ b/demos/node-editor/data/scalable/apps/org.gtk.gtk4.NodeEditor.svg
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="128px" viewBox="0 0 128 128" width="128px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <linearGradient id="a" gradientUnits="userSpaceOnUse" x1="43.000351" x2="85.000351" y1="39.000164" y2="39.000164">
+        <stop offset="0" stop-color="#26a269"/>
+        <stop offset="0.0934161" stop-color="#84e3b7"/>
+        <stop offset="0.330831" stop-color="#26a269"/>
+        <stop offset="0.686952" stop-color="#26a269"/>
+        <stop offset="0.89736" stop-color="#175e3c"/>
+        <stop offset="1" stop-color="#26a269"/>
+    </linearGradient>
+    <linearGradient id="b" gradientUnits="userSpaceOnUse">
+        <stop offset="0" stop-color="#c0bfbc"/>
+        <stop offset="0.154754" stop-color="#ffffff"/>
+        <stop offset="0.433722" stop-color="#bdbbb5"/>
+        <stop offset="0.650505" stop-color="#c1c0ba"/>
+        <stop offset="0.825253" stop-color="#ffffff"/>
+        <stop offset="1" stop-color="#c0bfbc"/>
+    </linearGradient>
+    <linearGradient id="c" gradientTransform="matrix(0.0811899 -0.046875 0.069079 0.119648 307.03142 127.069456)" x1="-1710.210571" x2="-1774.45166" xlink:href="#b" y1="-1202.376709" y2="-1202.376709"/>
+    <linearGradient id="d" gradientTransform="matrix(-0.0811899 -0.046875 -0.069079 0.119648 -177.242852 127.069447)" x1="-1710.210571" x2="-1774.45166" xlink:href="#b" y1="-1202.376709" y2="-1202.376709"/>
+    <linearGradient id="e" gradientUnits="userSpaceOnUse" x1="14" x2="56" y1="94.999964" y2="94.999964">
+        <stop offset="0" stop-color="#813d9c"/>
+        <stop offset="0.109119" stop-color="#b378ca"/>
+        <stop offset="0.241583" stop-color="#813d9c"/>
+        <stop offset="0.731841" stop-color="#813d9c"/>
+        <stop offset="0.872163" stop-color="#4d255d"/>
+        <stop offset="1" stop-color="#813d9c"/>
+    </linearGradient>
+    <linearGradient id="f" gradientUnits="userSpaceOnUse" x1="72" x2="114" y1="94.999964" y2="94.999964">
+        <stop offset="0" stop-color="#e66100"/>
+        <stop offset="0.0678478" stop-color="#ff903e"/>
+        <stop offset="0.168852" stop-color="#e66100"/>
+        <stop offset="0.886626" stop-color="#e66100"/>
+        <stop offset="1" stop-color="#9d4200"/>
+    </linearGradient>
+    <path d="m 51 18 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="url(#a)"/>
+    <path d="m 51 12 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#57e389"/>
+    <path d="m 76.976562 55.453125 c 1.480469 -0.855469 3.371094 -0.347656 4.226563 1.132813 l 6.742187 11.679687 c 0.855469 1.480469 0.347657 3.371094 -1.132812 4.226563 c -1.480469 0.851562 -3.371094 0.347656 -4.226562 -1.132813 l -6.742188 -11.679687 c -0.855469 -1.480469 -0.347656 -3.371094 1.132812 -4.226563 z m 0 0" fill="url(#c)"/>
+    <path d="m 52.8125 55.453125 c -1.480469 -0.855469 -3.371094 -0.347656 -4.226562 1.132813 l -6.742188 11.679687 c -0.855469 1.480469 -0.347656 3.371094 1.132812 4.226563 c 1.480469 0.851562 3.371094 0.347656 4.226563 -1.132813 l 6.742187 -11.679687 c 0.855469 -1.480469 0.347657 -3.371094 -1.132812 -4.226563 z m 0 0" fill="url(#d)"/>
+    <path d="m 22 74 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="url(#e)"/>
+    <path d="m 22 68 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#dc8add"/>
+    <path d="m 80 74 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="url(#f)"/>
+    <path d="m 80 68 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#ffa348"/>
+</svg>
--- a/demos/node-editor/data/symbolic/apps/org.gtk.gtk4.NodeEditor-symbolic.svg
+++ b/demos/node-editor/data/symbolic/apps/org.gtk.gtk4.NodeEditor-symbolic.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
+    <path d="m 5.75 1 c -0.414062 0 -0.75 0.335938 -0.75 0.75 v 4.5 c 0 0.414062 0.335938 0.75 0.75 0.75 h 0.191406 l -1 2 h -3.191406 c -0.414062 0 -0.75 0.335938 -0.75 0.75 v 4.5 c 0 0.414062 0.335938 0.75 0.75 0.75 h 4.5 c 0.414062 0 0.75 -0.335938 0.75 -0.75 v -4.5 c 0 -0.414062 -0.335938 -0.75 -0.75 -0.75 h -0.191406 l 1 -2 h 1.882812 l 1 2 h -0.191406 c -0.414062 0 -0.75 0.335938 -0.75 0.75 v 4.5 c 0 0.414062 0.335938 0.75 0.75 0.75 h 4.5 c 0.414062 0 0.75 -0.335938 0.75 -0.75 v -4.5 c 0 -0.414062 -0.335938 -0.75 -0.75 -0.75 h -3.191406 l -1 -2 h 0.191406 c 0.414062 0 0.75 -0.335938 0.75 -0.75 v -4.5 c 0 -0.414062 -0.335938 -0.75 -0.75 -0.75 z m 0 0"/>
+</svg>
--- a/demos/node-editor/meson.build
+++ b/demos/node-editor/meson.build
@@ -19,3 +19,12 @@ executable('gtk4-node-editor',
           gui_app: true,
           link_args: extra_demo_ldflags,
           install: false)
+
+# icons
+icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor')
+
+foreach size: ['scalable', 'symbolic']
+  install_subdir('data/' + size,
+    install_dir: icontheme_dir
+  )
+endforeach
--- a/demos/node-editor/node-editor-application.c
+++ b/demos/node-editor/node-editor-application.c
@@ -101,7 +101,7 @@ activate_about (GSimpleAction *action,
                         "website", "http://www.gtk.org",
                         "comments", "Program to test GTK rendering",
                         "authors", (const char *[]){ "Benjamin Otte", "Timm Bäder", NULL},
-                         "logo-icon-name", "text-editor-symbolic",
+                         "logo-icon-name", "org.gtk.gtk4.NodeEditor.Devel",
                         "title", "About GTK Node Editor",
                         "system-information", s->str,
                         NULL);
--- a/demos/node-editor/node-editor-window.ui
+++ b/demos/node-editor/node-editor-window.ui
@@ -103,7 +103,6 @@
    <property name="focus-widget">text_view</property>
    <child type="titlebar">
      <object class="GtkHeaderBar" id="header">
-        <property name="show-title-buttons">1</property>
        <child type="start">
          <object class="GtkButton">
            <property name="icon-name">document-open-symbolic</property>
--- a/demos/print-editor/data/scalable/apps/org.gtk.PrintEditor4.Devel.svg
+++ b/demos/print-editor/data/scalable/apps/org.gtk.PrintEditor4.Devel.svg
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="128px" viewBox="0 0 128 128" width="128px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <defs>
+        <linearGradient id="a" gradientTransform="matrix(0.232143 0 0 0.328947 -7.567033 263.82666)" gradientUnits="userSpaceOnUse" x1="88.595886" x2="536.595886" y1="-449.394012" y2="-449.394012">
+            <stop offset="0" stop-color="#acabae"/>
+            <stop offset="0.0384615" stop-color="#deddda"/>
+            <stop offset="0.0768555" stop-color="#c0bfbc"/>
+            <stop offset="0.923077" stop-color="#c0bfbc"/>
+            <stop offset="0.961538" stop-color="#deddda"/>
+            <stop offset="1" stop-color="#9a9996"/>
+        </linearGradient>
+        <linearGradient id="b" gradientUnits="userSpaceOnUse" x1="26.999876" x2="100.999876" y1="32.999688" y2="32.999688">
+            <stop offset="0" stop-color="#7e7c77"/>
+            <stop offset="0.3" stop-color="#9a9996"/>
+            <stop offset="1" stop-color="#9a9996"/>
+        </linearGradient>
+        <linearGradient id="c" gradientUnits="userSpaceOnUse" x1="67.467916" x2="67.467916" y1="83.999688" y2="36.782906">
+            <stop offset="0" stop-color="#deddda"/>
+            <stop offset="1" stop-color="#c0bfbc"/>
+        </linearGradient>
+        <clipPath id="d">
+            <path d="m 79 72 h 15 v 16 h -15 z m 0 0"/>
+        </clipPath>
+        <clipPath id="e">
+            <path d="m 93.21875 72.921875 l -14.21875 14.21875 h -4.0625 v -18.28125 h 18.28125 z m 0 0"/>
+        </clipPath>
+        <linearGradient id="f" gradientTransform="matrix(0 0.126951 0.126951 0 76.460862 36.359884)" gradientUnits="userSpaceOnUse" x1="344" x2="340" y1="76" y2="72">
+            <stop offset="0" stop-color="#d5d3cf"/>
+            <stop offset="1" stop-color="#ffffff"/>
+        </linearGradient>
+        <filter id="g" height="100%" width="100%" x="0%" y="0%">
+            <feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+        </filter>
+        <mask id="h">
+            <g filter="url(#g)">
+                <rect fill-opacity="0.396" height="128" width="128"/>
+            </g>
+        </mask>
+        <linearGradient id="i" gradientUnits="userSpaceOnUse">
+            <stop offset="0" stop-color="#1c71d8"/>
+            <stop offset="0.323117" stop-color="#62a0ea"/>
+            <stop offset="0.59387" stop-color="#1b5aa6"/>
+            <stop offset="1" stop-color="#1c71d8"/>
+        </linearGradient>
+        <linearGradient id="j" gradientTransform="matrix(1.597748 1.597748 -1.06066 1.06066 -56.853041 -543.720139)" x1="224.504562" x2="231.453873" xlink:href="#i" y1="282.5" y2="282.5"/>
+        <radialGradient id="k" cx="227.599915" cy="201.029724" gradientTransform="matrix(4.072817 4.073078 -5.940048 5.939073 373.883117 -2098.049112)" gradientUnits="userSpaceOnUse" r="2.5">
+            <stop offset="0" stop-color="#93bdf1"/>
+            <stop offset="1" stop-color="#1a5fb4"/>
+        </radialGradient>
+        <linearGradient id="l" gradientTransform="matrix(2.121328 2.121328 -2.174353 2.174353 181.766074 -1021.145947)" gradientUnits="userSpaceOnUse" x1="226.90625" x2="228.86203" y1="288.75" y2="288.767151">
+            <stop offset="0" stop-color="#77767b"/>
+            <stop offset="0.443872" stop-color="#f6f5f4"/>
+            <stop offset="1" stop-color="#5e5c64"/>
+        </linearGradient>
+        <linearGradient id="m" gradientTransform="matrix(1.258421 1.258421 -1.06066 1.06066 57.381892 -503.024312)" gradientUnits="userSpaceOnUse" x1="223.1875" x2="233.0625" y1="278" y2="278">
+            <stop offset="0" stop-color="#ffa348"/>
+            <stop offset="0.265823" stop-color="#ffd7af"/>
+            <stop offset="0.734177" stop-color="#ff8d1c"/>
+            <stop offset="1" stop-color="#ffa348"/>
+        </linearGradient>
+        <linearGradient id="n" gradientTransform="matrix(1.573027 1.573027 -1.06066 1.06066 -14.348129 -574.754333)" x1="224.504562" x2="231.453873" xlink:href="#i" y1="282.5" y2="282.5"/>
+        <clipPath id="o">
+            <path d="m 79 72 h 15 v 16 h -15 z m 0 0"/>
+        </clipPath>
+        <clipPath id="p">
+            <path d="m 93.21875 72.921875 l -14.21875 14.21875 h -4.0625 v -18.28125 h 18.28125 z m 0 0"/>
+        </clipPath>
+        <mask id="q">
+            <g filter="url(#g)">
+                <rect fill-opacity="0.396" height="128" width="128"/>
+            </g>
+        </mask>
+        <clipPath id="r">
+            <rect height="152" width="192"/>
+        </clipPath>
+        <g id="s" clip-path="url(#r)">
+            <path d="m 29 112 c -4.433594 0 -8 -3.566406 -8 -8 v -2 c 0 4.433594 3.566406 8 8 8 h 88 c 4.433594 0 8 -3.566406 8 -8 v 2 c 0 4.433594 -3.566406 8 -8 8 z m 0 0" fill="#f6f5f4"/>
+        </g>
+        <clipPath id="t">
+            <rect height="128" width="128"/>
+        </clipPath>
+        <clipPath id="u">
+            <rect height="128" width="128"/>
+        </clipPath>
+        <mask id="v">
+            <g clip-path="url(#u)" filter="url(#g)">
+                <g clip-path="url(#t)">
+                    <path d="m 21 16 c -4.433594 0 -8 3.566406 -8 8 v 84 c 0 4.433594 3.566406 8 8 8 h 4 v -4 h 80 v 4 h 4 c 4.433594 0 8 -3.566406 8 -8 v -84 c 0 -4.433594 -3.566406 -8 -8 -8 z m 0 0" fill="url(#a)"/>
+                    <path d="m 21 12 h 88 c 4.417969 0 8 3.582031 8 8 v 68 c 0 4.417969 -3.582031 8 -8 8 h -88 c -4.417969 0 -8 -3.582031 -8 -8 v -68 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#deddda"/>
+                    <path d="m 27 28 h 74 v 10 h -74 z m 0 0" fill="url(#b)"/>
+                    <path d="m 27 38 h 74 v 46 h -74 z m 0 0" fill="url(#c)"/>
+                    <path d="m 24 33 c 0 1.65625 -1.34375 3 -3 3 s -3 -1.34375 -3 -3 s 1.34375 -3 3 -3 s 3 1.34375 3 3 z m 0 0" fill="#bf5f00" fill-opacity="0.964567"/>
+                    <path d="m 18 40 h 6 v 12 h -6 z m 0 0" fill="#acacac" fill-opacity="0.984252"/>
+                    <path d="m 18 40 h 6 v 10 h -6 z m 0 0" fill="#d1d1d1" fill-opacity="0.984252"/>
+                    <path d="m 37 36 h 56 v 44 h -56 z m 0 0" fill="#deddda" fill-opacity="0.984252"/>
+                    <path d="m 37 34 h 56 c 1.105469 0 2 0.894531 2 2 s -0.894531 2 -2 2 h -56 c -1.105469 0 -2 -0.894531 -2 -2 s 0.894531 -2 2 -2 z m 0 0" fill-opacity="0.940945"/>
+                    <path d="m 37 36.859375 h 56 v 36.925781 l -14.125 14.214844 h -41.875 z m 0 0" fill="#9a9996" fill-opacity="0.984252"/>
+                    <path d="m 37 36 h 56 v 36.925781 l -14.125 14.214844 h -41.875 z m 0 0" fill="#f6f5f4" fill-opacity="0.984252"/>
+                    <g clip-path="url(#o)">
+                        <g clip-path="url(#p)">
+                            <path d="m 79 77.386719 v 9.351562 c 0 2.464844 2 4.464844 4.464844 4.464844 h 9.351562 c 2.464844 0 4.464844 -2 4.464844 -4.464844 v -9.351562 c 0 -2.464844 -2 -4.464844 -4.464844 -4.464844 h -9.351562 c -2.464844 0 -4.464844 2 -4.464844 4.464844 z m 0 0" fill="url(#f)"/>
+                        </g>
+                    </g>
+                    <path d="m 27 100 h 76 c 1.109375 0 2 0.890625 2 2 v 10 h -80 v -10 c 0 -1.109375 0.890625 -2 2 -2 z m 0 0" fill="#5e5c64" fill-opacity="0.940945"/>
+                    <path d="m 27 102 h 76 c 1.109375 0 2 0.890625 2 2 v 10 h -80 v -10 c 0 -1.109375 0.890625 -2 2 -2 z m 0 0" fill="#9a9996"/>
+                    <path d="m 13 106 v 2 c 0 4.433594 3.566406 8 8 8 h 4 v -2 h -4 c -4.433594 0 -8 -3.566406 -8 -8 z m 104 0 c 0 4.433594 -3.566406 8 -8 8 h -4 v 2 h 4 c 4.433594 0 8 -3.566406 8 -8 z m -92 6 v 2 h 80 v -2 z m 0 0" fill="#9e9c99" fill-opacity="0.366142"/>
+                    <path d="m 27 38 v 46 l 6 -46 z m 0 0" fill="#7e7c77" fill-opacity="0.11811"/>
+                    <path d="m 24 32 c 0 1.65625 -1.34375 3 -3 3 s -3 -1.34375 -3 -3 s 1.34375 -3 3 -3 s 3 1.34375 3 3 z m 0 0" fill="#ffa348" fill-opacity="0.964567"/>
+                    <use mask="url(#q)" transform="matrix(1 0 0 1 -8 -16)" xlink:href="#s"/>
+                    <path d="m 89.503906 31.144531 l 10.066406 10.066407 l -41.71875 41.71875 l -10.066406 -10.066407 z m 0 0" fill="#ffa348"/>
+                    <path d="m 88.246094 29.886719 l 7.550781 7.550781 l -41.71875 41.71875 l -7.550781 -7.550781 z m 0 0" fill="#ff7800"/>
+                    <path d="m 86.789062 28.429688 l 2.515626 2.515624 l -41.71875 41.71875 l -2.515626 -2.515624 z m 0 0" fill="#ffbe6f"/>
+                    <path d="m 121.898438 -0.101562 c -4.855469 0.921874 -11.730469 5.152343 -18.140626 11.558593 l -16.96875 16.972657 l 12.78125 12.78125 l 16.972657 -16.972657 c 6.40625 -6.40625 10.636719 -13.28125 11.558593 -18.136719 z m 0 0" fill="url(#j)"/>
+                    <path d="m 110.011719 13.882812 c -2.1875 -0.398437 -5.421875 0.988282 -8.167969 3.730469 l -11.871094 11.875 l -6.6875 6.6875 c -4.800781 4.800781 -9.234375 12.007813 -9.648437 13.042969 c -0.484375 1.207031 -0.449219 2.730469 0.953125 4.136719 c 1.40625 1.40625 2.917968 1.441406 4.136718 0.953125 c 1.035157 -0.414063 8.292969 -4.984375 13.042969 -9.648438 l 2.402344 -2.398437 l 16.160156 -16.160157 c 2.742188 -2.746093 4.128907 -5.976562 3.730469 -8.167968 c -0.742188 1.390625 -1.859375 2.902344 -3.308594 4.347656 l -13.996094 13.996094 l -5.089843 -5.089844 l 13.996093 -13.996094 c 1.445313 -1.445312 2.960938 -2.566406 4.347657 -3.308594 z m 0 0" fill="url(#k)"/>
+                    <path d="m 95.273438 36.914062 l -2.960938 2.960938 l -2.398438 2.402344 c -4.90625 5.101562 -11.855468 10.828125 -11.855468 10.828125 c 1.011718 -0.433594 8.167968 -5.101563 12.914062 -9.769531 l 2.402344 -2.402344 l 2.960938 -2.957032 z m 0 0" fill="#62a0ea"/>
+                    <path d="m 87.320312 26.835938 l 13.789063 13.789062 c 0.292969 0.292969 0.292969 0.769531 0 1.0625 s -0.769531 0.292969 -1.0625 0 l -13.789063 -13.789062 c -0.292968 -0.292969 -0.292968 -0.769532 0 -1.0625 c 0.292969 -0.289063 0.769532 -0.289063 1.0625 0 z m 0 0" fill="#3584e4"/>
+                    <path d="m 42.421875 89.765625 c -3 3 -6.382813 4.484375 -7.554687 3.3125 c -1.171876 -1.171875 0.3125 -4.554687 3.3125 -7.554687 c 3.003906 -3.003907 6.386718 -4.488282 7.558593 -3.316407 s -0.3125 4.554688 -3.316406 7.558594 z m 0 0" fill="url(#l)"/>
+                    <path d="m 45.269531 70.347656 l -7.851562 12.511719 l 7.835937 7.925781 l 12.597656 -7.855468 z m -6.039062 13.171875 l 5.449219 5.449219 c 0.347656 0.347656 0.449218 0.933594 0.097656 1.160156 c -0.886719 0.570313 -2.9375 1.539063 -2.9375 1.539063 c -0.25 0.128906 -0.539063 0.164062 -0.773438 -0.066407 l -4.546875 -4.550781 c -0.234375 -0.230469 -0.207031 -0.527343 -0.066406 -0.773437 l 1.617187 -2.859375 c 0.207032 -0.363281 0.8125 -0.25 1.160157 0.101562 z m 0 0" fill="url(#m)"/>
+                    <path d="m 43.332031 74.777344 l 9.867188 9.867187 c 0.394531 0.390625 0.476562 0.871094 0.128906 1.066407 l -7.710937 5.253906 c -0.308594 0.210937 -0.785157 0.160156 -1.171876 -0.226563 l -6.984374 -6.988281 c -0.386719 -0.386719 -0.4375 -0.859375 -0.230469 -1.167969 l 5.234375 -7.8125 c 0.125 -0.285156 0.558594 -0.304687 0.867187 0.007813 z m 0 0" fill="url(#n)"/>
+                </g>
+            </g>
+        </mask>
+        <mask id="w">
+            <g filter="url(#g)">
+                <rect fill-opacity="0.8" height="128" width="128"/>
+            </g>
+        </mask>
+        <linearGradient id="x" gradientTransform="matrix(0 0.37 -0.98462 0 295.38501 -30.360001)" gradientUnits="userSpaceOnUse" x1="300" x2="428" y1="235" y2="235">
+            <stop offset="0" stop-color="#f9f06b"/>
+            <stop offset="1" stop-color="#f5c211"/>
+        </linearGradient>
+        <clipPath id="y">
+            <rect height="128" width="128"/>
+        </clipPath>
+        <clipPath id="z">
+            <rect height="128" width="128"/>
+        </clipPath>
+    </defs>
+    <path d="m 21 16 c -4.433594 0 -8 3.566406 -8 8 v 84 c 0 4.433594 3.566406 8 8 8 h 4 v -4 h 80 v 4 h 4 c 4.433594 0 8 -3.566406 8 -8 v -84 c 0 -4.433594 -3.566406 -8 -8 -8 z m 0 0" fill="url(#a)"/>
+    <path d="m 21 12 h 88 c 4.417969 0 8 3.582031 8 8 v 68 c 0 4.417969 -3.582031 8 -8 8 h -88 c -4.417969 0 -8 -3.582031 -8 -8 v -68 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#deddda"/>
+    <path d="m 27 28 h 74 v 10 h -74 z m 0 0" fill="url(#b)"/>
+    <path d="m 27 38 h 74 v 46 h -74 z m 0 0" fill="url(#c)"/>
+    <path d="m 24 33 c 0 1.65625 -1.34375 3 -3 3 s -3 -1.34375 -3 -3 s 1.34375 -3 3 -3 s 3 1.34375 3 3 z m 0 0" fill="#bf5f00" fill-opacity="0.964567"/>
+    <g fill-opacity="0.984252">
+        <path d="m 18 40 h 6 v 12 h -6 z m 0 0" fill="#acacac"/>
+        <path d="m 18 40 h 6 v 10 h -6 z m 0 0" fill="#d1d1d1"/>
+        <path d="m 37 36 h 56 v 44 h -56 z m 0 0" fill="#deddda"/>
+    </g>
+    <path d="m 37 34 h 56 c 1.105469 0 2 0.894531 2 2 s -0.894531 2 -2 2 h -56 c -1.105469 0 -2 -0.894531 -2 -2 s 0.894531 -2 2 -2 z m 0 0" fill-opacity="0.940945"/>
+    <path d="m 37 36.859375 h 56 v 36.925781 l -14.125 14.214844 h -41.875 z m 0 0" fill="#9a9996" fill-opacity="0.984252"/>
+    <path d="m 37 36 h 56 v 36.925781 l -14.125 14.214844 h -41.875 z m 0 0" fill="#f6f5f4" fill-opacity="0.984252"/>
+    <g clip-path="url(#d)">
+        <g clip-path="url(#e)">
+            <path d="m 79 77.386719 v 9.351562 c 0 2.464844 2 4.464844 4.464844 4.464844 h 9.351562 c 2.464844 0 4.464844 -2 4.464844 -4.464844 v -9.351562 c 0 -2.464844 -2 -4.464844 -4.464844 -4.464844 h -9.351562 c -2.464844 0 -4.464844 2 -4.464844 4.464844 z m 0 0" fill="url(#f)"/>
+        </g>
+    </g>
+    <path d="m 27 100 h 76 c 1.109375 0 2 0.890625 2 2 v 10 h -80 v -10 c 0 -1.109375 0.890625 -2 2 -2 z m 0 0" fill="#5e5c64" fill-opacity="0.940945"/>
+    <path d="m 27 102 h 76 c 1.109375 0 2 0.890625 2 2 v 10 h -80 v -10 c 0 -1.109375 0.890625 -2 2 -2 z m 0 0" fill="#9a9996"/>
+    <path d="m 13 106 v 2 c 0 4.433594 3.566406 8 8 8 h 4 v -2 h -4 c -4.433594 0 -8 -3.566406 -8 -8 z m 104 0 c 0 4.433594 -3.566406 8 -8 8 h -4 v 2 h 4 c 4.433594 0 8 -3.566406 8 -8 z m -92 6 v 2 h 80 v -2 z m 0 0" fill="#9e9c99" fill-opacity="0.366142"/>
+    <path d="m 27 38 v 46 l 6 -46 z m 0 0" fill="#7e7c77" fill-opacity="0.11811"/>
+    <path d="m 24 32 c 0 1.65625 -1.34375 3 -3 3 s -3 -1.34375 -3 -3 s 1.34375 -3 3 -3 s 3 1.34375 3 3 z m 0 0" fill="#ffa348" fill-opacity="0.964567"/>
+    <use mask="url(#h)" transform="matrix(1 0 0 1 -8 -16)" xlink:href="#s"/>
+    <path d="m 89.503906 31.144531 l 10.066406 10.066407 l -41.71875 41.71875 l -10.066406 -10.066407 z m 0 0" fill="#ffa348"/>
+    <path d="m 88.246094 29.886719 l 7.550781 7.550781 l -41.71875 41.71875 l -7.550781 -7.550781 z m 0 0" fill="#ff7800"/>
+    <path d="m 86.789062 28.429688 l 2.515626 2.515624 l -41.71875 41.71875 l -2.515626 -2.515624 z m 0 0" fill="#ffbe6f"/>
+    <path d="m 121.898438 -0.101562 c -4.855469 0.921874 -11.730469 5.152343 -18.140626 11.558593 l -16.96875 16.972657 l 12.78125 12.78125 l 16.972657 -16.972657 c 6.40625 -6.40625 10.636719 -13.28125 11.558593 -18.136719 z m 0 0" fill="url(#j)"/>
+    <path d="m 110.011719 13.882812 c -2.1875 -0.398437 -5.421875 0.988282 -8.167969 3.730469 l -11.871094 11.875 l -6.6875 6.6875 c -4.800781 4.800781 -9.234375 12.007813 -9.648437 13.042969 c -0.484375 1.207031 -0.449219 2.730469 0.953125 4.136719 c 1.40625 1.40625 2.917968 1.441406 4.136718 0.953125 c 1.035157 -0.414063 8.292969 -4.984375 13.042969 -9.648438 l 2.402344 -2.398437 l 16.160156 -16.160157 c 2.742188 -2.746093 4.128907 -5.976562 3.730469 -8.167968 c -0.742188 1.390625 -1.859375 2.902344 -3.308594 4.347656 l -13.996094 13.996094 l -5.089843 -5.089844 l 13.996093 -13.996094 c 1.445313 -1.445312 2.960938 -2.566406 4.347657 -3.308594 z m 0 0" fill="url(#k)"/>
+    <path d="m 95.273438 36.914062 l -2.960938 2.960938 l -2.398438 2.402344 c -4.90625 5.101562 -11.855468 10.828125 -11.855468 10.828125 c 1.011718 -0.433594 8.167968 -5.101563 12.914062 -9.769531 l 2.402344 -2.402344 l 2.960938 -2.957032 z m 0 0" fill="#62a0ea"/>
+    <path d="m 87.320312 26.835938 l 13.789063 13.789062 c 0.292969 0.292969 0.292969 0.769531 0 1.0625 s -0.769531 0.292969 -1.0625 0 l -13.789063 -13.789062 c -0.292968 -0.292969 -0.292968 -0.769532 0 -1.0625 c 0.292969 -0.289063 0.769532 -0.289063 1.0625 0 z m 0 0" fill="#3584e4"/>
+    <path d="m 42.421875 89.765625 c -3 3 -6.382813 4.484375 -7.554687 3.3125 c -1.171876 -1.171875 0.3125 -4.554687 3.3125 -7.554687 c 3.003906 -3.003907 6.386718 -4.488282 7.558593 -3.316407 s -0.3125 4.554688 -3.316406 7.558594 z m 0 0" fill="url(#l)"/>
+    <path d="m 45.269531 70.347656 l -7.851562 12.511719 l 7.835937 7.925781 l 12.597656 -7.855468 z m -6.039062 13.171875 l 5.449219 5.449219 c 0.347656 0.347656 0.449218 0.933594 0.097656 1.160156 c -0.886719 0.570313 -2.9375 1.539063 -2.9375 1.539063 c -0.25 0.128906 -0.539063 0.164062 -0.773438 -0.066407 l -4.546875 -4.550781 c -0.234375 -0.230469 -0.207031 -0.527343 -0.066406 -0.773437 l 1.617187 -2.859375 c 0.207032 -0.363281 0.8125 -0.25 1.160157 0.101562 z m 0 0" fill="url(#m)"/>
+    <path d="m 43.332031 74.777344 l 9.867188 9.867187 c 0.394531 0.390625 0.476562 0.871094 0.128906 1.066407 l -7.710937 5.253906 c -0.308594 0.210937 -0.785157 0.160156 -1.171876 -0.226563 l -6.984374 -6.988281 c -0.386719 -0.386719 -0.4375 -0.859375 -0.230469 -1.167969 l 5.234375 -7.8125 c 0.125 -0.285156 0.558594 -0.304687 0.867187 0.007813 z m 0 0" fill="url(#n)"/>
+    <g clip-path="url(#z)" mask="url(#v)">
+        <g clip-path="url(#y)" mask="url(#w)">
+            <path d="m 128 80.640625 v 47.359375 h -128 v -47.359375 z m 0 0" fill="url(#x)"/>
+            <path d="m 13.308594 80.640625 l 47.355468 47.359375 h 21.214844 l -47.359375 -47.359375 z m 42.421875 0 l 47.363281 47.359375 h 21.214844 l -47.363282 -47.359375 z m 42.429687 0 l 29.839844 29.839844 v -21.210938 l -8.628906 -8.628906 z m -98.160156 7.90625 v 21.214844 l 18.238281 18.238281 h 21.214844 z m 0 0"/>
+        </g>
+    </g>
+</svg>
--- a/demos/print-editor/data/scalable/apps/org.gtk.PrintEditor4.svg
+++ b/demos/print-editor/data/scalable/apps/org.gtk.PrintEditor4.svg
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="128px" viewBox="0 0 128 128" width="128px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <linearGradient id="a" gradientTransform="matrix(0.232143 0 0 0.328947 -7.567033 263.82666)" gradientUnits="userSpaceOnUse" x1="88.595886" x2="536.595886" y1="-449.394012" y2="-449.394012">
+        <stop offset="0" stop-color="#acabae"/>
+        <stop offset="0.0384615" stop-color="#deddda"/>
+        <stop offset="0.0768555" stop-color="#c0bfbc"/>
+        <stop offset="0.923077" stop-color="#c0bfbc"/>
+        <stop offset="0.961538" stop-color="#deddda"/>
+        <stop offset="1" stop-color="#9a9996"/>
+    </linearGradient>
+    <linearGradient id="b" gradientUnits="userSpaceOnUse" x1="26.999876" x2="100.999876" y1="32.999688" y2="32.999688">
+        <stop offset="0" stop-color="#7e7c77"/>
+        <stop offset="0.3" stop-color="#9a9996"/>
+        <stop offset="1" stop-color="#9a9996"/>
+    </linearGradient>
+    <linearGradient id="c" gradientUnits="userSpaceOnUse" x1="67.467916" x2="67.467916" y1="83.999688" y2="36.782906">
+        <stop offset="0" stop-color="#deddda"/>
+        <stop offset="1" stop-color="#c0bfbc"/>
+    </linearGradient>
+    <clipPath id="d">
+        <path d="m 79 72 h 15 v 16 h -15 z m 0 0"/>
+    </clipPath>
+    <clipPath id="e">
+        <path d="m 93.21875 72.921875 l -14.21875 14.21875 h -4.0625 v -18.28125 h 18.28125 z m 0 0"/>
+    </clipPath>
+    <linearGradient id="f" gradientTransform="matrix(0 0.126951 0.126951 0 76.460862 36.359884)" gradientUnits="userSpaceOnUse" x1="344" x2="340" y1="76" y2="72">
+        <stop offset="0" stop-color="#d5d3cf"/>
+        <stop offset="1" stop-color="#ffffff"/>
+    </linearGradient>
+    <filter id="g" height="100%" width="100%" x="0%" y="0%">
+        <feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+    </filter>
+    <mask id="h">
+        <g filter="url(#g)">
+            <rect fill-opacity="0.396" height="128" width="128"/>
+        </g>
+    </mask>
+    <clipPath id="i">
+        <rect height="152" width="192"/>
+    </clipPath>
+    <linearGradient id="j" gradientUnits="userSpaceOnUse">
+        <stop offset="0" stop-color="#1c71d8"/>
+        <stop offset="0.323117" stop-color="#62a0ea"/>
+        <stop offset="0.59387" stop-color="#1b5aa6"/>
+        <stop offset="1" stop-color="#1c71d8"/>
+    </linearGradient>
+    <linearGradient id="k" gradientTransform="matrix(1.597748 1.597748 -1.06066 1.06066 -56.853041 -543.720139)" x1="224.504562" x2="231.453873" xlink:href="#j" y1="282.5" y2="282.5"/>
+    <radialGradient id="l" cx="227.599915" cy="201.029724" gradientTransform="matrix(4.072817 4.073078 -5.940048 5.939073 373.883117 -2098.049112)" gradientUnits="userSpaceOnUse" r="2.5">
+        <stop offset="0" stop-color="#93bdf1"/>
+        <stop offset="1" stop-color="#1a5fb4"/>
+    </radialGradient>
+    <linearGradient id="m" gradientTransform="matrix(2.121328 2.121328 -2.174353 2.174353 181.766074 -1021.145947)" gradientUnits="userSpaceOnUse" x1="226.90625" x2="228.86203" y1="288.75" y2="288.767151">
+        <stop offset="0" stop-color="#77767b"/>
+        <stop offset="0.443872" stop-color="#f6f5f4"/>
+        <stop offset="1" stop-color="#5e5c64"/>
+    </linearGradient>
+    <linearGradient id="n" gradientTransform="matrix(1.258421 1.258421 -1.06066 1.06066 57.381892 -503.024312)" gradientUnits="userSpaceOnUse" x1="223.1875" x2="233.0625" y1="278" y2="278">
+        <stop offset="0" stop-color="#ffa348"/>
+        <stop offset="0.265823" stop-color="#ffd7af"/>
+        <stop offset="0.734177" stop-color="#ff8d1c"/>
+        <stop offset="1" stop-color="#ffa348"/>
+    </linearGradient>
+    <linearGradient id="o" gradientTransform="matrix(1.573027 1.573027 -1.06066 1.06066 -14.348129 -574.754333)" x1="224.504562" x2="231.453873" xlink:href="#j" y1="282.5" y2="282.5"/>
+    <path d="m 21 16 c -4.433594 0 -8 3.566406 -8 8 v 84 c 0 4.433594 3.566406 8 8 8 h 4 v -4 h 80 v 4 h 4 c 4.433594 0 8 -3.566406 8 -8 v -84 c 0 -4.433594 -3.566406 -8 -8 -8 z m 0 0" fill="url(#a)"/>
+    <path d="m 21 12 h 88 c 4.417969 0 8 3.582031 8 8 v 68 c 0 4.417969 -3.582031 8 -8 8 h -88 c -4.417969 0 -8 -3.582031 -8 -8 v -68 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#deddda"/>
+    <path d="m 27 28 h 74 v 10 h -74 z m 0 0" fill="url(#b)"/>
+    <path d="m 27 38 h 74 v 46 h -74 z m 0 0" fill="url(#c)"/>
+    <path d="m 24 33 c 0 1.65625 -1.34375 3 -3 3 s -3 -1.34375 -3 -3 s 1.34375 -3 3 -3 s 3 1.34375 3 3 z m 0 0" fill="#bf5f00" fill-opacity="0.964567"/>
+    <g fill-opacity="0.984252">
+        <path d="m 18 40 h 6 v 12 h -6 z m 0 0" fill="#acacac"/>
+        <path d="m 18 40 h 6 v 10 h -6 z m 0 0" fill="#d1d1d1"/>
+        <path d="m 37 36 h 56 v 44 h -56 z m 0 0" fill="#deddda"/>
+    </g>
+    <path d="m 37 34 h 56 c 1.105469 0 2 0.894531 2 2 s -0.894531 2 -2 2 h -56 c -1.105469 0 -2 -0.894531 -2 -2 s 0.894531 -2 2 -2 z m 0 0" fill-opacity="0.940945"/>
+    <path d="m 37 36.859375 h 56 v 36.925781 l -14.125 14.214844 h -41.875 z m 0 0" fill="#9a9996" fill-opacity="0.984252"/>
+    <path d="m 37 36 h 56 v 36.925781 l -14.125 14.214844 h -41.875 z m 0 0" fill="#f6f5f4" fill-opacity="0.984252"/>
+    <g clip-path="url(#d)">
+        <g clip-path="url(#e)">
+            <path d="m 79 77.386719 v 9.351562 c 0 2.464844 2 4.464844 4.464844 4.464844 h 9.351562 c 2.464844 0 4.464844 -2 4.464844 -4.464844 v -9.351562 c 0 -2.464844 -2 -4.464844 -4.464844 -4.464844 h -9.351562 c -2.464844 0 -4.464844 2 -4.464844 4.464844 z m 0 0" fill="url(#f)"/>
+        </g>
+    </g>
+    <path d="m 27 100 h 76 c 1.109375 0 2 0.890625 2 2 v 10 h -80 v -10 c 0 -1.109375 0.890625 -2 2 -2 z m 0 0" fill="#5e5c64" fill-opacity="0.940945"/>
+    <path d="m 27 102 h 76 c 1.109375 0 2 0.890625 2 2 v 10 h -80 v -10 c 0 -1.109375 0.890625 -2 2 -2 z m 0 0" fill="#9a9996"/>
+    <path d="m 13 106 v 2 c 0 4.433594 3.566406 8 8 8 h 4 v -2 h -4 c -4.433594 0 -8 -3.566406 -8 -8 z m 104 0 c 0 4.433594 -3.566406 8 -8 8 h -4 v 2 h 4 c 4.433594 0 8 -3.566406 8 -8 z m -92 6 v 2 h 80 v -2 z m 0 0" fill="#9e9c99" fill-opacity="0.366142"/>
+    <path d="m 27 38 v 46 l 6 -46 z m 0 0" fill="#7e7c77" fill-opacity="0.11811"/>
+    <path d="m 24 32 c 0 1.65625 -1.34375 3 -3 3 s -3 -1.34375 -3 -3 s 1.34375 -3 3 -3 s 3 1.34375 3 3 z m 0 0" fill="#ffa348" fill-opacity="0.964567"/>
+    <g clip-path="url(#i)" mask="url(#h)" transform="matrix(1 0 0 1 -8 -16)">
+        <path d="m 29 112 c -4.433594 0 -8 -3.566406 -8 -8 v -2 c 0 4.433594 3.566406 8 8 8 h 88 c 4.433594 0 8 -3.566406 8 -8 v 2 c 0 4.433594 -3.566406 8 -8 8 z m 0 0" fill="#f6f5f4"/>
+    </g>
+    <path d="m 89.503906 31.144531 l 10.066406 10.066407 l -41.71875 41.71875 l -10.066406 -10.066407 z m 0 0" fill="#ffa348"/>
+    <path d="m 88.246094 29.886719 l 7.550781 7.550781 l -41.71875 41.71875 l -7.550781 -7.550781 z m 0 0" fill="#ff7800"/>
+    <path d="m 86.789062 28.429688 l 2.515626 2.515624 l -41.71875 41.71875 l -2.515626 -2.515624 z m 0 0" fill="#ffbe6f"/>
+    <path d="m 121.898438 -0.101562 c -4.855469 0.921874 -11.730469 5.152343 -18.140626 11.558593 l -16.96875 16.972657 l 12.78125 12.78125 l 16.972657 -16.972657 c 6.40625 -6.40625 10.636719 -13.28125 11.558593 -18.136719 z m 0 0" fill="url(#k)"/>
+    <path d="m 110.011719 13.882812 c -2.1875 -0.398437 -5.421875 0.988282 -8.167969 3.730469 l -11.871094 11.875 l -6.6875 6.6875 c -4.800781 4.800781 -9.234375 12.007813 -9.648437 13.042969 c -0.484375 1.207031 -0.449219 2.730469 0.953125 4.136719 c 1.40625 1.40625 2.917968 1.441406 4.136718 0.953125 c 1.035157 -0.414063 8.292969 -4.984375 13.042969 -9.648438 l 2.402344 -2.398437 l 16.160156 -16.160157 c 2.742188 -2.746093 4.128907 -5.976562 3.730469 -8.167968 c -0.742188 1.390625 -1.859375 2.902344 -3.308594 4.347656 l -13.996094 13.996094 l -5.089843 -5.089844 l 13.996093 -13.996094 c 1.445313 -1.445312 2.960938 -2.566406 4.347657 -3.308594 z m 0 0" fill="url(#l)"/>
+    <path d="m 95.273438 36.914062 l -2.960938 2.960938 l -2.398438 2.402344 c -4.90625 5.101562 -11.855468 10.828125 -11.855468 10.828125 c 1.011718 -0.433594 8.167968 -5.101563 12.914062 -9.769531 l 2.402344 -2.402344 l 2.960938 -2.957032 z m 0 0" fill="#62a0ea"/>
+    <path d="m 87.320312 26.835938 l 13.789063 13.789062 c 0.292969 0.292969 0.292969 0.769531 0 1.0625 s -0.769531 0.292969 -1.0625 0 l -13.789063 -13.789062 c -0.292968 -0.292969 -0.292968 -0.769532 0 -1.0625 c 0.292969 -0.289063 0.769532 -0.289063 1.0625 0 z m 0 0" fill="#3584e4"/>
+    <path d="m 42.421875 89.765625 c -3 3 -6.382813 4.484375 -7.554687 3.3125 c -1.171876 -1.171875 0.3125 -4.554687 3.3125 -7.554687 c 3.003906 -3.003907 6.386718 -4.488282 7.558593 -3.316407 s -0.3125 4.554688 -3.316406 7.558594 z m 0 0" fill="url(#m)"/>
+    <path d="m 45.269531 70.347656 l -7.851562 12.511719 l 7.835937 7.925781 l 12.597656 -7.855468 z m -6.039062 13.171875 l 5.449219 5.449219 c 0.347656 0.347656 0.449218 0.933594 0.097656 1.160156 c -0.886719 0.570313 -2.9375 1.539063 -2.9375 1.539063 c -0.25 0.128906 -0.539063 0.164062 -0.773438 -0.066407 l -4.546875 -4.550781 c -0.234375 -0.230469 -0.207031 -0.527343 -0.066406 -0.773437 l 1.617187 -2.859375 c 0.207032 -0.363281 0.8125 -0.25 1.160157 0.101562 z m 0 0" fill="url(#n)"/>
+    <path d="m 43.332031 74.777344 l 9.867188 9.867187 c 0.394531 0.390625 0.476562 0.871094 0.128906 1.066407 l -7.710937 5.253906 c -0.308594 0.210937 -0.785157 0.160156 -1.171876 -0.226563 l -6.984374 -6.988281 c -0.386719 -0.386719 -0.4375 -0.859375 -0.230469 -1.167969 l 5.234375 -7.8125 c 0.125 -0.285156 0.558594 -0.304687 0.867187 0.007813 z m 0 0" fill="url(#o)"/>
+</svg>
--- a/demos/print-editor/data/symbolic/apps/org.gtk.PrintEditor4-symbolic.svg
+++ b/demos/print-editor/data/symbolic/apps/org.gtk.PrintEditor4-symbolic.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <filter id="a" height="100%" width="100%" x="0%" y="0%">
+        <feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+    </filter>
+    <mask id="b">
+        <g filter="url(#a)">
+            <rect fill-opacity="0.396" height="16" width="16"/>
+        </g>
+    </mask>
+    <clipPath id="c">
+        <rect height="152" width="192"/>
+    </clipPath>
+    <g clip-path="url(#c)" mask="url(#b)" transform="matrix(1 0 0 1 -168 -16)">
+        <path d="m 29 112 c -4.433594 0 -8 -3.566406 -8 -8 v -2 c 0 4.433594 3.566406 8 8 8 h 88 c 4.433594 0 8 -3.566406 8 -8 v 2 c 0 4.433594 -3.566406 8 -8 8 z m 0 0" fill="#f6f5f4"/>
+    </g>
+    <g fill="#2e3436">
+        <path d="m 4 2 v 2 h 5.585938 l 2 -2 z m -2 3 c -0.5 0 -1 0.5 -1 1 v 4 c 0 0.5 0.5 1 1 1 h 1 v -2 h 2 c 0 -0.265625 0.105469 -0.519531 0.292969 -0.707031 l 3.292969 -3.292969 z m 11.414062 0 l -4 4 h 3.585938 v 2 h 1 c 0.5 0 1 -0.5 1 -1 v -4 c 0 -0.5 -0.5 -1 -1 -1 z m -9.414062 5 v 5 h 8 v -5 h -3.585938 l -0.707031 0.707031 c -0.1875 0.1875 -0.441406 0.292969 -0.707031 0.292969 h -1 c -0.550781 0 -1 -0.449219 -1 -1 z m 0 0"/>
+        <path d="m 6 10 h 1 l 9 -9 l -1 -1 l -9 9 z m 0 0"/>
+    </g>
+</svg>
--- a/demos/print-editor/meson.build
+++ b/demos/print-editor/meson.build
@@ -12,3 +12,12 @@ install_data('org.gtk.PrintEditor4.desktop', install_dir: gtk_applicationsdir)

 # appdata
 install_data('org.gtk.PrintEditor4.appdata.xml', install_dir: gtk_appdatadir)
+
+# icons
+icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor')
+
+foreach size: ['scalable', 'symbolic']
+  install_subdir('data/' + size,
+    install_dir: icontheme_dir
+  )
+endforeach
--- a/demos/print-editor/org.gtk.PrintEditor4.desktop
+++ b/demos/print-editor/org.gtk.PrintEditor4.desktop
@@ -2,7 +2,7 @@
 Name=Print Editor
 Comment=A simple editor demonstrating GTK printing
 Exec=gtk4-print-editor %f
-Icon=text-editor-symbolic
+Icon=org.gtk.PrintEditor4.Devel
 Terminal=false
 Type=Application
 StartupNotify=true
--- a/demos/print-editor/print-editor.c
+++ b/demos/print-editor/print-editor.c
@@ -633,7 +633,7 @@ activate_about (GSimpleAction *action,
                         "website", "http://www.gtk.org",
                         "comments", "Program to demonstrate GTK printing",
                         "authors", (const char *[]){ "Alexander Larsson", NULL },
-                         "logo-icon-name", "text-editor-symbolic",
+                         "logo-icon-name", "org.gtk.PrintEditor4.Devel",
                         "title", "About GTK Print Editor",
                         "system-information", sysinfo->str,
                         NULL);
@@ -781,6 +781,8 @@ activate (GApplication *app)
  gtk_application_window_set_show_menubar (GTK_APPLICATION_WINDOW (main_window), TRUE);
  update_title (GTK_WINDOW (main_window));

+  gtk_widget_add_css_class (main_window, "devel");
+
  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
  gtk_window_set_child (GTK_WINDOW (main_window), box);

--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
@@ -436,7 +436,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
    <property name="title">GTK Widget Factory</property>
    <child type="titlebar">
      <object class="GtkHeaderBar" id="headerbar1">
-        <property name="show-title-buttons">1</property>
        <child type="title">
          <object class="GtkStackSwitcher" id="stack_switcher">
            <property name="stack">toplevel_stack</property>
--- a/docs/reference/gtk/getting_started.md
+++ b/docs/reference/gtk/getting_started.md
@@ -1423,7 +1423,6 @@ the search bar below the header bar.
    <property name="default-height">400</property>
    <child type="titlebar">
      <object class="GtkHeaderBar" id="header">
-        <property name="show-title-buttons">1</property>
        <child type="title">
          <object class="GtkStackSwitcher" id="tabs">
            <property name="stack">stack</property>
@@ -1537,7 +1536,6 @@ GtkMenuButton, GtkRevealer and GtkListBox.
    <property name="default-height">400</property>
    <child type="titlebar">
      <object class="GtkHeaderBar" id="header">
-        <property name="show-title-buttons">1</property>
        <child type="title">
          <object class="GtkStackSwitcher" id="tabs">
            <property name="stack">stack</property>
--- a/docs/reference/gtk/gtk4-docs.xml
+++ b/docs/reference/gtk/gtk4-docs.xml
@@ -54,8 +54,9 @@
      <section>
        <xi:include href="xml/gtkfilter.xml" />
        <xi:include href="xml/gtkcustomfilter.xml" />
-        <xi:include href="xml/gtkstringfilter.xml" />
        <xi:include href="xml/gtkmultifilter.xml" />
+        <xi:include href="xml/gtkstringfilter.xml" />
+        <xi:include href="xml/gtkfilefilter.xml" />
      </section>
      <xi:include href="xml/gtkflattenlistmodel.xml" />
      <xi:include href="xml/gtkmaplistmodel.xml" />
@@ -74,6 +75,7 @@
        <xi:include href="xml/gtksingleselection.xml" />
        <xi:include href="xml/gtkmultiselection.xml" />
      </section>
+      <xi:include href="xml/gtkselectionfiltermodel.xml" />
      <xi:include href="xml/gtkbookmarklist.xml" />
      <xi:include href="xml/gtkdirectorylist.xml" />
      <xi:include href="xml/gtkstringlist.xml" />
@@ -284,7 +286,6 @@
      <xi:include href="xml/gtkfilechoosernative.xml" />
      <xi:include href="xml/gtkfilechooserdialog.xml" />
      <xi:include href="xml/gtkfilechooserwidget.xml" />
-      <xi:include href="xml/gtkfilefilter.xml" />
      <xi:include href="xml/gtkfontchooser.xml" />
      <xi:include href="xml/gtkfontbutton.xml" />
      <xi:include href="xml/gtkfontchooserwidget.xml" />
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -375,7 +375,7 @@ gtk_bitset_subtract
 gtk_bitset_difference
 gtk_bitset_shift_left
 gtk_bitset_shift_right
-gtk_bitset_slice
+gtk_bitset_splice
 <SUBSECTION>
 GtkBitsetIter
 gtk_bitset_iter_init_first
@@ -423,6 +423,7 @@ gtk_selection_model_get_type
 GtkNoSelection
 gtk_no_selection_new
 gtk_no_selection_get_model
+gtk_no_selection_set_model
 <SUBSECTION Private>
 gtk_no_selection_get_type
 </SECTION>
@@ -434,6 +435,7 @@ GtkSingleSelection
 GTK_INVALID_LIST_POSITION
 gtk_single_selection_new
 gtk_single_selection_get_model
+gtk_single_selection_set_model
 gtk_single_selection_get_selected
 gtk_single_selection_set_selected
 gtk_single_selection_get_selected_item
@@ -450,6 +452,8 @@ gtk_single_selection_get_type
 <TITLE>GtkMultiSeledction</TITLE>
 GtkMultiSelection
 gtk_multi_selection_new
+gtk_multi_selection_get_model
+gtk_multi_selection_set_model
 <SUBSECTION Private>
 gtk_multi_selection_get_type
 </SECTION>
@@ -1296,23 +1300,19 @@ gtk_file_chooser_get_current_name
 <SUBSECTION>
 gtk_file_chooser_get_file
 gtk_file_chooser_set_file
-gtk_file_chooser_select_file
-gtk_file_chooser_unselect_file
-gtk_file_chooser_select_all
-gtk_file_chooser_unselect_all
 gtk_file_chooser_get_files
 gtk_file_chooser_set_current_folder
 gtk_file_chooser_get_current_folder
 <SUBSECTION>
 gtk_file_chooser_add_filter
 gtk_file_chooser_remove_filter
-gtk_file_chooser_list_filters
+gtk_file_chooser_get_filters
 gtk_file_chooser_set_filter
 gtk_file_chooser_get_filter
 <SUBSECTION>
 gtk_file_chooser_add_shortcut_folder
 gtk_file_chooser_remove_shortcut_folder
-gtk_file_chooser_list_shortcut_folders
+gtk_file_chooser_get_shortcut_folders
 <SUBSECTION>
 gtk_file_chooser_add_choice
 gtk_file_chooser_remove_choice
@@ -1409,18 +1409,13 @@ GtkFileChooserButtonPrivate
 <SECTION>
 <FILE>gtkfilefilter</FILE>
 GtkFileFilter
-GtkFileFilterInfo
-GtkFileFilterFlags
-GtkFileFilterFunc
 gtk_file_filter_new
 gtk_file_filter_set_name
 gtk_file_filter_get_name
 gtk_file_filter_add_mime_type
 gtk_file_filter_add_pattern
 gtk_file_filter_add_pixbuf_formats
-gtk_file_filter_add_custom
-gtk_file_filter_get_needed
-gtk_file_filter_filter
+gtk_file_filter_get_attributes

 <SUBSECTION Serialization>
 gtk_file_filter_new_from_gvariant
@@ -1445,6 +1440,8 @@ gtk_directory_list_get_file
 gtk_directory_list_set_file
 gtk_directory_list_get_io_priority
 gtk_directory_list_set_io_priority
+gtk_directory_list_get_monitored
+gtk_directory_list_set_monitored
 gtk_directory_list_is_loading
 gtk_directory_list_get_error
 <SUBSECTION Standard>
@@ -1539,7 +1536,6 @@ gtk_custom_filter_get_type
 <TITLE>GtkFilterListModel</TITLE>
 GtkFilterListModel
 gtk_filter_list_model_new
-gtk_filter_list_model_new_for_type
 gtk_filter_list_model_set_model
 gtk_filter_list_model_get_model
 gtk_filter_list_model_set_filter
@@ -2701,7 +2697,6 @@ gtk_size_group_get_type
 <TITLE>GtkSliceListModel</TITLE>
 GtkSliceListModel
 gtk_slice_list_model_new
-gtk_slice_list_model_new_for_type
 gtk_slice_list_model_set_model
 gtk_slice_list_model_get_model
 gtk_slice_list_model_set_offset
@@ -2833,7 +2828,6 @@ gtk_tree_list_row_sorter_get_type
 <TITLE>GtkSortListModel</TITLE>
 GtkSortListModel
 gtk_sort_list_model_new
-gtk_sort_list_model_new_for_type
 gtk_sort_list_model_set_sorter
 gtk_sort_list_model_get_sorter
 gtk_sort_list_model_set_model
@@ -7547,9 +7541,13 @@ gtk_expression_watch_unwatch
 <SUBSECTION>
 gtk_property_expression_new
 gtk_property_expression_new_for_pspec
+gtk_property_expression_get_expression
+gtk_property_expression_get_pspec
 gtk_constant_expression_new
 gtk_constant_expression_new_for_value
+gtk_constant_expression_get_value
 gtk_object_expression_new
+gtk_object_expression_get_object
 gtk_closure_expression_new
 gtk_cclosure_expression_new

@@ -7613,6 +7611,18 @@ gtk_string_list_take
 gtk_string_list_remove
 gtk_string_list_splice
 gtk_string_list_get_string
+<SUBSECTION>
 GtkStringObject
+gtk_string_object_new
 gtk_string_object_get_string
 </SECTION>
+
+<SECTION>
+<FILE>gtkselectionfiltermodel</FILE>
+<TITLE>GtkSelectionFilterModel</TITLE>
+GtkSelectionFilterModel
+gtk_selection_filter_model_new
+gtk_selection_filter_model_new_for_type
+gtk_selection_filter_model_set_model
+gtk_selection_filter_model_get_model
+</SECTION>
--- a/docs/reference/gtk/gtk4.types.in
+++ b/docs/reference/gtk/gtk4.types.in
@@ -184,6 +184,7 @@ gtk_scrollbar_get_type
 gtk_scrolled_window_get_type
 gtk_search_bar_get_type
 gtk_search_entry_get_type
+gtk_selection_filter_model_get_type
 gtk_selection_model_get_type
 gtk_separator_get_type
 gtk_settings_get_type
--- a/docs/reference/gtk/migrating-3to4.md
+++ b/docs/reference/gtk/migrating-3to4.md
@@ -411,6 +411,7 @@ and gtk_box_append(). You can also reorder box children as necessary.
 The gtk_header_bar_set_show_close_button() function has been renamed to
 the more accurate name gtk_header_bar_set_show_title_buttons(). The
 corresponding getter and the property itself have also been renamed.
+ The default value of the property is now %TRUE instead of %FALSE.

 The gtk_header_bar_set_custom_title() function has been renamed to
 the more accurate name gtk_header_bar_set_title_widget(). The
--- a/examples/application3/window.ui
+++ b/examples/application3/window.ui
@@ -6,7 +6,6 @@
    <property name="default-height">400</property>
    <child type="titlebar">
      <object class="GtkHeaderBar" id="header">
-        <property name="show-title-buttons">1</property>
        <child type="title">
          <object class="GtkStackSwitcher" id="tabs">
            <property name="stack">stack</property>
--- a/examples/application4/window.ui
+++ b/examples/application4/window.ui
@@ -6,7 +6,6 @@
    <property name="default-height">400</property>
    <child type="titlebar">
      <object class="GtkHeaderBar" id="header">
-        <property name="show-title-buttons">1</property>
        <child type="title">
          <object class="GtkStackSwitcher" id="tabs">
            <property name="stack">stack</property>
--- a/examples/application5/window.ui
+++ b/examples/application5/window.ui
@@ -6,7 +6,6 @@
    <property name="default-height">400</property>
    <child type="titlebar">
      <object class="GtkHeaderBar" id="header">
-        <property name="show-title-buttons">1</property>
        <child type="title">
          <object class="GtkStackSwitcher" id="tabs">
            <property name="stack">stack</property>
--- a/examples/application6/window.ui
+++ b/examples/application6/window.ui
@@ -6,7 +6,6 @@
    <property name="default-height">400</property>
    <child type="titlebar">
      <object class="GtkHeaderBar" id="header">
-        <property name="show-title-buttons">1</property>
        <child type="title">
          <object class="GtkStackSwitcher" id="tabs">
            <property name="stack">stack</property>
--- a/examples/application7/window.ui
+++ b/examples/application7/window.ui
@@ -6,7 +6,6 @@
    <property name="default-height">400</property>
    <child type="titlebar">
      <object class="GtkHeaderBar" id="header">
-        <property name="show-title-buttons">1</property>
        <child type="title">
          <object class="GtkStackSwitcher" id="tabs">
            <property name="stack">stack</property>
--- a/examples/application8/window.ui
+++ b/examples/application8/window.ui
@@ -6,7 +6,6 @@
    <property name="default-height">400</property>
    <child type="titlebar">
      <object class="GtkHeaderBar" id="header">
-        <property name="show-title-buttons">1</property>
        <child type="title">
          <object class="GtkStackSwitcher" id="tabs">
            <property name="stack">stack</property>
--- a/examples/application9/window.ui
+++ b/examples/application9/window.ui
@@ -6,7 +6,6 @@
    <property name="default-height">400</property>
    <child type="titlebar">
      <object class="GtkHeaderBar" id="header">
-        <property name="show-title-buttons">1</property>
        <child>
          <object class="GtkLabel" id="lines_label">
            <property name="visible">0</property>
--- a/examples/sunny.c
+++ b/examples/sunny.c
@@ -15,7 +15,6 @@ new_window (GApplication *app,
  gtk_window_set_icon_name (GTK_WINDOW (window), "sunny");

  header = gtk_header_bar_new ();
-  gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), TRUE);
  gtk_window_set_titlebar (GTK_WINDOW (window), header);

  overlay = gtk_overlay_new ();
--- a/gdk/gdkarrayimpl.c
+++ b/gdk/gdkarrayimpl.c
@@ -0,0 +1,283 @@
+/*
+ * Copyright © 2020 Benjamin Otte
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Benjamin Otte <otte@gnome.org>
+ */
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+#ifndef GDK_ARRAY_TYPE_NAME
+#define GDK_ARRAY_TYPE_NAME GdkArray
+#endif
+
+#ifndef GDK_ARRAY_NAME
+#define GDK_ARRAY_NAME gdk_array
+#endif
+
+#ifndef GDK_ARRAY_ELEMENT_TYPE
+#define GDK_ARRAY_ELEMENT_TYPE gpointer
+#endif
+
+#ifdef GDK_ARRAY_PREALLOC
+#if GDK_ARRAY_PREALLOC == 0
+#undef GDK_ARRAY_PREALLOC
+#endif
+#endif
+
+#ifdef GDK_ARRAY_NULL_TERMINATED
+#define GDK_ARRAY_REAL_SIZE(_size) ((_size) + 1)
+#else
+#define GDK_ARRAY_REAL_SIZE(_size) (_size)
+#endif
+
+/* make this readable */
+#define _T_ GDK_ARRAY_ELEMENT_TYPE
+#define GdkArray GDK_ARRAY_TYPE_NAME
+#define gdk_array_paste_more(GDK_ARRAY_NAME, func_name) GDK_ARRAY_NAME ## _ ## func_name
+#define gdk_array_paste(GDK_ARRAY_NAME, func_name) gdk_array_paste_more (GDK_ARRAY_NAME, func_name)
+#define gdk_array(func_name) gdk_array_paste (GDK_ARRAY_NAME, func_name)
+
+typedef struct GdkArray GdkArray;
+
+struct GdkArray
+{
+  _T_ *start;
+  _T_ *end;
+  _T_ *end_allocation;
+#ifdef GDK_ARRAY_PREALLOC
+  _T_ preallocated[GDK_ARRAY_REAL_SIZE(GDK_ARRAY_PREALLOC)];
+#endif
+};
+
+/* no G_GNUC_UNUSED here, if you don't use an array type, remove it. */
+static inline void
+gdk_array(init) (GdkArray *self)
+{
+#ifdef GDK_ARRAY_PREALLOC
+  self->start = self->preallocated;
+  self->end = self->start;
+  self->end_allocation = self->start + GDK_ARRAY_PREALLOC;
+#ifdef GDK_ARRAY_NULL_TERMINATED
+  *self->start = *(_T_[1]) {};
+#endif
+#else
+  self->start = NULL;
+  self->end = NULL;
+  self->end_allocation = NULL;
+#endif
+}
+
+static inline void
+gdk_array(free_elements) (_T_ *start,
+                          _T_ *end)
+{
+#ifdef GDK_ARRAY_FREE_FUNC
+  _T_ *e;
+  for (e = start; e < end; e++)
+#ifdef GDK_ARRAY_BY_VALUE
+    GDK_ARRAY_FREE_FUNC (e);
+#else
+    GDK_ARRAY_FREE_FUNC (*e);
+#endif
+#endif
+}
+
+/* no G_GNUC_UNUSED here */
+static inline void
+gdk_array(clear) (GdkArray *self)
+{
+  gdk_array(free_elements) (self->start, self->end);
+
+#ifdef GDK_ARRAY_PREALLOC
+  if (self->start != self->preallocated)
+#endif
+    g_free (self->start);
+  gdk_array(init) (self);
+}
+
+G_GNUC_UNUSED static inline _T_ *
+gdk_array(get_data) (const GdkArray *self)
+{
+  return self->start;
+}
+
+G_GNUC_UNUSED static inline _T_ *
+gdk_array(index) (const GdkArray *self,
+                  gsize           pos)
+{
+  return self->start + pos;
+}
+
+G_GNUC_UNUSED static inline gsize
+gdk_array(get_capacity) (const GdkArray *self)
+{
+  return self->end_allocation - self->start;
+}
+
+G_GNUC_UNUSED static inline gsize
+gdk_array(get_size) (const GdkArray *self)
+{
+  return self->end - self->start;
+}
+
+G_GNUC_UNUSED static inline gboolean
+gdk_array(is_empty) (const GdkArray *self)
+{
+  return self->end == self->start;
+}
+
+G_GNUC_UNUSED static void
+gdk_array(reserve) (GdkArray *self,
+                    gsize      n)
+{
+  gsize new_size, size;
+
+  if (n <= gdk_array(get_capacity) (self))
+    return;
+
+  size = gdk_array(get_size) (self);
+  new_size = 1 << g_bit_storage (MAX (GDK_ARRAY_REAL_SIZE (n), 16) - 1);
+
+#ifdef GDK_ARRAY_PREALLOC
+  if (self->start == self->preallocated)
+    {
+      self->start = g_new (_T_, new_size);
+      memcpy (self->start, self->preallocated, sizeof (_T_) * GDK_ARRAY_REAL_SIZE (size));
+    }
+  else
+#endif
+#ifdef GDK_ARRAY_NULL_TERMINATED
+  if (self->start == NULL)
+    {
+      self->start = g_new (_T_, new_size);
+      *self->start = *(_T_[1]) {};
+    }
+  else
+#endif
+    self->start = g_renew (_T_, self->start, new_size);
+
+  self->end = self->start + size;
+  self->end_allocation = self->start + new_size;
+#ifdef GDK_ARRAY_NULL_TERMINATED
+  self->end_allocation--;
+#endif
+}
+
+G_GNUC_UNUSED static void
+gdk_array(splice) (GdkArray *self,
+                   gsize      pos,
+                   gsize      removed,
+                   _T_       *additions,
+                   gsize      added)
+{
+  gsize size;
+  gsize remaining;
+
+  size = gdk_array(get_size) (self);
+  g_assert (pos + removed <= size);
+  remaining = size - pos - removed;
+
+  gdk_array(free_elements) (gdk_array(index) (self, pos),
+                            gdk_array(index) (self, pos + removed));
+
+  gdk_array(reserve) (self, size - removed + added);
+
+  if (GDK_ARRAY_REAL_SIZE (remaining) && removed != added)
+    memmove (gdk_array(index) (self, pos + added),
+             gdk_array(index) (self, pos + removed),
+             GDK_ARRAY_REAL_SIZE (remaining) * sizeof (_T_));
+
+  if (added)
+    {
+      if (additions)
+        memcpy (gdk_array(index) (self, pos),
+                additions,
+                added * sizeof (_T_));
+      else
+        memset (gdk_array(index) (self, pos), 0, added * sizeof (_T_));
+    }
+
+
+  /* might overflow, but does the right thing */
+  self->end += added - removed;
+}
+
+G_GNUC_UNUSED static void
+gdk_array(set_size) (GdkArray *self,
+                     gsize     new_size)
+{
+  gsize old_size = gdk_array(get_size) (self);
+  if (new_size > old_size)
+    gdk_array(splice) (self, old_size, 0, NULL, new_size - old_size);
+  else
+    gdk_array(splice) (self, new_size, old_size - new_size, NULL, 0);
+}
+
+G_GNUC_UNUSED static void
+gdk_array(append) (GdkArray *self,
+#ifdef GDK_ARRAY_BY_VALUE
+                   _T_       *value)
+#else
+                   _T_        value)
+#endif
+{
+  gdk_array(splice) (self, 
+                     gdk_array(get_size) (self),
+                     0,
+#ifdef GDK_ARRAY_BY_VALUE
+                     value,
+#else
+                     &value,
+#endif
+                     1);
+}
+
+#ifdef GDK_ARRAY_BY_VALUE
+G_GNUC_UNUSED static _T_ *
+gdk_array(get) (const GdkArray *self,
+                gsize           pos)
+{
+  return gdk_array(index) (self, pos);
+}
+#else
+G_GNUC_UNUSED static _T_
+gdk_array(get) (const GdkArray *self,
+                gsize           pos)
+ {
+   return *gdk_array(index) (self, pos);
+ }
+#endif
+
+#ifndef GDK_ARRAY_NO_UNDEF
+
+#undef _T_
+#undef GdkArray
+#undef gdk_array_paste_more
+#undef gdk_array_paste
+#undef gdk_array
+#undef GDK_ARRAY_REAL_SIZE
+
+#undef GDK_ARRAY_BY_VALUE
+#undef GDK_ARRAY_ELEMENT_TYPE
+#undef GDK_ARRAY_FREE_FUNC
+#undef GDK_ARRAY_NAME
+#undef GDK_ARRAY_NULL_TERMINATED
+#undef GDK_ARRAY_PREALLOC
+#undef GDK_ARRAY_TYPE_NAME
+
+#endif
--- a/gdk/wayland/gdkdisplay-wayland.c
+++ b/gdk/wayland/gdkdisplay-wayland.c
@@ -544,6 +544,12 @@ gdk_registry_handle_global (void               *data,
      gdk_wayland_display_init_xdg_output (display_wayland);
      _gdk_wayland_display_async_roundtrip (display_wayland);
    }
+  else if (strcmp(interface, "zwp_idle_inhibit_manager_v1") == 0)
+    {
+      display_wayland->idle_inhibit_manager =
+        wl_registry_bind (display_wayland->wl_registry, id,
+                          &zwp_idle_inhibit_manager_v1_interface, 1);
+    }

  g_hash_table_insert (display_wayland->known_globals,
                       GUINT_TO_POINTER (id), g_strdup (interface));
--- a/gdk/wayland/gdkdisplay-wayland.h
+++ b/gdk/wayland/gdkdisplay-wayland.h
@@ -35,6 +35,7 @@
 #include <gdk/wayland/keyboard-shortcuts-inhibit-unstable-v1-client-protocol.h>
 #include <gdk/wayland/server-decoration-client-protocol.h>
 #include <gdk/wayland/xdg-output-unstable-v1-client-protocol.h>
+#include <gdk/wayland/idle-inhibit-unstable-v1-client-protocol.h>

 #include <glib.h>
 #include <gdk/gdkkeys.h>
@@ -109,6 +110,7 @@ struct _GdkWaylandDisplay
  struct zwp_keyboard_shortcuts_inhibit_manager_v1 *keyboard_shortcuts_inhibit;
  struct org_kde_kwin_server_decoration_manager *server_decoration_manager;
  struct zxdg_output_manager_v1 *xdg_output_manager;
+  struct zwp_idle_inhibit_manager_v1 *idle_inhibit_manager;

  GList *async_roundtrips;

--- a/gdk/wayland/gdksurface-wayland.c
+++ b/gdk/wayland/gdksurface-wayland.c
@@ -191,6 +191,9 @@ struct _GdkWaylandSurface

  struct zxdg_imported_v1 *imported_transient_for;
  GHashTable *shortcuts_inhibitors;
+
+  struct zwp_idle_inhibitor_v1 *idle_inhibitor;
+  size_t idle_inhibitor_refcount;
 };

 struct _GdkWaylandSurfaceClass
@@ -1648,6 +1651,38 @@ create_zxdg_toplevel_v6_resources (GdkSurface *surface)
                                 surface);
 }

+void
+gdk_wayland_surface_set_application_id (GdkSurface *surface, const char* application_id)
+{
+  GdkWaylandSurface *impl;
+  GdkWaylandDisplay *display_wayland;
+
+  g_return_if_fail (application_id != NULL);
+
+  if (GDK_SURFACE_DESTROYED (surface))
+    return;
+
+  if (!is_realized_toplevel (surface))
+    return;
+
+  display_wayland = GDK_WAYLAND_DISPLAY (gdk_surface_get_display (surface));
+  impl = GDK_WAYLAND_SURFACE (surface);
+
+  switch (display_wayland->shell_variant)
+    {
+    case GDK_WAYLAND_SHELL_VARIANT_XDG_SHELL:
+      xdg_toplevel_set_app_id (impl->display_server.xdg_toplevel,
+                               application_id);
+      break;
+    case GDK_WAYLAND_SHELL_VARIANT_ZXDG_SHELL_V6:
+      zxdg_toplevel_v6_set_app_id (impl->display_server.zxdg_toplevel_v6,
+                                   application_id);
+      break;
+    default:
+      g_assert_not_reached ();
+    }
+}
+
 static void
 gdk_wayland_surface_create_xdg_toplevel (GdkSurface *surface)
 {
@@ -1702,19 +1737,7 @@ gdk_wayland_surface_create_xdg_toplevel (GdkSurface *surface)
  if (app_id == NULL)
    app_id = "GTK+ Application";

-  switch (display_wayland->shell_variant)
-    {
-    case GDK_WAYLAND_SHELL_VARIANT_XDG_SHELL:
-      xdg_toplevel_set_app_id (impl->display_server.xdg_toplevel,
-                               app_id);
-      break;
-    case GDK_WAYLAND_SHELL_VARIANT_ZXDG_SHELL_V6:
-      zxdg_toplevel_v6_set_app_id (impl->display_server.zxdg_toplevel_v6,
-                                   app_id);
-      break;
-    default:
-      g_assert_not_reached ();
-    }
+  gdk_wayland_surface_set_application_id (surface, app_id);

  maybe_set_gtk_surface_dbus_properties (surface);
  maybe_set_gtk_surface_modal (surface);
@@ -1964,6 +1987,39 @@ gdk_wayland_surface_announce_csd (GdkSurface *surface)
                                                ORG_KDE_KWIN_SERVER_DECORATION_MANAGER_MODE_CLIENT);
 }

+gboolean
+gdk_wayland_surface_inhibit_idle (GdkSurface *surface)
+{
+  GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (gdk_surface_get_display (surface));
+  GdkWaylandSurface *impl = GDK_WAYLAND_SURFACE (surface);
+
+  if (!display_wayland->idle_inhibit_manager)
+    return false;
+  if (!impl->idle_inhibitor)
+    {
+      g_assert (impl->idle_inhibitor_refcount == 0);
+      impl->idle_inhibitor =
+        zwp_idle_inhibit_manager_v1_create_inhibitor (display_wayland->idle_inhibit_manager,
+                                                     impl->display_server.wl_surface);
+    }
+  ++impl->idle_inhibitor_refcount;
+  return true;
+}
+
+void
+gdk_wayland_surface_uninhibit_idle (GdkSurface *surface)
+{
+  GdkWaylandSurface *impl = GDK_WAYLAND_SURFACE (surface);
+
+  g_assert (impl->idle_inhibitor && impl->idle_inhibitor_refcount > 0);
+
+  if (--impl->idle_inhibitor_refcount == 0)
+    {
+      zwp_idle_inhibitor_v1_destroy (impl->idle_inhibitor);
+      impl->idle_inhibitor = NULL;
+    }
+}
+
 static void
 calculate_popup_rect (GdkSurface     *surface,
                      GdkPopupLayout *layout,
--- a/gdk/wayland/gdkwaylandsurface.h
+++ b/gdk/wayland/gdkwaylandsurface.h
@@ -74,8 +74,15 @@ GDK_AVAILABLE_IN_ALL
 gboolean                 gdk_wayland_surface_set_transient_for_exported (GdkSurface *surface,
                                                                         char      *parent_handle_str);

+GDK_AVAILABLE_IN_ALL
+void                     gdk_wayland_surface_set_application_id (GdkSurface *surface,
+                                                                 const char *application_id);
+
 void gdk_wayland_surface_announce_csd                        (GdkSurface *surface);

+gboolean gdk_wayland_surface_inhibit_idle                    (GdkSurface *surface);
+void gdk_wayland_surface_uninhibit_idle                      (GdkSurface *surface);
+
 G_END_DECLS

 #endif /* __GDK_WAYLAND_SURFACE_H__ */
--- a/gdk/wayland/meson.build
+++ b/gdk/wayland/meson.build
@@ -54,6 +54,7 @@ proto_sources = [
  ['keyboard-shortcuts-inhibit', 'unstable', 'v1', ],
  ['server-decoration', 'private' ],
  ['xdg-output', 'unstable', 'v1', ],
+  ['idle-inhibit', 'unstable', 'v1', ],
 ]

 gdk_wayland_gen_headers = []
--- a/gdk/x11/gdkclipboard-x11.c
+++ b/gdk/x11/gdkclipboard-x11.c
@@ -653,6 +653,8 @@ gdk_x11_clipboard_store_async (GdkClipboard        *clipboard,
      GDK_DISPLAY_NOTE (display, CLIPBOARD,
                g_printerr ("%s: X error during ConvertSelection() while storing selection: %d\n", cb->selection, error));
    }
+
+  g_free (atoms);
 }

 static gboolean
--- a/gdk/x11/gdkdevicemanager-xi2.c
+++ b/gdk/x11/gdkdevicemanager-xi2.c
@@ -1874,6 +1874,7 @@ gdk_x11_device_manager_xi2_translate_event (GdkEventTranslator *translator,
    case XI_Leave:
      {
        XIEnterEvent *xev = (XIEnterEvent *) ev;
+        GdkModifierType state;

        GDK_DISPLAY_NOTE (display, EVENTS,
                  g_message ("%s notify:\twindow %ld\n\tsubwindow:%ld\n"
@@ -1890,6 +1891,18 @@ gdk_x11_device_manager_xi2_translate_event (GdkEventTranslator *translator,
        source_device = g_hash_table_lookup (device_manager->id_table,
                                             GUINT_TO_POINTER (xev->sourceid));

+        state = _gdk_x11_device_xi2_translate_state (&xev->mods, &xev->buttons, &xev->group);
+
+        /* Ignore normal crossing events while there is an implicit grab.
+         * We will receive a crossing event with one of the other details if
+         * the implicit grab were finished (eg. releasing the button outside
+         * the window triggers a XINotifyUngrab leave).
+         */
+        if (xev->mode == XINotifyNormal &&
+            (state & (GDK_BUTTON1_MASK | GDK_BUTTON2_MASK | GDK_BUTTON3_MASK |
+                      GDK_BUTTON4_MASK | GDK_BUTTON5_MASK)))
+          break;
+
        if (ev->evtype == XI_Enter &&
            xev->detail != XINotifyInferior && xev->mode != XINotifyPassiveUngrab &&
            GDK_IS_TOPLEVEL (surface))
@@ -1916,12 +1929,11 @@ gdk_x11_device_manager_xi2_translate_event (GdkEventTranslator *translator,
                                        device,
                                        source_device,
                                        xev->time,
-                                        _gdk_x11_device_xi2_translate_state (&xev->mods, &xev->buttons, &xev->group),
+                                        state,
                                        (double) xev->event_x / scale,
                                        (double) xev->event_y / scale,
                                        translate_crossing_mode (xev->mode),
                                        translate_notify_type (xev->detail));
-           
      }
      break;
    case XI_FocusIn:
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -1184,7 +1184,7 @@ _gdk_wm_protocols_filter (const XEvent  *xevent,
          if (timings)
            timings->drawn_time = frame_drawn_time;

-          if (surface_impl->toplevel->frame_pending)
+          if (!surface_impl->toplevel->frame_still_painting && surface_impl->toplevel->frame_pending)
            {
              surface_impl->toplevel->frame_pending = FALSE;
              gdk_surface_thaw_updates (win);
--- a/gdk/x11/gdkglcontext-x11.c
+++ b/gdk/x11/gdkglcontext-x11.c
@@ -184,7 +184,7 @@ gdk_x11_gl_context_end_frame (GdkDrawContext *draw_context,
  gdk_x11_surface_pre_damage (surface);

 #ifdef HAVE_XDAMAGE
-  if (context_x11->xdamage != 0)
+  if (context_x11->xdamage != 0 && _gdk_x11_surface_syncs_frames (surface))
    {
      g_assert (context_x11->frame_fence == 0);

@@ -582,6 +582,23 @@ create_legacy_context (GdkDisplay   *display,
 }

 #ifdef HAVE_XDAMAGE
+static void
+finish_frame (GdkGLContext *context)
+{
+  GdkX11GLContext *context_x11 = GDK_X11_GL_CONTEXT (context);
+  GdkSurface *surface = gdk_gl_context_get_surface (context);
+
+  if (context_x11->xdamage == 0)
+    return;
+
+  if (context_x11->frame_fence == 0)
+    return;
+
+  glDeleteSync (context_x11->frame_fence);
+  context_x11->frame_fence = 0;
+  _gdk_x11_surface_set_frame_still_painting (surface, FALSE);
+}
+
 static void
 bind_context_for_frame_fence (GdkGLContext *context)
 {
@@ -628,7 +645,6 @@ on_gl_surface_xevent (GdkGLContext   *context,
                      GdkX11Display  *display_x11)
 {
  GdkX11GLContext *context_x11 = GDK_X11_GL_CONTEXT (context);
-  GdkSurface *surface = gdk_gl_context_get_surface (context);
  XDamageNotifyEvent *damage_xevent;

  if (!context_x11->is_attached)
@@ -675,9 +691,7 @@ on_gl_surface_xevent (GdkGLContext   *context,
          case GL_WAIT_FAILED:
            if (wait_result == GL_WAIT_FAILED)
              g_warning ("failed to wait on GL fence associated with last swap buffers call");
-            glDeleteSync (context_x11->frame_fence);
-            context_x11->frame_fence = 0;
-            _gdk_x11_surface_set_frame_still_painting (surface, FALSE);
+            finish_frame (context);
            break;

          /* We assume that if the fence hasn't been signaled, that this
@@ -696,6 +710,21 @@ on_gl_surface_xevent (GdkGLContext   *context,

  return FALSE;
 }
+
+static void
+on_surface_state_changed (GdkGLContext *context)
+{
+  GdkSurface *surface = gdk_gl_context_get_surface (context);
+
+  if ((surface->state & GDK_SURFACE_STATE_WITHDRAWN) == 0)
+    return;
+
+  /* If we're about to withdraw the surface, then we don't care if the frame is
+   * still getting rendered by the GPU. The compositor is going to remove the surface
+   * from the scene anyway, so wrap up the frame.
+   */
+  finish_frame (context);
+}
 #endif

 static gboolean
@@ -878,13 +907,23 @@ gdk_x11_gl_context_realize (GdkGLContext  *context,
                                            gdk_x11_surface_get_xid (surface),
                                            XDamageReportRawRectangles);
      if (gdk_x11_display_error_trap_pop (display))
-        context_x11->xdamage = 0;
+        {
+          context_x11->xdamage = 0;
+        }
      else
-        g_signal_connect_object (G_OBJECT (display),
-                                 "xevent",
-                                 G_CALLBACK (on_gl_surface_xevent),
-                                 context,
-                                 G_CONNECT_SWAPPED);
+        {
+          g_signal_connect_object (G_OBJECT (display),
+                                   "xevent",
+                                   G_CALLBACK (on_gl_surface_xevent),
+                                   context,
+                                   G_CONNECT_SWAPPED);
+          g_signal_connect_object (G_OBJECT (surface),
+                                   "notify::state",
+                                   G_CALLBACK (on_surface_state_changed),
+                                   context,
+                                   G_CONNECT_SWAPPED);
+
+        }
    }
 #endif

--- a/gdk/x11/gdksurface-x11.c
+++ b/gdk/x11/gdksurface-x11.c
@@ -360,8 +360,8 @@ gdk_x11_surface_begin_frame (GdkSurface *surface,
    }
 }

-static gboolean
-should_sync_frame_drawing (GdkSurface *surface)
+gboolean
+_gdk_x11_surface_syncs_frames (GdkSurface *surface)
 {
  GdkX11Surface *impl = GDK_X11_SURFACE (surface);

@@ -395,7 +395,7 @@ static void
 maybe_sync_counter_for_end_frame (GdkSurface *surface)
 {
  GdkX11Surface *impl = GDK_X11_SURFACE (surface);
-  gboolean frame_sync_negotiated = should_sync_frame_drawing (surface);
+  gboolean frame_sync_negotiated = _gdk_x11_surface_syncs_frames (surface);
  gboolean frame_done_painting = !impl->toplevel->frame_pending;

 #ifdef HAVE_XDAMAGE
@@ -478,7 +478,7 @@ gdk_x11_surface_end_frame (GdkSurface *surface)

      maybe_sync_counter_for_end_frame (surface);

-      if (should_sync_frame_drawing (surface))
+      if (_gdk_x11_surface_syncs_frames (surface))
        {
          impl->toplevel->frame_pending = TRUE;
          gdk_surface_freeze_updates (surface);
--- a/gdk/x11/gdksurface-x11.h
+++ b/gdk/x11/gdksurface-x11.h
@@ -179,6 +179,7 @@ GdkCursor      *_gdk_x11_surface_get_cursor          (GdkSurface *window);
 void            _gdk_x11_surface_update_size         (GdkX11Surface *impl);
 void            _gdk_x11_surface_set_surface_scale   (GdkSurface *window,
                                                      int        scale);
+gboolean        _gdk_x11_surface_syncs_frames        (GdkSurface *surface);

 void            gdk_x11_surface_pre_damage           (GdkSurface *surface);

@@ -188,6 +189,7 @@ void            gdk_x11_surface_move                 (GdkSurface *surface,
 void            gdk_x11_surface_check_monitor        (GdkSurface *surface,
                                                      GdkMonitor *monitor);

+
 G_END_DECLS

 #endif /* __GDK_X11_SURFACE__ */
--- a/gsk/gl/gskglrenderer.c
+++ b/gsk/gl/gskglrenderer.c
@@ -2241,12 +2241,23 @@ render_cross_fade_node (GskGLRenderer   *self,
 {
  GskRenderNode *start_node = gsk_cross_fade_node_get_start_child (node);
  GskRenderNode *end_node = gsk_cross_fade_node_get_end_child (node);
-  float progress = gsk_cross_fade_node_get_progress (node);
+  const float progress = gsk_cross_fade_node_get_progress (node);
  TextureRegion start_region;
  TextureRegion end_region;
  gboolean is_offscreen1, is_offscreen2;
  OpCrossFade *op;

+  if (progress <= 0)
+    {
+      gsk_gl_renderer_add_render_ops (self, start_node, builder);
+      return;
+    }
+  else if (progress >= 1)
+    {
+      gsk_gl_renderer_add_render_ops (self, end_node, builder);
+      return;
+    }
+
  /* TODO: We create 2 textures here as big as the cross-fade node, but both the
   * start and the end node might be a lot smaller than that. */

@@ -2266,11 +2277,10 @@ render_cross_fade_node (GskGLRenderer   *self,
                          &end_region, &is_offscreen2,
                          FORCE_OFFSCREEN | RESET_CLIP | RESET_OPACITY))
    {
-      load_vertex_data_with_region (ops_draw (builder, NULL),
-                                    node,
-                                    builder,
-                                    &start_region,
-                                    TRUE);
+      const float prev_opacity = ops_set_opacity (builder, builder->current_opacity * progress);
+      gsk_gl_renderer_add_render_ops (self, start_node, builder);
+      ops_set_opacity (builder, prev_opacity);
+
      return;
    }

--- a/gsk/gskrendernodeimpl.c
+++ b/gsk/gskrendernodeimpl.c
@@ -104,7 +104,7 @@ gsk_color_node_peek_color (GskRenderNode *node)
 }

 /**
- * gsk_color_node_new: 
+ * gsk_color_node_new:
 * @rgba: a #GdkRGBA specifying a color
 * @bounds: the rectangle to render the color into
 *
@@ -216,7 +216,7 @@ gsk_linear_gradient_node_diff (GskRenderNode  *node1,

      return;
    }
-  
+
  gsk_render_node_diff_impossible (node1, node2, region);
 }

@@ -1163,7 +1163,7 @@ gsk_inset_shadow_node_diff (GskRenderNode  *node1,
 }

 /**
- * gsk_inset_shadow_node_new: 
+ * gsk_inset_shadow_node_new:
 * @outline: outline of the region containing the shadow
 * @color: color of the shadow
 * @dx: horizontal offset of shadow
@@ -1465,7 +1465,7 @@ gsk_outset_shadow_node_diff (GskRenderNode  *node1,
 }

 /**
- * gsk_outset_shadow_node_new: 
+ * gsk_outset_shadow_node_new:
 * @outline: outline of the region surrounded by shadow
 * @color: color of the shadow
 * @dx: horizontal offset of shadow
@@ -1672,7 +1672,7 @@ gsk_cairo_node_peek_surface (GskRenderNode *node)
 }

 /**
- * gsk_cairo_node_new: 
+ * gsk_cairo_node_new:
 * @bounds: the rectangle to render to
 *
 * Creates a #GskRenderNode that will render a cairo surface
@@ -1982,7 +1982,7 @@ gsk_transform_node_draw (GskRenderNode *node,
                            ctm.xy, ctm.yy,
                            ctm.x0, ctm.y0));
  cairo_transform (cr, &ctm);
-  
+
  gsk_render_node_draw (self->child, cr);
 }

@@ -2062,7 +2062,7 @@ gsk_transform_node_diff (GskRenderNode  *node1,
 }

 /**
- * gsk_transform_node_new: 
+ * gsk_transform_node_new:
 * @child: The node to transform
 * @transform: (transfer none): The transform to apply
 *
@@ -2188,7 +2188,7 @@ gsk_opacity_node_diff (GskRenderNode  *node1,
 }

 /**
- * gsk_opacity_node_new: 
+ * gsk_opacity_node_new:
 * @child: The node to draw
 * @opacity: The opacity to apply
 *
@@ -2380,7 +2380,7 @@ nope:
 }

 /**
- * gsk_color_matrix_node_new: 
+ * gsk_color_matrix_node_new:
 * @child: The node to draw
 * @color_matrix: The matrix to apply
 * @color_offset: Values to add to the color
@@ -2533,7 +2533,7 @@ gsk_repeat_node_draw (GskRenderNode *node,
 }

 /**
- * gsk_repeat_node_new: 
+ * gsk_repeat_node_new:
 * @bounds: The bounds of the area to be painted
 * @child: The child to repeat
 * @child_bounds: (allow-none): The area of the child to repeat or %NULL to
@@ -2670,7 +2670,7 @@ gsk_clip_node_diff (GskRenderNode  *node1,
 }

 /**
- * gsk_clip_node_new: 
+ * gsk_clip_node_new:
 * @child: The node to draw
 * @clip: The clip to apply
 *
@@ -2800,7 +2800,7 @@ gsk_rounded_clip_node_diff (GskRenderNode  *node1,
 }

 /**
- * gsk_rounded_clip_node_new: 
+ * gsk_rounded_clip_node_new:
 * @child: The node to draw
 * @clip: The clip to apply
 *
@@ -3013,7 +3013,7 @@ gsk_shadow_node_get_bounds (GskShadowNode *self,
 }

 /**
- * gsk_shadow_node_new: 
+ * gsk_shadow_node_new:
 * @child: The node to draw
 * @shadows: (array length=n_shadows): The shadows to apply
 * @n_shadows: number of entries in the @shadows array
@@ -3210,7 +3210,7 @@ gsk_blend_node_diff (GskRenderNode  *node1,
 }

 /**
- * gsk_blend_node_new: 
+ * gsk_blend_node_new:
 * @bottom: The bottom node to be drawn
 * @top: The node to be blended onto the @bottom node
 * @blend_mode: The blend mode to use
@@ -3359,7 +3359,7 @@ gsk_cross_fade_node_diff (GskRenderNode  *node1,
 }

 /**
- * gsk_cross_fade_node_new: 
+ * gsk_cross_fade_node_new:
 * @start: The start node to be drawn
 * @end: The node to be cross_fadeed onto the @start node
 * @progress: How far the fade has progressed from start to end. The value will
@@ -3549,7 +3549,7 @@ font_has_color_glyphs (const PangoFont *font)
 }

 /**
- * gsk_text_node_new: 
+ * gsk_text_node_new:
 * @font: the #PangoFont containing the glyphs
 * @glyphs: the #PangoGlyphString to render
 * @color: the foreground color to render with
@@ -3953,7 +3953,7 @@ gsk_blur_node_diff (GskRenderNode  *node1,
 }

 /**
- * gsk_blur_node_new: 
+ * gsk_blur_node_new:
 * @child: the child node to blur
 * @radius: the blur radius
 *
@@ -4076,9 +4076,9 @@ gsk_debug_node_diff (GskRenderNode  *node1,
 }

 /**
- * gsk_debug_node_new: 
+ * gsk_debug_node_new:
 * @child: The child to add debug info for
- * @message: (transfer full): The debug message 
+ * @message: (transfer full): The debug message
 *
 * Creates a #GskRenderNode that will add debug information about
 * the given @child.
--- a/gsk/gsktransform.c
+++ b/gsk/gsktransform.c
@@ -123,7 +123,8 @@ gsk_transform_alloc (const GskTransformClass *transform_class,

  self->transform_class = transform_class;
  self->category = next ? MIN (category, next->category) : category;
-  self->next = gsk_transform_is_identity (next) ? NULL : next;
+  self->next = gsk_transform_is_identity (next) ? NULL : gsk_transform_ref (next);
+  g_clear_pointer (&next, gsk_transform_unref);

  return self;
 }
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -44,7 +44,6 @@
 #include <gtk/gtkappchooserbutton.h>
 #include <gtk/gtkapplication.h>
 #include <gtk/gtkapplicationwindow.h>
-#include <gtk/gtkarraystore.h>
 #include <gtk/gtkaspectframe.h>
 #include <gtk/gtkassistant.h>
 #include <gtk/gtkbinlayout.h>
@@ -134,7 +133,6 @@
 #include <gtk/gtkfontchooserdialog.h>
 #include <gtk/gtkfontchooserwidget.h>
 #include <gtk/gtkframe.h>
-#include <gtk/gtkfunctionslistitemfactory.h>
 #include <gtk/gtkgesture.h>
 #include <gtk/gtkgestureclick.h>
 #include <gtk/gtkgesturedrag.h>
@@ -215,6 +213,7 @@
 #include <gtk/gtkscrolledwindow.h>
 #include <gtk/gtksearchbar.h>
 #include <gtk/gtksearchentry.h>
+#include <gtk/gtkselectionfiltermodel.h>
 #include <gtk/gtkselectionmodel.h>
 #include <gtk/gtkseparator.h>
 #include <gtk/gtksettings.h>
--- a/gtk/gtkapplication-wayland.c
+++ b/gtk/gtkapplication-wayland.c
@@ -1,6 +1,7 @@
 /*
 * Copyright © 2010 Codethink Limited
 * Copyright © 2013 Canonical Limited
+ * Copyright © 2020 Emmanuel Gil Peyrot
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -24,12 +25,42 @@
 #include "gtknative.h"

 #include <gdk/wayland/gdkwayland.h>
+#include <gdk/wayland/gdkdisplay-wayland.h>
+#include <gdk/wayland/idle-inhibit-unstable-v1-client-protocol.h>

-typedef GtkApplicationImplDBusClass GtkApplicationImplWaylandClass;
+typedef struct
+{
+  GtkApplicationImplDBusClass parent_class;
+
+  /* stores the dbus version of the overriden methods */
+  guint (*dbus_inhibit) (GtkApplicationImpl         *impl,
+                         GtkWindow                  *window,
+                         GtkApplicationInhibitFlags  flags,
+                         const gchar                *reason);
+  void (*dbus_uninhibit) (GtkApplicationImpl *impl,
+                          guint               cookie);
+} GtkApplicationImplWaylandClass;
+
+typedef struct
+{
+  guint cookie;
+  guint dbus_cookie;
+  GtkApplicationInhibitFlags flags;
+  GdkSurface *surface;
+
+} GtkApplicationWaylandInhibitor;
+
+static void
+gtk_application_wayland_inhibitor_free (GtkApplicationWaylandInhibitor *inhibitor)
+{
+  g_slice_free (GtkApplicationWaylandInhibitor, inhibitor);
+}

 typedef struct
 {
  GtkApplicationImplDBus dbus;
+  GSList *inhibitors;
+  guint next_cookie;

 } GtkApplicationImplWayland;

@@ -72,6 +103,70 @@ gtk_application_impl_wayland_before_emit (GtkApplicationImpl *impl,
  gdk_wayland_display_set_startup_notification_id (gdk_display_get_default (), startup_notification_id);
 }

+static guint
+gtk_application_impl_wayland_inhibit (GtkApplicationImpl         *impl,
+                                      GtkWindow                  *window,
+                                      GtkApplicationInhibitFlags  flags,
+                                      const gchar                *reason)
+{
+  GtkApplicationImplWayland *wayland = (GtkApplicationImplWayland *) impl;
+  GdkSurface *surface;
+  GtkApplicationWaylandInhibitor *inhibitor;
+  gboolean success;
+
+  if (!flags)
+    return 0;
+
+  inhibitor = g_slice_new (GtkApplicationWaylandInhibitor);
+  inhibitor->cookie = ++wayland->next_cookie;
+  inhibitor->flags = flags;
+  wayland->inhibitors = g_slist_prepend (wayland->inhibitors, inhibitor);
+
+  if (flags & GTK_APPLICATION_INHIBIT_IDLE)
+    {
+      surface = gtk_native_get_surface (GTK_NATIVE (window));
+      if (GDK_IS_WAYLAND_SURFACE (surface))
+        {
+          success = gdk_wayland_surface_inhibit_idle (surface);
+          if (success)
+            {
+              flags &= ~GTK_APPLICATION_INHIBIT_IDLE;
+              inhibitor->surface = surface;
+            }
+        }
+    }
+
+  inhibitor->dbus_cookie = ((GtkApplicationImplWaylandClass *) G_OBJECT_GET_CLASS (wayland))->dbus_inhibit (impl, window, flags, reason);
+
+  return inhibitor->cookie;
+}
+
+static void
+gtk_application_impl_wayland_uninhibit (GtkApplicationImpl *impl,
+                                        guint               cookie)
+{
+  GtkApplicationImplWayland *wayland = (GtkApplicationImplWayland *) impl;
+  GSList *iter;
+
+  for (iter = wayland->inhibitors; iter; iter = iter->next)
+    {
+      GtkApplicationWaylandInhibitor *inhibitor = iter->data;
+
+      if (inhibitor->cookie == cookie)
+        {
+          if (inhibitor->dbus_cookie)
+            ((GtkApplicationImplWaylandClass *) G_OBJECT_GET_CLASS (wayland))->dbus_uninhibit (impl, inhibitor->dbus_cookie);
+          if (inhibitor->surface)
+            gdk_wayland_surface_uninhibit_idle (inhibitor->surface);
+          gtk_application_wayland_inhibitor_free (inhibitor);
+          wayland->inhibitors = g_slist_delete_link (wayland->inhibitors, iter);
+          return;
+        }
+    }
+
+  g_warning ("Invalid inhibitor cookie");
+}
+
 static void
 gtk_application_impl_wayland_init (GtkApplicationImplWayland *wayland)
 {
@@ -82,8 +177,15 @@ gtk_application_impl_wayland_class_init (GtkApplicationImplWaylandClass *class)
 {
  GtkApplicationImplClass *impl_class = GTK_APPLICATION_IMPL_CLASS (class);

+  class->dbus_inhibit = impl_class->inhibit;
+  class->dbus_uninhibit = impl_class->uninhibit;
+
  impl_class->handle_window_realize =
    gtk_application_impl_wayland_handle_window_realize;
  impl_class->before_emit =
    gtk_application_impl_wayland_before_emit;
+  impl_class->inhibit =
+    gtk_application_impl_wayland_inhibit;
+  impl_class->uninhibit =
+    gtk_application_impl_wayland_uninhibit;
 }
--- a/gtk/gtkapplicationaccels.c
+++ b/gtk/gtkapplicationaccels.c
@@ -109,6 +109,7 @@ gtk_application_accels_set_accels_for_action (GtkApplicationAccels *accels,
        }

      g_list_store_remove (G_LIST_STORE (accels->shortcuts), i);
+      g_object_unref (shortcut_i);
      break;
    }

--- a/gtk/gtkarraystore.c
+++ b/gtk/gtkarraystore.c
@@ -1,287 +0,0 @@
-/*
- * Copyright © 2020 Benjamin Otte
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Benjamin Otte <otte@gnome.org>
- */
-
-#include "config.h"
-
-#include "gtkarraystore.h"
-
-#define GTK_VECTOR_ELEMENT_TYPE GObject *
-#define GTK_VECTOR_FREE_FUNC g_object_unref
-#include "gtkvectorimpl.c"
-
-/**
- * SECTION:gtkarraystore
- * @title: GtkArrayStore
- * @short_description: A simple array implementation of #GListModel
- *
- * #GtkArrayStore is a simple implementation of #GListModel that stores all
- * items in memory.
- *
- * It provides appending, deletions, and lookups in O(1) time and insertions
- * in O(N) time. it is implemented using an array.
- */
-
-/**
- * GtkArrayStore:
- *
- * #GtkArrayStore is an opaque data structure and can only be accessed
- * using the following functions.
- **/
-
-struct _GtkArrayStore
-{
-  GObject parent_instance;
-
-  GType item_type;
-  GtkVector items;
-};
-
-enum
-{
-  PROP_0,
-  PROP_ITEM_TYPE,
-  N_PROPERTIES
-};
-
-static void gtk_array_store_iface_init (GListModelInterface *iface);
-
-G_DEFINE_TYPE_WITH_CODE (GtkArrayStore, gtk_array_store, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, gtk_array_store_iface_init));
-
-static void
-gtk_array_store_dispose (GObject *object)
-{
-  GtkArrayStore *self = GTK_ARRAY_STORE (object);
-
-  gtk_vector_clear (&self->items);
-
-  G_OBJECT_CLASS (gtk_array_store_parent_class)->dispose (object);
-}
-
-static void
-gtk_array_store_get_property (GObject    *object,
-                              guint       property_id,
-                              GValue     *value,
-                              GParamSpec *pspec)
-{
-  GtkArrayStore *self = GTK_ARRAY_STORE (object);
-
-  switch (property_id)
-    {
-    case PROP_ITEM_TYPE:
-      g_value_set_gtype (value, self->item_type);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-    }
-}
-
-static void
-gtk_array_store_set_property (GObject      *object,
-                              guint         property_id,
-                              const GValue *value,
-                              GParamSpec   *pspec)
-{
-  GtkArrayStore *self = GTK_ARRAY_STORE (object);
-
-  switch (property_id)
-    {
-    case PROP_ITEM_TYPE: /* construct-only */
-      g_assert (g_type_is_a (g_value_get_gtype (value), G_TYPE_OBJECT));
-      self->item_type = g_value_get_gtype (value);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-    }
-}
-
-static void
-gtk_array_store_class_init (GtkArrayStoreClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->dispose = gtk_array_store_dispose;
-  object_class->get_property = gtk_array_store_get_property;
-  object_class->set_property = gtk_array_store_set_property;
-
-  /**
-   * GtkArrayStore:item-type:
-   *
-   * The type of items contained in this list self. Items must be
-   * subclasses of #GObject.
-   **/
-  g_object_class_install_property (object_class, PROP_ITEM_TYPE,
-    g_param_spec_gtype ("item-type", "", "", G_TYPE_OBJECT,
-                        G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-}
-
-static GType
-gtk_array_store_get_item_type (GListModel *list)
-{
-  GtkArrayStore *self = GTK_ARRAY_STORE (list);
-
-  return self->item_type;
-}
-
-static guint
-gtk_array_store_get_n_items (GListModel *list)
-{
-  GtkArrayStore *self = GTK_ARRAY_STORE (list);
-
-  return gtk_vector_get_size (&self->items);
-}
-
-static gpointer
-gtk_array_store_get_item (GListModel *list,
-                          guint       position)
-{
-  GtkArrayStore *self = GTK_ARRAY_STORE (list);
-
-  if (position >= gtk_vector_get_size (&self->items))
-    return NULL;
-
-  return g_object_ref (gtk_vector_get (&self->items, position));
-}
-
-static void
-gtk_array_store_iface_init (GListModelInterface *iface)
-{
-  iface->get_item_type = gtk_array_store_get_item_type;
-  iface->get_n_items = gtk_array_store_get_n_items;
-  iface->get_item = gtk_array_store_get_item;
-}
-
-static void
-gtk_array_store_init (GtkArrayStore *self)
-{
-  gtk_vector_init (&self->items);
-}
-
-/**
- * gtk_array_store_new:
- * @item_type: the #GType of items in the list
- *
- * Creates a new #GtkArrayStore with items of type @item_type. @item_type
- * must be a subclass of #GObject.
- *
- * Returns: a new #GtkArrayStore
- */
-GtkArrayStore *
-gtk_array_store_new (GType item_type)
-{
-  g_return_val_if_fail (g_type_is_a (item_type, G_TYPE_OBJECT), NULL);
-
-  return g_object_new (GTK_TYPE_ARRAY_STORE,
-                       "item-type", item_type,
-                       NULL);
-}
-
-/**
- * gtk_array_store_append:
- * @self: a #GtkArrayStore
- * @item: (type GObject): the new item
- *
- * Appends @item to @self. @item must be of type #GtkArrayStore:item-type.
- *
- * This function takes a ref on @item.
- *
- * Use gtk_array_store_splice() to append multiple items at the same time
- * efficiently.
- */
-void
-gtk_array_store_append (GtkArrayStore *self,
-                        gpointer       item)
-{
-  guint position;
-
-  g_return_if_fail (GTK_IS_ARRAY_STORE (self));
-  g_return_if_fail (g_type_is_a (G_OBJECT_TYPE (item), self->item_type));
-
-  position = gtk_vector_get_size (&self->items);
-  gtk_vector_append (&self->items, g_object_ref (item));
-  g_list_model_items_changed (G_LIST_MODEL (self), position, 0, 1);
-}
-
-/**
- * gtk_array_store_remove_all:
- * @self: a #GtkArrayStore
- *
- * Removes all items from @self.
- *
- * Since: 2.44
- */
-void
-gtk_array_store_remove_all (GtkArrayStore *self)
-{
-  guint n_items;
-
-  g_return_if_fail (GTK_IS_ARRAY_STORE (self));
-
-  n_items = gtk_vector_get_size (&self->items);
-  gtk_vector_clear (&self->items);
-
-  g_list_model_items_changed (G_LIST_MODEL (self), 0, n_items, 0);
-}
-
-/**
- * gtk_array_store_splice:
- * @self: a #GtkArrayStore
- * @position: the position at which to make the change
- * @n_removals: the number of items to remove
- * @additions: (array length=n_additions) (element-type GObject): the items to add
- * @n_additions: the number of items to add
- *
- * Changes @self by removing @n_removals items and adding @n_additions
- * items to it. @additions must contain @n_additions items of type
- * #GtkArrayStore:item-type.  %NULL is not permitted.
- *
- * This function is more efficient than gtk_array_store_insert() and
- * gtk_array_store_remove(), because it only emits
- * #GListModel::items-changed once for the change.
- *
- * This function takes a ref on each item in @additions.
- *
- * The parameters @position and @n_removals must be correct (ie:
- * @position + @n_removals must be less than or equal to the length of
- * the list at the time this function is called).
- *
- * Since: 2.44
- */
-void
-gtk_array_store_splice (GtkArrayStore *self,
-                        guint       position,
-                        guint       n_removals,
-                        gpointer   *additions,
-                        guint       n_additions)
-{
-  guint i;
-
-  g_return_if_fail (GTK_IS_ARRAY_STORE (self));
-  g_return_if_fail (position + n_removals >= position); /* overflow */
-  g_return_if_fail (position + n_removals <= gtk_vector_get_size (&self->items));
-
-  for (i = 0; i < n_additions; i++)
-    g_object_ref (additions[i]);
-
-  gtk_vector_splice (&self->items, position, n_removals, (GObject **) additions, n_additions);
-
-  g_list_model_items_changed (G_LIST_MODEL (self), position, n_removals, n_additions);
-}
--- a/gtk/gtkarraystore.h
+++ b/gtk/gtkarraystore.h
@@ -1,54 +0,0 @@
-/*
- * Copyright © 2020 Benjamin Otte
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Benjamin Otte <otte@gnome.org>
- */
-
-#ifndef __GTK_ARRAY_STORE_H__
-#define __GTK_ARRAY_STORE_H__
-
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
-#include <gdk/gdk.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_ARRAY_STORE (gtk_array_store_get_type ())
-GDK_AVAILABLE_IN_ALL
-G_DECLARE_FINAL_TYPE(GtkArrayStore, gtk_array_store, GTK, ARRAY_STORE, GObject)
-
-GDK_AVAILABLE_IN_ALL
-GtkArrayStore *         gtk_array_store_new                             (GType           item_type);
-
-GDK_AVAILABLE_IN_ALL
-void                    gtk_array_store_append                          (GtkArrayStore  *store,
-                                                                         gpointer        item);
-
-GDK_AVAILABLE_IN_ALL
-void                    gtk_array_store_remove_all                      (GtkArrayStore  *store);
-
-GDK_AVAILABLE_IN_ALL
-void                    gtk_array_store_splice                          (GtkArrayStore  *store,
-                                                                         guint           position,
-                                                                         guint           n_removals,
-                                                                         gpointer       *additions,
-                                                                         guint           n_additions);
-
-G_END_DECLS
-
-#endif /* __GTK_ARRAY_STORE_H__ */
--- a/gtk/gtkbitset.c
+++ b/gtk/gtkbitset.c
@@ -707,7 +707,7 @@ gtk_bitset_shift_right (GtkBitset *self,
 }

 /**
- * gtk_bitset_slice:
+ * gtk_bitset_splice:
 * @self: a #GtkBitset
 * @position: position at which to slice
 * @removed: number of values to remove
@@ -725,10 +725,10 @@ gtk_bitset_shift_right (GtkBitset *self,
 * up space that can then be filled.
 **/
 void
-gtk_bitset_slice (GtkBitset *self,
-                  guint      position,
-                  guint      removed,
-                  guint      added)
+gtk_bitset_splice (GtkBitset *self,
+                   guint      position,
+                   guint      removed,
+                   guint      added)
 {
  g_return_if_fail (self != NULL);
  /* overflow */
@@ -742,7 +742,7 @@ gtk_bitset_slice (GtkBitset *self,
      GtkBitset *shift = gtk_bitset_copy (self);

      gtk_bitset_remove_range (shift, 0, position);
-      gtk_bitset_remove_range (self, position, G_MAXUINT - position + 1);
+      gtk_bitset_remove_range_closed (self, position, G_MAXUINT);
      if (added > removed)
        gtk_bitset_shift_right (shift, added - removed);
      else
--- a/gtk/gtkbitset.h
+++ b/gtk/gtkbitset.h
@@ -125,7 +125,7 @@ GDK_AVAILABLE_IN_ALL
 void                    gtk_bitset_shift_right                  (GtkBitset              *self,
                                                                 guint                   amount);
 GDK_AVAILABLE_IN_ALL
-void                    gtk_bitset_slice                        (GtkBitset              *self,
+void                    gtk_bitset_splice                       (GtkBitset              *self,
                                                                 guint                   position,
                                                                 guint                   removed,
                                                                 guint                   added);
--- a/gtk/gtkbookmarklist.c
+++ b/gtk/gtkbookmarklist.c
@@ -369,6 +369,8 @@ gtk_bookmark_list_start_loading (GtkBookmarkList *self)
                                   self);
          g_object_unref (file);
        }
+
+      g_strfreev (uris);
    }
  else
    {
--- a/gtk/gtkbuilderlistitemfactory.c
+++ b/gtk/gtkbuilderlistitemfactory.c
@@ -29,7 +29,7 @@

 /**
 * SECTION:gtkbuilderlistitemfactory
- * @Tiitle: GtkBuilderListItemFactory
+ * @Title: GtkBuilderListItemFactory
 * @Short_description: A listitem factory using ui files
 *
 * #GtkBuilderListItemFactory is a #GtkListItemFactory that creates
--- a/gtk/gtkcolumnlistitemfactory.c
+++ b/gtk/gtkcolumnlistitemfactory.c
@@ -62,10 +62,12 @@ gtk_column_list_item_factory_setup (GtkListItemFactory *factory,
    {
      GtkColumnViewColumn *column = g_list_model_get_item (columns, i);

-      gtk_column_list_item_factory_add_column (self, 
+      gtk_column_list_item_factory_add_column (self,
                                               list_item->owner,
                                               column,
                                               FALSE);
+
+      g_object_unref (column);
    }
 }

--- a/gtk/gtkcolumnview.c
+++ b/gtk/gtkcolumnview.c
@@ -628,7 +628,7 @@ gtk_column_view_class_init (GtkColumnViewClass *klass)
    g_param_spec_object ("model",
                         P_("Model"),
                         P_("Model for the items displayed"),
-                         G_TYPE_LIST_MODEL,
+                         GTK_TYPE_SELECTION_MODEL,
                         G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);

  /**
@@ -940,7 +940,7 @@ header_drag_end (GtkGestureDrag *gesture,

      column = g_list_model_get_item (G_LIST_MODEL (self->columns), self->drag_pos);
      header = gtk_column_view_column_get_header (column);
-      gtk_style_context_remove_class (gtk_widget_get_style_context (header), "dnd");
+      gtk_widget_remove_css_class (header, "dnd");

      sequence = gtk_gesture_single_get_current_sequence (GTK_GESTURE_SINGLE (gesture));
      if (!gtk_gesture_handles_sequence (GTK_GESTURE (gesture), sequence))
@@ -1027,7 +1027,7 @@ header_drag_update (GtkGestureDrag *gesture,
          header = gtk_column_view_column_get_header (column);

          gtk_widget_insert_after (header, self->header, gtk_widget_get_last_child (self->header));
-          gtk_style_context_add_class (gtk_widget_get_style_context (header), "dnd");
+          gtk_widget_add_css_class (header, "dnd");

          gtk_gesture_set_state (GTK_GESTURE (gesture), GTK_EVENT_SEQUENCE_CLAIMED);
          if (!gtk_widget_has_focus (GTK_WIDGET (self)))
@@ -1202,7 +1202,7 @@ gtk_column_view_new (void)
 *
 * Returns: (nullable) (transfer none): The model in use
 **/
-GListModel *
+GtkSelectionModel *
 gtk_column_view_get_model (GtkColumnView *self)
 {
  g_return_val_if_fail (GTK_IS_COLUMN_VIEW (self), NULL);
@@ -1215,17 +1215,14 @@ gtk_column_view_get_model (GtkColumnView *self)
 * @self: a #GtkColumnView
 * @model: (allow-none) (transfer none): the model to use or %NULL for none
 *
- * Sets the #GListModel to use.
- *
- * If the @model is a #GtkSelectionModel, it is used for managing the selection.
- * Otherwise, @self creates a #GtkSingleSelection for the selection.
+ * Sets the #GtkSelectionModel to use.
 **/
 void
-gtk_column_view_set_model (GtkColumnView *self,
-                           GListModel  *model)
+gtk_column_view_set_model (GtkColumnView     *self,
+                           GtkSelectionModel *model)
 {
  g_return_if_fail (GTK_IS_COLUMN_VIEW (self));
-  g_return_if_fail (model == NULL || G_IS_LIST_MODEL (model));
+  g_return_if_fail (model == NULL || GTK_IS_SELECTION_MODEL (model));

  if (gtk_list_view_get_model (self->listview) == model)
    return;
--- a/gtk/gtkcolumnview.h
+++ b/gtk/gtkcolumnview.h
@@ -26,6 +26,7 @@

 #include <gtk/gtktypes.h>
 #include <gtk/gtksortlistmodel.h>
+#include <gtk/gtkselectionmodel.h>
 #include <gtk/gtksorter.h>

 G_BEGIN_DECLS
@@ -67,10 +68,10 @@ void            gtk_column_view_insert_column                   (GtkColumnView
                                                                 GtkColumnViewColumn    *column);

 GDK_AVAILABLE_IN_ALL
-GListModel *    gtk_column_view_get_model                       (GtkColumnView          *self);
+GtkSelectionModel * gtk_column_view_get_model                   (GtkColumnView          *self);
 GDK_AVAILABLE_IN_ALL
 void            gtk_column_view_set_model                       (GtkColumnView          *self,
-                                                                 GListModel             *model);
+                                                                 GtkSelectionModel      *model);

 GDK_AVAILABLE_IN_ALL
 gboolean        gtk_column_view_get_show_row_separators         (GtkColumnView          *self);
@@ -105,6 +106,7 @@ void            gtk_column_view_set_reorderable                 (GtkColumnView
 GDK_AVAILABLE_IN_ALL
 gboolean        gtk_column_view_get_reorderable                 (GtkColumnView          *self);

+GDK_AVAILABLE_IN_ALL
 void            gtk_column_view_set_enable_rubberband           (GtkColumnView          *self,
                                                                 gboolean                enable_rubberband);
 GDK_AVAILABLE_IN_ALL
--- a/gtk/gtkcolumnviewcolumn.h
+++ b/gtk/gtkcolumnviewcolumn.h
@@ -85,6 +85,7 @@ void                    gtk_column_view_column_set_header_menu          (GtkColu
 GDK_AVAILABLE_IN_ALL
 GMenuModel *            gtk_column_view_column_get_header_menu          (GtkColumnViewColumn    *self);

+GDK_AVAILABLE_IN_ALL
 void                    gtk_column_view_column_set_fixed_width          (GtkColumnViewColumn    *self,
                                                                         int                     fixed_width);
 GDK_AVAILABLE_IN_ALL
--- a/gtk/gtkcolumnviewsorter.c
+++ b/gtk/gtkcolumnviewsorter.c
@@ -115,6 +115,14 @@ gtk_column_view_sorter_dispose (GObject *object)
 {
  GtkColumnViewSorter *self = GTK_COLUMN_VIEW_SORTER (object);

+  /* The sorter is owned by the columview and is unreffed
+   * after the columns, so the sequence must be empty at
+   * this point.
+   * The sorter can outlive the columview it comes from
+   * (the model might still have a ref), but that does
+   * not change the fact that all columns will be gone.
+   */
+  g_assert (g_sequence_is_empty (self->sorters));
  g_clear_pointer (&self->sorters, g_sequence_free);

  G_OBJECT_CLASS (gtk_column_view_sorter_parent_class)->dispose (object);
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -560,10 +560,12 @@ css_provider_commit (GtkCssProvider  *css_provider,

  if (ruleset->styles == NULL)
    {
+      for (i = 0; i < n_selectors; i++)
+        _gtk_css_selector_free (selectors[i]);
      return;
    }

-  for (i = 0; i < n_selectors; i ++)
+  for (i = 0; i < n_selectors; i++)
    {
      GtkCssRuleset *new;

@@ -766,7 +768,11 @@ parse_selector_list (GtkCssScanner  *scanner,
      GtkCssSelector *select = _gtk_css_selector_parse (scanner->parser);

      if (select == NULL)
-        return 0;
+        {
+          for (int i = 0; i < n_selectors; i++)
+            g_clear_pointer (&out_selectors[i], _gtk_css_selector_free);
+          return 0;
+        }

      out_selectors[n_selectors] = select;
      n_selectors++;
@@ -776,6 +782,8 @@ parse_selector_list (GtkCssScanner  *scanner,
          gtk_css_parser_error_syntax (scanner->parser,
                                       "Only %u selectors per ruleset allowed",
                                       MAX_SELECTOR_LIST_LENGTH);
+          for (int i = 0; i < MAX_SELECTOR_LIST_LENGTH; i++)
+            g_clear_pointer (&out_selectors[i], _gtk_css_selector_free);
          return 0;
        }
    }
@@ -804,10 +812,7 @@ parse_declaration (GtkCssScanner *scanner,

  name = gtk_css_parser_consume_ident (scanner->parser);
  if (name == NULL)
-    {
-      gtk_css_parser_end_block (scanner->parser);
-      return;
-    }
+    goto out;

  property = _gtk_style_property_lookup (name);

@@ -819,25 +824,18 @@ parse_declaration (GtkCssScanner *scanner,
      if (!gtk_css_parser_try_token (scanner->parser, GTK_CSS_TOKEN_COLON))
        {
          gtk_css_parser_error_syntax (scanner->parser, "Expected ':'");
-          g_free (name);
-          gtk_css_parser_end_block (scanner->parser);
-          return;
+          goto out;
        }

-      value = _gtk_style_property_parse_value (property,
-                                               scanner->parser);
+      value = _gtk_style_property_parse_value (property, scanner->parser);

      if (value == NULL)
-        {
-          gtk_css_parser_end_block (scanner->parser);
-          return;
-        }
+        goto out;

      if (!gtk_css_parser_has_token (scanner->parser, GTK_CSS_TOKEN_EOF))
        {
          gtk_css_parser_error_syntax (scanner->parser, "Junk at end of value for %s", property->name);
-          gtk_css_parser_end_block (scanner->parser);
-          return;
+          goto out;
        }

      if (gtk_keep_css_sections)
@@ -882,6 +880,7 @@ parse_declaration (GtkCssScanner *scanner,
      gtk_css_parser_error_value (scanner->parser, "No property named \"%s\"", name);
    }

+out:
  g_free (name);

  gtk_css_parser_end_block (scanner->parser);
@@ -916,7 +915,7 @@ parse_ruleset (GtkCssScanner *scanner)
    {
      guint i;
      gtk_css_parser_error_syntax (scanner->parser, "Expected '{' after selectors");
-      for (i = 0; i < n_selectors; i ++)
+      for (i = 0; i < n_selectors; i++)
        _gtk_css_selector_free (selectors[i]);
      gtk_css_parser_skip_until (scanner->parser, GTK_CSS_TOKEN_OPEN_CURLY);
      gtk_css_parser_skip (scanner->parser);
--- a/gtk/gtkcssselectorprivate.h
+++ b/gtk/gtkcssselectorprivate.h
@@ -22,11 +22,11 @@
 #include "gtk/gtkcsstypesprivate.h"
 #include "gtk/gtkcssparserprivate.h"

-#define GTK_VECTOR_ELEMENT_TYPE gpointer
-#define GTK_VECTOR_TYPE_NAME GtkCssSelectorMatches
-#define GTK_VECTOR_NAME gtk_css_selector_matches
-#define GTK_VECTOR_PREALLOC 32
-#include "gtk/gtkvectorimpl.c"
+#define GDK_ARRAY_ELEMENT_TYPE gpointer
+#define GDK_ARRAY_TYPE_NAME GtkCssSelectorMatches
+#define GDK_ARRAY_NAME gtk_css_selector_matches
+#define GDK_ARRAY_PREALLOC 32
+#include "gdk/gdkarrayimpl.c"

 G_BEGIN_DECLS

--- a/gtk/gtkcustompaperunixdialog.c
+++ b/gtk/gtkcustompaperunixdialog.c
@@ -321,7 +321,7 @@ gtk_custom_paper_unix_dialog_init (GtkCustomPaperUnixDialog *dialog)
  g_list_store_append (printer_list_list, printer_list);
  g_object_unref (printer_list);

-  full_list = G_LIST_MODEL (gtk_flatten_list_model_new (GTK_TYPE_PRINTER, G_LIST_MODEL (printer_list_list)));
+  full_list = G_LIST_MODEL (gtk_flatten_list_model_new (G_LIST_MODEL (printer_list_list)));
  g_object_unref (printer_list_list);

  filter = gtk_custom_filter_new (match_func, NULL, NULL);
@@ -513,7 +513,7 @@ update_combo_sensitivity_from_printers (GtkCustomPaperUnixDialog *dialog)
 static void
 update_custom_widgets_from_list (GtkCustomPaperUnixDialog *dialog)
 {
-  GListModel *model;
+  GtkSelectionModel *model;
  GtkPageSetup *page_setup;

  model = gtk_list_view_get_model (GTK_LIST_VIEW (dialog->listview));
@@ -559,7 +559,7 @@ static void
 unit_widget_changed (GtkCustomPaperUnixDialog *dialog)
 {
  double w, h, top, bottom, left, right;
-  GListModel *model;
+  GtkSelectionModel *model;
  GtkPageSetup *page_setup;
  GtkPaperSize *paper_size;

@@ -648,7 +648,7 @@ add_custom_paper (GtkCustomPaperUnixDialog *dialog)
 static void
 remove_custom_paper (GtkCustomPaperUnixDialog *dialog)
 {
-  GListModel *model;
+  GtkSelectionModel *model;
  guint selected;

  model = gtk_list_view_get_model (GTK_LIST_VIEW (dialog->listview));
@@ -870,7 +870,7 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog)
  GtkWidget *grid, *label, *widget, *frame, *combo;
  GtkWidget *hbox, *vbox, *listview, *scrolled, *toolbar, *button;
  GtkUnit user_units;
-  GListModel *model;
+  GtkSingleSelection *selection;
  GtkListItemFactory *factory;

  content_area = gtk_dialog_get_content_area (cpu_dialog);
@@ -899,10 +899,10 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog)
  listview = gtk_list_view_new ();
  gtk_widget_set_size_request (listview, 140, -1);

-  model = G_LIST_MODEL (gtk_single_selection_new (G_LIST_MODEL (dialog->custom_paper_list)));
-  gtk_list_view_set_model (GTK_LIST_VIEW (listview), model);
-  g_signal_connect (model, "notify::selected", G_CALLBACK (selected_custom_paper_changed), dialog);
-  g_object_unref (model);
+  selection = gtk_single_selection_new (G_LIST_MODEL (dialog->custom_paper_list));
+  gtk_list_view_set_model (GTK_LIST_VIEW (listview), GTK_SELECTION_MODEL (selection));
+  g_signal_connect (selection, "notify::selected", G_CALLBACK (selected_custom_paper_changed), dialog);
+  g_object_unref (selection);

  factory = gtk_signal_list_item_factory_new ();
  g_signal_connect (factory, "setup", G_CALLBACK (setup_item), NULL);
--- a/gtk/gtkdirectorylist.c
+++ b/gtk/gtkdirectorylist.c
@@ -62,6 +62,7 @@ enum {
  PROP_IO_PRIORITY,
  PROP_ITEM_TYPE,
  PROP_LOADING,
+  PROP_MONITORED,
  NUM_PROPERTIES
 };

@@ -70,8 +71,10 @@ struct _GtkDirectoryList
  GObject parent_instance;

  char *attributes;
-  int io_priority;
  GFile *file;
+  GFileMonitor *monitor;
+  gboolean monitored;
+  int io_priority;

  GCancellable *cancellable;
  GError *error; /* Error while loading */
@@ -147,13 +150,17 @@ gtk_directory_list_set_property (GObject      *object,
      gtk_directory_list_set_io_priority (self, g_value_get_int (value));
      break;

+    case PROP_MONITORED:
+      gtk_directory_list_set_monitored (self, g_value_get_boolean (value));
+      break;
+
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
      break;
    }
 }

-static void 
+static void
 gtk_directory_list_get_property (GObject     *object,
                                 guint        prop_id,
                                 GValue      *value,
@@ -187,6 +194,10 @@ gtk_directory_list_get_property (GObject     *object,
      g_value_set_boolean (value, gtk_directory_list_is_loading (self));
      break;

+    case PROP_MONITORED:
+      g_value_set_boolean (value, gtk_directory_list_get_monitored (self));
+      break;
+
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
      break;
@@ -204,12 +215,27 @@ gtk_directory_list_stop_loading (GtkDirectoryList *self)
  return TRUE;
 }

+static void directory_changed (GFileMonitor       *monitor,
+                               GFile              *file,
+                               GFile              *other_file,
+                               GFileMonitorEvent   event,
+                               gpointer            data);
+
+static void
+gtk_directory_list_stop_monitoring (GtkDirectoryList *self)
+{
+  if (self->monitor)
+    g_signal_handlers_disconnect_by_func (self->monitor, directory_changed, self);
+  g_clear_object (&self->monitor);
+}
+
 static void
 gtk_directory_list_dispose (GObject *object)
 {
  GtkDirectoryList *self = GTK_DIRECTORY_LIST (object);

  gtk_directory_list_stop_loading (self);
+  gtk_directory_list_stop_monitoring (self);

  g_clear_object (&self->file);
  g_clear_pointer (&self->attributes, g_free);
@@ -301,6 +327,18 @@ gtk_directory_list_class_init (GtkDirectoryListClass *class)
                            FALSE,
                            GTK_PARAM_READABLE | G_PARAM_EXPLICIT_NOTIFY);

+  /**
+   * GtkDirectoryList:monitored:
+   *
+   * %TRUE if the directory is monitored for changed
+   */
+  properties[PROP_MONITORED] =
+      g_param_spec_boolean ("monitored",
+                            P_("monitored"),
+                            P_("TRUE if the directory is monitored for changes"),
+                            TRUE,
+                            GTK_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
+
  g_object_class_install_properties (gobject_class, NUM_PROPERTIES, properties);
 }

@@ -309,6 +347,7 @@ gtk_directory_list_init (GtkDirectoryList *self)
 {
  self->items = g_sequence_new (g_object_unref);
  self->io_priority = G_PRIORITY_DEFAULT;
+  self->monitored = TRUE;
 }

 /**
@@ -324,7 +363,6 @@ gtk_directory_list_init (GtkDirectoryList *self)
 GtkDirectoryList *
 gtk_directory_list_new (const char *attributes,
                        GFile      *file)
-                        
 {
  g_return_val_if_fail (file == NULL || G_IS_FILE (file), NULL);

@@ -410,7 +448,7 @@ gtk_directory_list_got_files_cb (GObject      *source,
    {
      GFileInfo *info;
      GFile *file;
-      
+
      info = l->data;
      file = g_file_enumerator_get_child (enumerator, info);
      g_file_info_set_attribute_object (info, "standard::file", G_OBJECT (file));
@@ -496,6 +534,143 @@ gtk_directory_list_start_loading (GtkDirectoryList *self)
    g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_LOADING]);
 }

+static void
+got_new_file_info_cb (GObject      *source,
+                      GAsyncResult *res,
+                      gpointer      data)
+{
+  GFile *file = G_FILE (source);
+  GtkDirectoryList *self = GTK_DIRECTORY_LIST (data);
+  GFileInfo *info;
+  guint position;
+
+  info = g_file_query_info_finish (file, res, NULL);
+  if (!info)
+    return;
+
+  g_file_info_set_attribute_object (info, "standard::file", G_OBJECT (file));
+  position = g_sequence_get_length (self->items);
+  g_sequence_append (self->items, info);
+  g_list_model_items_changed (G_LIST_MODEL (self), position, 0, 1);
+}
+
+static void
+got_existing_file_info_cb (GObject      *source,
+                           GAsyncResult *res,
+                           gpointer      data)
+{
+  GFile *file = G_FILE (source);
+  GtkDirectoryList *self = GTK_DIRECTORY_LIST (data);
+  GFileInfo *info;
+  GSequenceIter *iter;
+
+  info = g_file_query_info_finish (file, res, NULL);
+  if (!info)
+    return;
+
+  g_file_info_set_attribute_object (info, "standard::file", G_OBJECT (file));
+
+  for (iter = g_sequence_get_begin_iter (self->items);
+       !g_sequence_iter_is_end (iter);
+       iter = g_sequence_iter_next (iter))
+    {
+      GFileInfo *item = g_sequence_get (iter);
+      GFile *f = G_FILE (g_file_info_get_attribute_object (item, "standard::file"));
+      if (g_file_equal (f, file))
+        {
+          guint position = g_sequence_iter_get_position (iter);
+          g_sequence_set (iter, g_object_ref (info));
+          g_list_model_items_changed (G_LIST_MODEL (self), position, 1, 1);
+          break;
+        }
+    }
+}
+
+static void
+gtk_directory_list_remove_file (GtkDirectoryList *self,
+                                GFile            *file)
+{
+  GSequenceIter *iter;
+
+  for (iter = g_sequence_get_begin_iter (self->items);
+       !g_sequence_iter_is_end (iter);
+       iter = g_sequence_iter_next (iter))
+    {
+      GFileInfo *item = g_sequence_get (iter);
+      GFile *f = G_FILE (g_file_info_get_attribute_object (item, "standard::file"));
+      if (g_file_equal (f, file))
+        {
+          guint position = g_sequence_iter_get_position (iter);
+          g_sequence_remove (iter);
+          g_list_model_items_changed (G_LIST_MODEL (self), position, 1, 0);
+          break;
+        }
+    }
+}
+
+static void
+directory_changed (GFileMonitor       *monitor,
+                   GFile              *file,
+                   GFile              *other_file,
+                   GFileMonitorEvent   event,
+                   gpointer            data)
+{
+  GtkDirectoryList *self = GTK_DIRECTORY_LIST (data);
+  switch (event)
+    {
+    case G_FILE_MONITOR_EVENT_CREATED:
+      g_file_query_info_async (file,
+                               self->attributes,
+                               G_FILE_QUERY_INFO_NONE,
+                               self->io_priority,
+                               self->cancellable,
+                               got_new_file_info_cb,
+                               self);
+      break;
+
+    case G_FILE_MONITOR_EVENT_DELETED:
+      gtk_directory_list_remove_file (self, file);
+      break;
+
+    case G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED:
+      g_file_query_info_async (file,
+                               self->attributes,
+                               G_FILE_QUERY_INFO_NONE,
+                               self->io_priority,
+                               self->cancellable,
+                               got_existing_file_info_cb,
+                               self);
+      break;
+
+    case G_FILE_MONITOR_EVENT_CHANGED:
+    case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
+    case G_FILE_MONITOR_EVENT_PRE_UNMOUNT:
+    case G_FILE_MONITOR_EVENT_UNMOUNTED:
+    case G_FILE_MONITOR_EVENT_MOVED:
+    case G_FILE_MONITOR_EVENT_RENAMED:
+    case G_FILE_MONITOR_EVENT_MOVED_IN:
+    case G_FILE_MONITOR_EVENT_MOVED_OUT:
+    default:
+      break;
+    }
+}
+
+static void
+gtk_directory_list_start_monitoring (GtkDirectoryList *self)
+{
+  g_assert (self->monitor == NULL);
+  self->monitor = g_file_monitor_directory (self->file, G_FILE_MONITOR_NONE, NULL, NULL);
+  g_signal_connect (self->monitor, "changed", G_CALLBACK (directory_changed), self);
+}
+
+static void
+gtk_directory_list_update_monitoring (GtkDirectoryList *self)
+{
+  gtk_directory_list_stop_monitoring (self);
+  if (self->file && self->monitored)
+    gtk_directory_list_start_monitoring (self);
+}
+
 /**
 * gtk_directory_list_set_file:
 * @self: a #GtkDirectoryList
@@ -520,6 +695,7 @@ gtk_directory_list_set_file (GtkDirectoryList *self,

  g_set_object (&self->file, file);

+  gtk_directory_list_update_monitoring (self);
  gtk_directory_list_start_loading (self);

  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_FILE]);
@@ -679,3 +855,52 @@ gtk_directory_list_get_error (GtkDirectoryList *self)
  return self->error;
 }

+/**
+ * gtk_directory_list_set_monitored:
+ * @self: a #GtkDirectoryList
+ * @monitored: %TRUE to monitor the directory for changes
+ *
+ * Sets whether the directory list will monitor the directory
+ * for changes. If monitoring is enabled, the
+ * #GListModel::items-changed signal will be emitted when the
+ * directory contents change.
+ *
+ * When monitoring is turned on after the initial creation
+ * of the directory list, the directory is reloaded to avoid
+ * missing files that appeared between the initial loading
+ * and when monitoring was turned on.
+ */
+void
+gtk_directory_list_set_monitored (GtkDirectoryList *self,
+                                  gboolean          monitored)
+{
+  g_return_if_fail (GTK_IS_DIRECTORY_LIST (self));
+
+  if (self->monitored == monitored)
+    return;
+
+  self->monitored = monitored;
+
+  gtk_directory_list_update_monitoring (self);
+  if (monitored)
+    gtk_directory_list_start_loading (self);
+
+  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_MONITORED]);
+}
+
+/**
+ * gtk_directory_list_get_monitored:
+ * @self: a #GtkDirectoryList
+ *
+ * Returns whether the directory list is monitoring
+ * the directory for changes.
+ *
+ * Returns: %TRUE if the directory is monitored
+ */
+gboolean
+gtk_directory_list_get_monitored (GtkDirectoryList *self)
+{
+  g_return_val_if_fail (GTK_IS_DIRECTORY_LIST (self), TRUE);
+
+  return self->monitored;
+}
--- a/gtk/gtkdirectorylist.h
+++ b/gtk/gtkdirectorylist.h
@@ -62,6 +62,12 @@ gboolean                gtk_directory_list_is_loading           (GtkDirectoryLis
 GDK_AVAILABLE_IN_ALL
 const GError *          gtk_directory_list_get_error            (GtkDirectoryList       *self);

+GDK_AVAILABLE_IN_ALL
+void                    gtk_directory_list_set_monitored        (GtkDirectoryList       *self,
+                                                                 gboolean                monitored);
+GDK_AVAILABLE_IN_ALL
+gboolean                gtk_directory_list_get_monitored        (GtkDirectoryList       *self);
+
 G_END_DECLS

 #endif /* __GTK_DIRECTORY_LIST_H__ */
--- a/gtk/gtkdropcontrollermotion.c
+++ b/gtk/gtkdropcontrollermotion.c
@@ -224,7 +224,7 @@ gtk_drop_controller_motion_class_init (GtkDropControllerMotionClass *klass)
  props[PROP_CONTAINS_POINTER] =
      g_param_spec_boolean ("contains-pointer",
                            P_("Contains Pointer"),
-                            P_("Whether the pointer is inthe controllers widget or a descendant"),
+                            P_("Whether the pointer is in the controllers widget or a descendant"),
                            FALSE,
                            G_PARAM_READABLE);

--- a/Show More
+++ b/Show More