[arch-commits] Commit in mutter/trunk (2 files)

[Jan Steffens]

    Date: Tuesday, March 26, 2019 @ 22:03:26
  Author: heftig
Revision: 349253

3.32.0+33+g58f7059ea-1

Added:
  mutter/trunk/0001-wayland-xdg-shell-Correct-window-menu-position-in-lo.patch
Modified:
  mutter/trunk/PKGBUILD

-----------------------------------------------------------------+
 0001-wayland-xdg-shell-Correct-window-menu-position-in-lo.patch |   42 ++++++++++
 PKGBUILD                                                        |    9 +-
 2 files changed, 49 insertions(+), 2 deletions(-)

Added: 0001-wayland-xdg-shell-Correct-window-menu-position-in-lo.patch
===================================================================
--- 0001-wayland-xdg-shell-Correct-window-menu-position-in-lo.patch	                        (rev 0)
+++ 0001-wayland-xdg-shell-Correct-window-menu-position-in-lo.patch	2019-03-26 22:03:26 UTC (rev 349253)
@@ -0,0 +1,42 @@
+From da01a3eaffe01ae2c3ea826171057548c7973c39 Mon Sep 17 00:00:00 2001
+Message-Id: <da01a3eaffe01ae2c3ea826171057548c7973c39.1553635567.git.jan.steffens at gmail.com>
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Tue, 26 Mar 2019 22:24:44 +0100
+Subject: [PATCH] wayland/xdg-shell: Correct window menu position in logical
+ layout mode
+
+Fixes https://gitlab.gnome.org/GNOME/mutter/issues/527
+---
+ src/wayland/meta-wayland-legacy-xdg-shell.c | 2 +-
+ src/wayland/meta-wayland-xdg-shell.c        | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/wayland/meta-wayland-legacy-xdg-shell.c b/src/wayland/meta-wayland-legacy-xdg-shell.c
+index 1523481d4..823064177 100644
+--- a/src/wayland/meta-wayland-legacy-xdg-shell.c
++++ b/src/wayland/meta-wayland-legacy-xdg-shell.c
+@@ -258,7 +258,7 @@ zxdg_toplevel_v6_show_window_menu (struct wl_client   *client,
+   if (!meta_wayland_seat_get_grab_info (seat, surface, serial, FALSE, NULL, NULL))
+     return;
+ 
+-  monitor_scale = window->monitor->scale;
++  monitor_scale = meta_window_wayland_get_geometry_scale (window);
+   meta_window_show_menu (window, META_WINDOW_MENU_WM,
+                          window->buffer_rect.x + (x * monitor_scale),
+                          window->buffer_rect.y + (y * monitor_scale));
+diff --git a/src/wayland/meta-wayland-xdg-shell.c b/src/wayland/meta-wayland-xdg-shell.c
+index d747f5c07..fa0207a03 100644
+--- a/src/wayland/meta-wayland-xdg-shell.c
++++ b/src/wayland/meta-wayland-xdg-shell.c
+@@ -264,7 +264,7 @@ xdg_toplevel_show_window_menu (struct wl_client   *client,
+   if (!meta_wayland_seat_get_grab_info (seat, surface, serial, FALSE, NULL, NULL))
+     return;
+ 
+-  monitor_scale = window->monitor->scale;
++  monitor_scale = meta_window_wayland_get_geometry_scale (window);
+   meta_window_show_menu (window, META_WINDOW_MENU_WM,
+                          window->buffer_rect.x + (x * monitor_scale),
+                          window->buffer_rect.y + (y * monitor_scale));
+-- 
+2.21.0
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-26 22:02:09 UTC (rev 349252)
+++ PKGBUILD	2019-03-26 22:03:26 UTC (rev 349253)
@@ -3,7 +3,7 @@
 # Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
 
 pkgname=mutter
-pkgver=3.32.0+25+gf0b9654de
+pkgver=3.32.0+33+g58f7059ea
 pkgrel=1
 pkgdesc="A window manager for GNOME"
 url="https://gitlab.gnome.org/GNOME/mutter"
@@ -15,10 +15,12 @@
 makedepends=(gobject-introspection git egl-wayland meson xorg-server)
 checkdepends=(xorg-server-xvfb)
 groups=(gnome)
-_commit=f0b9654deb947e49e42b76d6daa42b86e5b0ec17  # master
+_commit=58f7059ea42c04fbb28c7210a287437f0f55b2d8  # master
 source=("git+https://gitlab.gnome.org/GNOME/mutter.git#commit=$_commit"
+        0001-wayland-xdg-shell-Correct-window-menu-position-in-lo.patch
         216.patch)
 sha256sums=('SKIP'
+            '8628fe45738d631d7776204be76cc091c5a1359d2874945c7913c7705330f816'
             'ed4f3cf738a3cffdf8a6e1a352bf24d74078c3b26fb9262c5746e0d95b9df756')
 
 pkgver() {
@@ -29,6 +31,9 @@
 prepare() {
   cd $pkgname
 
+  # https://gitlab.gnome.org/GNOME/mutter/issues/527
+  patch -Np1 -i ../0001-wayland-xdg-shell-Correct-window-menu-position-in-lo.patch
+
   # https://gitlab.gnome.org/GNOME/mutter/merge_requests/216
   git apply -3 ../216.patch
 }