From ca807c669fd7c780cb2563a623e8ffc1276e73f2 Mon Sep 17 00:00:00 2001 From: Leo Date: Fri, 7 Apr 2023 07:54:02 +0900 Subject: [PATCH] WM: Drop Meta.ShadowFactory (#1625) --- data/gala.gschema.xml | 10 ++++---- src/InternalUtils.vala | 58 ------------------------------------------ src/WindowManager.vala | 5 ---- 3 files changed, 5 insertions(+), 68 deletions(-) diff --git a/data/gala.gschema.xml b/data/gala.gschema.xml index fb3a2808..ee21b517 100644 --- a/data/gala.gschema.xml +++ b/data/gala.gschema.xml @@ -275,27 +275,27 @@ ['20', '-1', '0', '15', '100'] Defines the shadow of normal focused windows - The first value is the radius of the blur of the shadow, the second one the top fade (which is usually just -1), the third and fourth the x- and y-offset and the last the opacity. So [blur-radius, top-fade, x-offset, y-offset, opacity]. + DEPRECATED: This key is deprecated and ignored. ['6', '-1', '0', '4', '80'] Defines the shadow of a normal unfocused window - See normal-focused. + DEPRECATED: This key is deprecated and ignored. ['6', '-1', '0', '4', '80'] Defines the shadow of a menu - See normal-focused. + DEPRECATED: This key is deprecated and ignored. ['12', '-1', '0', '4', '100'] Defines the shadow of a focused dialog - See normal-focused. + DEPRECATED: This key is deprecated and ignored. ['6', '-1', '0', '4', '80'] Defines the shadow of an unfocused dialog - See normal-focused. + DEPRECATED: This key is deprecated and ignored. diff --git a/src/InternalUtils.vala b/src/InternalUtils.vala index feeaaabf..6bf9ec0d 100644 --- a/src/InternalUtils.vala +++ b/src/InternalUtils.vala @@ -28,64 +28,6 @@ namespace Gala { && Meta.Prefs.get_workspaces_only_on_primary (); } - private static GLib.Settings? shadow_settings = null; - /* - * Reload shadow settings - */ - public static void reload_shadow () { - if (shadow_settings == null) { - shadow_settings = new GLib.Settings (Config.SCHEMA + ".shadows"); - } - var factory = Meta.ShadowFactory.get_default (); - Meta.ShadowParams shadow; - - //normal focused - shadow = get_shadowparams ("normal-focused"); - factory.set_params ("normal", true, shadow); - - //normal unfocused - shadow = get_shadowparams ("normal-unfocused"); - factory.set_params ("normal", false, shadow); - - //menus - shadow = get_shadowparams ("menu"); - factory.set_params ("menu", false, shadow); - factory.set_params ("dropdown-menu", false, shadow); - factory.set_params ("popup-menu", false, shadow); - - //dialog focused - shadow = get_shadowparams ("dialog-focused"); - factory.set_params ("dialog", true, shadow); - factory.set_params ("modal_dialog", false, shadow); - - //dialog unfocused - shadow = get_shadowparams ("dialog-unfocused"); - factory.set_params ("dialog", false, shadow); - factory.set_params ("modal_dialog", false, shadow); - } - - private static Meta.ShadowParams get_shadowparams (string class_name) { - var val = shadow_settings.get_strv (class_name); - if (val == null || val.length != 5 || int.parse (val[0]) < 1) { - warning ("Invalid shadow settings"); - return Meta.ShadowParams () { - radius = 1, - top_fade = 0, - x_offset = 0, - y_offset = 0, - opacity = 0 - }; - } - - return Meta.ShadowParams () { - radius = int.parse (val[0]), - top_fade = int.parse (val[1]), - x_offset = int.parse (val[2]), - y_offset = int.parse (val[3]), - opacity = (uint8)int.parse (val[4]) - }; - } - /** * set the area where clutter can receive events **/ diff --git a/src/WindowManager.vala b/src/WindowManager.vala index 0edf524f..233ae726 100644 --- a/src/WindowManager.vala +++ b/src/WindowManager.vala @@ -280,11 +280,6 @@ namespace Gala { Meta.KeyBinding.set_custom_handler ("move-to-workspace-left", (Meta.KeyHandlerFunc) handle_move_to_workspace); Meta.KeyBinding.set_custom_handler ("move-to-workspace-right", (Meta.KeyHandlerFunc) handle_move_to_workspace); - /*shadows*/ - InternalUtils.reload_shadow (); - var shadow_settings = new GLib.Settings (Config.SCHEMA + ".shadows"); - shadow_settings.changed.connect (InternalUtils.reload_shadow); - unowned var monitor_manager = display.get_context ().get_backend ().get_monitor_manager (); monitor_manager.monitors_changed.connect (on_monitors_changed);