From ebe4af6e50ca1174d44becbec617c9993cb0b256 Mon Sep 17 00:00:00 2001 From: zhangpan Date: Thu, 22 Feb 2024 08:02:58 +0000 Subject: [PATCH] remove window shading --- backport-remove-window-shading.patch | 70 ++++++++++++++++++++++++++++ metacity.spec | 6 ++- 2 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 backport-remove-window-shading.patch diff --git a/backport-remove-window-shading.patch b/backport-remove-window-shading.patch new file mode 100644 index 0000000..c99c730 --- /dev/null +++ b/backport-remove-window-shading.patch @@ -0,0 +1,70 @@ +From bd5f8743e9ec6697d45077dd3a4d6f8f704445e3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= +Date: Mon, 10 Jul 2023 18:31:57 +0300 +Subject: [PATCH] keybindings: remove window shading + +Related GSettings key has been removed: +https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/commit/9726c5e92dbb65d410033d478e94ce900438884c +--- + src/core/keybindings.c | 21 --------------------- + src/include/prefs.h | 1 - + 2 files changed, 22 deletions(-) + +diff --git a/src/core/keybindings.c b/src/core/keybindings.c +index 63766e19d..ca864ce89 100644 +--- a/src/core/keybindings.c ++++ b/src/core/keybindings.c +@@ -2127,7 +2127,6 @@ process_tab_grab (MetaDisplay *display, + case META_KEYBINDING_ACTION_TOGGLE_ABOVE: + case META_KEYBINDING_ACTION_MAXIMIZE: + case META_KEYBINDING_ACTION_UNMAXIMIZE: +- case META_KEYBINDING_ACTION_TOGGLE_SHADED: + case META_KEYBINDING_ACTION_MINIMIZE: + case META_KEYBINDING_ACTION_CLOSE: + case META_KEYBINDING_ACTION_BEGIN_MOVE: +@@ -2986,19 +2985,6 @@ handle_unmaximize (MetaDisplay *display, + META_MAXIMIZE_VERTICAL); + } + +-static void +-handle_toggle_shaded (MetaDisplay *display, +- MetaScreen *screen, +- MetaWindow *window, +- XEvent *event, +- MetaKeyBinding *binding) +-{ +- if (window->shaded) +- meta_window_unshade (window, event->xkey.time); +- else if (window->has_shade_func) +- meta_window_shade (window, event->xkey.time); +-} +- + static void + handle_close (MetaDisplay *display, + MetaScreen *screen, +@@ -3582,13 +3568,6 @@ init_builtin_key_bindings (MetaDisplay *display) + META_KEYBINDING_ACTION_UNMAXIMIZE, + handle_unmaximize, 0); + +- add_builtin_keybinding (display, +- "toggle-shaded", +- SCHEMA_COMMON_KEYBINDINGS, +- META_KEY_BINDING_PER_WINDOW, +- META_KEYBINDING_ACTION_TOGGLE_SHADED, +- handle_toggle_shaded, 0); +- + add_builtin_keybinding (display, + "minimize", + SCHEMA_COMMON_KEYBINDINGS, +diff --git a/src/include/prefs.h b/src/include/prefs.h +index 558c4a9d2..77ce29964 100644 +--- a/src/include/prefs.h ++++ b/src/include/prefs.h +@@ -191,7 +191,6 @@ typedef enum _MetaKeyBindingAction + META_KEYBINDING_ACTION_TOGGLE_ABOVE, + META_KEYBINDING_ACTION_MAXIMIZE, + META_KEYBINDING_ACTION_UNMAXIMIZE, +- META_KEYBINDING_ACTION_TOGGLE_SHADED, + META_KEYBINDING_ACTION_MINIMIZE, + META_KEYBINDING_ACTION_CLOSE, + META_KEYBINDING_ACTION_BEGIN_MOVE, diff --git a/metacity.spec b/metacity.spec index 2b11277..d11e837 100644 --- a/metacity.spec +++ b/metacity.spec @@ -1,6 +1,6 @@ Name: metacity Version: 3.37.1 -Release: 5 +Release: 6 Summary: Window Manager for the MATE and GNOME Flashback desktops License: GPLv2+ URL: https://download.gnome.org/sources/metacity/ @@ -22,6 +22,7 @@ Requires: startup-notification gsettings-desktop-schemas zenity Provides: firstboot(windowmanager) = metacity Patch6000: backport-compositor-vulkan-fix-build.patch +Patch6001: backport-remove-window-shading.patch %if !0%{?openEuler} Patch9000: huawei-remove-XResQueryClientIds-to-get-pid.patch @@ -88,6 +89,9 @@ make CPPFLAGS="$CPPFLAGS" LIBS="$LIBS" %{?_smp_mflags} %{_mandir}/man1/*.gz %changelog +* Thu Feb 22 2024 zhangpan - 3.37.1-6 +- remove window shading + * Mon Aug 14 2023 liyunfei - 3.37.1-5 - fix install error with clang toolchain