[gtk: 85/85] Merge branch 'present-toplevel-2' into 'master'



commit 9d98707f6694bf9c51767bee474309baa0fe353f
Merge: 179b39eb86 19e2ab76ce
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Mar 13 13:34:57 2020 +0000

    Merge branch 'present-toplevel-2' into 'master'
    
    surface api splitup
    
    See merge request GNOME/gtk!1511

 demos/gtk-demo/application.c                       |    2 +-
 docs/reference/gdk/gdk4-docs.xml                   |    4 +
 docs/reference/gdk/gdk4-sections.txt               |  136 +-
 docs/reference/gdk/gdk4.types                      |    4 +
 docs/tools/shooter.c                               |    7 +-
 gdk/broadway/gdkdevice-broadway.c                  |   26 +-
 gdk/broadway/gdksurface-broadway.c                 |  694 ++++++----
 gdk/gdk-autocleanup.h                              |    1 -
 gdk/gdk-private.h                                  |    2 -
 gdk/gdk.h                                          |   11 +-
 gdk/gdkdevice.c                                    |    6 +-
 gdk/gdkdeviceprivate.h                             |    4 -
 gdk/gdkdragsurface.c                               |   71 +
 gdk/gdkdragsurface.h                               |   43 +
 gdk/gdkdragsurfaceprivate.h                        |   20 +
 gdk/gdkinternals.h                                 |    2 +-
 gdk/gdkpopup.c                                     |  249 ++++
 gdk/gdkpopup.h                                     |   63 +
 gdk/gdkpopuplayout.c                               |   14 +
 gdk/gdkpopupprivate.h                              |   35 +
 gdk/gdksurface.c                                   | 1353 ++------------------
 gdk/gdksurface.h                                   |  223 +---
 gdk/gdksurfaceprivate.h                            |  106 +-
 gdk/gdktoplevel.c                                  |  547 ++++++++
 gdk/gdktoplevel.h                                  |  111 ++
 gdk/gdktoplevellayout.c                            |  302 +++++
 gdk/gdktoplevellayout.h                            |   90 ++
 gdk/gdktoplevelprivate.h                           |   50 +
 gdk/meson.build                                    |   10 +-
 gdk/quartz/gdksurface-quartz.c                     |   84 +-
 gdk/wayland/gdkdevice-wayland.c                    |   23 +-
 gdk/wayland/gdkdisplay-wayland.h                   |    3 -
 gdk/wayland/gdkdrag-wayland.c                      |   12 -
 gdk/wayland/gdkprivate-wayland.h                   |    2 +
 gdk/wayland/gdksurface-wayland.c                   |  844 +++++++-----
 gdk/win32/gdkdevice-virtual.c                      |    3 -
 gdk/win32/gdkdevice-win32.c                        |   22 +-
 gdk/win32/gdkdevice-wintab.c                       |   16 +-
 gdk/win32/gdkdrag-win32.c                          |   10 +-
 gdk/win32/gdkevents-win32.c                        |   42 +-
 gdk/win32/gdkprivate-win32.h                       |    9 +
 gdk/win32/gdksurface-win32.c                       | 1191 ++++++++---------
 gdk/win32/gdksurface-win32.h                       |   11 +
 gdk/x11/gdkdevice-xi2.c                            |   13 +-
 gdk/x11/gdkdevicemanager-xi2.c                     |    2 +-
 gdk/x11/gdkdisplay-x11.c                           |    6 +-
 gdk/x11/gdkdrag-x11.c                              |   14 +-
 gdk/x11/gdkmonitor-x11.c                           |    7 +-
 gdk/x11/gdkprivate-x11.h                           |    7 +
 gdk/x11/gdksurface-x11.c                           |  796 +++++++++---
 gtk/a11y/gtkwindowaccessible.c                     |   39 +-
 gtk/gtkdragicon.c                                  |    8 +-
 gtk/gtkheaderbar.c                                 |    7 +-
 gtk/gtkimcontextime.c                              |   16 +-
 gtk/gtkpopover.c                                   |   40 +-
 gtk/gtkprintoperation-win32.c                      |    1 -
 gtk/gtkshortcutswindow.c                           |    1 -
 gtk/gtktooltipwindow.c                             |   18 +-
 gtk/gtkwidget.c                                    |   13 +-
 gtk/gtkwindow.c                                    |  440 +++----
 gtk/gtkwindow.h                                    |   19 -
 gtk/inspector/inspect-button.c                     |    6 +
 gtk/ui/gtkaboutdialog.ui                           |    1 -
 gtk/ui/gtkappchooserdialog.ui                      |    1 -
 gtk/ui/gtkcolorchooserdialog.ui                    |    1 -
 gtk/ui/gtkdialog.ui                                |    1 -
 gtk/ui/gtkfilechooserdialog.ui                     |    1 -
 gtk/ui/gtkfontchooserdialog.ui                     |    1 -
 gtk/ui/gtkmessagedialog.ui                         |    1 -
 gtk/ui/gtkpagesetupunixdialog.ui                   |    1 -
 gtk/ui/gtkprintunixdialog.ui                       |    1 -
 tests/testfullscreen.c                             |   38 +-
 tests/testgtk.c                                    |   10 +-
 tests/testwindowdrag.c                             |    4 +-
 testsuite/a11y/about.txt                           |    3 +-
 testsuite/a11y/accessible-name.txt                 |    1 -
 testsuite/a11y/actionbar.txt                       |    1 -
 testsuite/a11y/assistant.txt                       |    1 -
 testsuite/a11y/buttons.txt                         |    1 -
 testsuite/a11y/calendar.txt                        |    1 -
 testsuite/a11y/colorchooser.txt                    |    1 -
 testsuite/a11y/combos.txt                          |    1 -
 testsuite/a11y/entries.txt                         |    1 -
 testsuite/a11y/expander.txt                        |    1 -
 testsuite/a11y/headerbar.txt                       |    1 -
 testsuite/a11y/hello-world.txt                     |    1 -
 testsuite/a11y/iconview.txt                        |    1 -
 testsuite/a11y/infobar.txt                         |    1 -
 testsuite/a11y/label-static.txt                    |    1 -
 testsuite/a11y/label.txt                           |    1 -
 testsuite/a11y/link.txt                            |    1 -
 testsuite/a11y/listbox.txt                         |    1 -
 testsuite/a11y/lockbutton.txt                      |    1 -
 testsuite/a11y/menubutton.txt                      |    1 -
 testsuite/a11y/menubutton2.txt                     |    1 -
 testsuite/a11y/messagedialog.txt                   |    1 -
 testsuite/a11y/mnemonic.txt                        |    1 -
 testsuite/a11y/notebook.txt                        |    1 -
 testsuite/a11y/paned.txt                           |    1 -
 testsuite/a11y/pickers.txt                         |    1 -
 testsuite/a11y/placeholder-text.txt                |    1 -
 testsuite/a11y/progress.txt                        |    1 -
 testsuite/a11y/range.txt                           |    1 -
 testsuite/a11y/scale-drawvalue.txt                 |    1 -
 testsuite/a11y/spinner.txt                         |    1 -
 testsuite/a11y/spinner.ui                          |    2 +-
 testsuite/a11y/stack.txt                           |    1 -
 testsuite/a11y/statusbar.txt                       |    1 -
 testsuite/a11y/text.txt                            |    1 -
 testsuite/a11y/tooltips.txt                        |    1 -
 testsuite/a11y/tree.txt                            |    1 -
 testsuite/gtk/meson.build                          |    2 +-
 testsuite/gtk/templates.c                          |    5 +-
 .../reftests/messagedialog-secondarytext.ref.ui    |    1 -
 testsuite/reftests/messagedialog-secondarytext.ui  |    1 -
 testsuite/reftests/window-height-for-width.ref.ui  |    1 -
 testsuite/reftests/window-height-for-width.ui      |    1 -
 117 files changed, 4306 insertions(+), 3717 deletions(-)
---


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