!22 remove window shading

From: @zppzhangpan 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
This commit is contained in:
openeuler-ci-bot 2024-02-22 08:30:58 +00:00 committed by Gitee
commit 99b15837fc
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 75 additions and 1 deletions

View File

@ -0,0 +1,70 @@
From bd5f8743e9ec6697d45077dd3a4d6f8f704445e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <alberts.muktupavels@gmail.com>
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,

View File

@ -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 <zhangpan103@h-partners.com> - 3.37.1-6
- remove window shading
* Mon Aug 14 2023 liyunfei <liyunfei33@huawei.com> - 3.37.1-5
- fix install error with clang toolchain