From c70ea234d517dbd9aa3e8c05469ea1ac3c7c3f85 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 12 2019 16:32:01 +0000
Subject: import mutter-3.28.3-6.el7_6


---

diff --git a/SOURCES/0001-constraints-Fix-titlebars-going-off-the-bottom.patch b/SOURCES/0001-constraints-Fix-titlebars-going-off-the-bottom.patch
new file mode 100644
index 0000000..bc199e1
--- /dev/null
+++ b/SOURCES/0001-constraints-Fix-titlebars-going-off-the-bottom.patch
@@ -0,0 +1,39 @@
+From 2fd734c349ab00f2f460af97f7c383678407f620 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Wed, 16 Jan 2019 01:09:26 +0100
+Subject: [PATCH] constraints: Fix titlebars going off the bottom
+
+The "current" rect includes the frame, so in order to keep the
+titlebar on screen, window movement must be restricted to at
+most (height - titlebar_height) past the work area bottom.
+
+https://gitlab.gnome.org/GNOME/mutter/merge_requests/391
+---
+ src/core/constraints.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/constraints.c b/src/core/constraints.c
+index 3b6203d6b..92b146ce3 100644
+--- a/src/core/constraints.c
++++ b/src/core/constraints.c
+@@ -1570,7 +1570,7 @@ constrain_titlebar_visible (MetaWindow         *window,
+       MetaFrameBorders borders;
+       meta_frame_calc_borders (window->frame, &borders);
+ 
+-      bottom_amount = info->current.height + borders.visible.bottom;
++      bottom_amount = info->current.height - borders.visible.top;
+       vert_amount_onscreen = borders.visible.top;
+     }
+   else
+@@ -1649,7 +1649,7 @@ constrain_partially_onscreen (MetaWindow         *window,
+       MetaFrameBorders borders;
+       meta_frame_calc_borders (window->frame, &borders);
+ 
+-      bottom_amount = info->current.height + borders.visible.bottom;
++      bottom_amount = info->current.height - borders.visible.top;
+       vert_amount_onscreen = borders.visible.top;
+     }
+   else
+-- 
+2.20.1
+
diff --git a/SPECS/mutter.spec b/SPECS/mutter.spec
index a577c51..1e2a524 100644
--- a/SPECS/mutter.spec
+++ b/SPECS/mutter.spec
@@ -10,7 +10,7 @@
 
 Name:          mutter
 Version:       3.28.3
-Release:       5%{?dist}
+Release:       6%{?dist}
 Summary:       Window and compositing manager based on Clutter
 
 License:       GPLv2+
@@ -46,6 +46,9 @@ Patch31: 0001-monitor-manager-only-reuse-initial-config-if-monitor.patch
 
 Patch32: 0001-clutter-Do-not-latch-modifiers-on-modifier-keys.patch
 
+# Prevent titlebar from going off-screen (rhbz#1664407)
+Patch33: 0001-constraints-Fix-titlebars-going-off-the-bottom.patch
+
 # el7 patches
 Patch100: 0001-Revert-build-Require-libgudev-232.patch
 Patch101: 0001-rhel7-Fix-build-for-el7.patch
@@ -216,6 +219,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Jan 16 2019 Florian Müllner <fmuellner@redhat.com> - 3.26.2-18
+- Prevent titlebars going off-screen (rhbz#1679913)
+
 * Wed Oct 10 2018 Carlos Garnacho <cgarnach@redhat.com> - 3.28.3-5
 - Do not latch modifiers on modifier keys
   Resolves: #1637822