[gtk/gtk-3-24: 3/3] Merge branch 'issue1901-gtk3' into 'gtk-3-24'
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/gtk-3-24: 3/3] Merge branch 'issue1901-gtk3' into 'gtk-3-24'
- Date: Wed, 22 May 2019 12:10:27 +0000 (UTC)
commit 2881d6d97873695542104ea648358868f09056f4
Merge: 03be8c5617 034ed1756c
Author: Matthias Clasen <mclasen redhat com>
Date: Wed May 22 12:09:48 2019 +0000
Merge branch 'issue1901-gtk3' into 'gtk-3-24'
wayland: Use scale from core wl_output protocol
See merge request GNOME/gtk!871
gdk/wayland/Makefile.am | 2 +
gdk/wayland/gdkdisplay-wayland.c | 7 ++
gdk/wayland/gdkdisplay-wayland.h | 2 +
gdk/wayland/gdkmonitor-wayland.h | 9 ++
gdk/wayland/gdkprivate-wayland.h | 2 +
gdk/wayland/gdkscreen-wayland.c | 194 +++++++++++++++++++++++++++++++--------
gdk/wayland/meson.build | 1 +
7 files changed, 179 insertions(+), 38 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]