[gtk: 2/2] Merge branch 'wip/ditch-workarea' into 'master'




commit 3eab58816b7b9c7c1675b81d9b6816a60403f4a0
Merge: ec34675019 c7c71137b2
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Jul 29 16:24:32 2020 +0000

    Merge branch 'wip/ditch-workarea' into 'master'
    
    gdk/monitor: Remove gdk_monitor_work_area and GdkMonitor::work-area
    
    See merge request GNOME/gtk!2316

 docs/reference/gdk/gdk4-sections.txt |  1 -
 gdk/broadway/gdksurface-broadway.c   |  8 ++++
 gdk/gdkmonitor.c                     | 47 ---------------------
 gdk/gdkmonitor.h                     |  3 --
 gdk/gdkmonitorprivate.h              |  3 --
 gdk/gdksurface.c                     | 81 ++++++++++++++++++++++--------------
 gdk/gdksurfaceprivate.h              |  7 ++++
 gdk/macos/GdkMacosWindow.c           |  6 +--
 gdk/macos/gdkmacosmonitor.c          | 16 +++++--
 gdk/macos/gdkmacosmonitor.h          |  3 ++
 gdk/macos/gdkmacospopupsurface.c     |  8 ++++
 gdk/macos/gdkmacostoplevelsurface.c  |  2 +-
 gdk/win32/gdkdisplay-win32.c         |  4 +-
 gdk/win32/gdkmonitor-win32.c         | 15 +++++--
 gdk/win32/gdksurface-win32.c         | 20 ++++++---
 gdk/win32/gdkwin32monitor.h          |  3 ++
 gdk/x11/gdkmonitor-x11.c             | 14 ++++++-
 gdk/x11/gdkscreen-x11.c              |  3 --
 gdk/x11/gdksurface-x11.c             |  8 ++++
 gdk/x11/gdkx11monitor.h              |  4 ++
 gtk/gtkwindow.c                      | 14 +++----
 testsuite/gtk/defaultvalue.c         |  3 +-
 22 files changed, 154 insertions(+), 119 deletions(-)
---


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