[gtk/gtk-4-6: 57/57] Merge branch 'wip/chergert/for-4-6' into 'gtk-4-6'
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/gtk-4-6: 57/57] Merge branch 'wip/chergert/for-4-6' into 'gtk-4-6'
- Date: Wed, 16 Mar 2022 20:03:44 +0000 (UTC)
commit 17e0618ff65cb301e6aad08af3a0fe544c1c6026
Merge: 38bbcb7411 73d5f7061b
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Mar 16 20:03:38 2022 +0000
Merge branch 'wip/chergert/for-4-6' into 'gtk-4-6'
backport macOS fixes to gtk-4-6
See merge request GNOME/gtk!4578
gdk/macos/GdkMacosView.c | 14 ++
gdk/macos/GdkMacosWindow.c | 36 +++-
gdk/macos/GdkMacosWindow.h | 1 +
gdk/macos/gdkdisplaylinksource.c | 85 ++++++---
gdk/macos/gdkdisplaylinksource.h | 17 +-
gdk/macos/gdkmacosbuffer-private.h | 2 +
gdk/macos/gdkmacosbuffer.c | 41 ++++-
gdk/macos/gdkmacoscairocontext.c | 120 ++++++++++---
gdk/macos/gdkmacosdisplay-feedback.c | 105 +++++++++++
gdk/macos/gdkmacosdisplay-private.h | 27 ++-
gdk/macos/gdkmacosdisplay-settings.c | 10 +-
gdk/macos/gdkmacosdisplay-translate.c | 114 ++++++++----
gdk/macos/gdkmacosdisplay-wm.c | 82 +++++----
gdk/macos/gdkmacosdisplay.c | 263 ++++++---------------------
gdk/macos/gdkmacosglcontext-private.h | 2 -
gdk/macos/gdkmacosglcontext.c | 19 +-
gdk/macos/gdkmacosmonitor-private.h | 19 +-
gdk/macos/gdkmacosmonitor.c | 177 ++++++++++++++++--
gdk/macos/gdkmacospopupsurface.c | 41 +++--
gdk/macos/gdkmacossurface-private.h | 11 +-
gdk/macos/gdkmacossurface.c | 328 ++++++++++++++++++++++------------
gdk/macos/gdkmacostoplevelsurface.c | 45 ++++-
gdk/macos/meson.build | 1 +
gtk/gtkscrolledwindow.c | 29 +--
24 files changed, 1055 insertions(+), 534 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]