From 5c170b2e4e23af32ab0458c32820822ce319db82 Mon Sep 17 00:00:00 2001 From: Leo Date: Wed, 14 Jun 2023 04:25:46 +0900 Subject: [PATCH] Deduplicate ShadowEffect class (#1691) --- {src => lib}/ShadowEffect.vala | 0 lib/meson.build | 1 + plugins/pip/ShadowEffect.vala | 165 --------------------------------- plugins/pip/meson.build | 3 +- src/meson.build | 1 - 5 files changed, 2 insertions(+), 168 deletions(-) rename {src => lib}/ShadowEffect.vala (100%) delete mode 100644 plugins/pip/ShadowEffect.vala diff --git a/src/ShadowEffect.vala b/lib/ShadowEffect.vala similarity index 100% rename from src/ShadowEffect.vala rename to lib/ShadowEffect.vala diff --git a/lib/meson.build b/lib/meson.build index 00d1bfe4..25c5432e 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -9,6 +9,7 @@ gala_lib_sources = files( 'Drawing/Color.vala', 'Drawing/Utilities.vala', 'Plugin.vala', + 'ShadowEffect.vala', 'Utils.vala', 'WindowIcon.vala', 'WindowManager.vala', diff --git a/plugins/pip/ShadowEffect.vala b/plugins/pip/ShadowEffect.vala deleted file mode 100644 index 40c39aaf..00000000 --- a/plugins/pip/ShadowEffect.vala +++ /dev/null @@ -1,165 +0,0 @@ -/* - * Copyright 2014 Tom Beckmann - * Copyright 2023 elementary, Inc. - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -public class Gala.Plugins.PIP.ShadowEffect : Clutter.Effect { - private class Shadow { - public int users; - public Cogl.Texture texture; - - public Shadow (Cogl.Texture _texture) { - texture = _texture; - users = 1; - } - } - - // the sizes of the textures often repeat, especially for the background actor - // so we keep a cache to avoid creating the same texture all over again. - private static Gee.HashMap shadow_cache; - private static Gtk.StyleContext style_context; - - class construct { - shadow_cache = new Gee.HashMap (); - - var style_path = new Gtk.WidgetPath (); - var id = style_path.append_type (typeof (Gtk.Window)); - - style_context = new Gtk.StyleContext (); - style_context.add_provider (Gala.Utils.get_gala_css (), Gtk.STYLE_PROVIDER_PRIORITY_FALLBACK); - style_context.add_class ("decoration"); - style_context.set_path (style_path); - } - - public int shadow_size { get; construct; } - - public float scale_factor { get; set; default = 1; } - public uint8 shadow_opacity { get; set; default = 255; } - public string? css_class { get; set; default = null; } - - private Cogl.Pipeline pipeline; - private string? current_key = null; - - public ShadowEffect (int shadow_size) { - Object (shadow_size: shadow_size); - } - - construct { - pipeline = new Cogl.Pipeline (Clutter.get_default_backend ().get_cogl_context ()); - } - - ~ShadowEffect () { - if (current_key != null) { - decrement_shadow_users (current_key); - } - } - - private Cogl.Texture? get_shadow (Cogl.Context context, int width, int height, int shadow_size) { - var old_key = current_key; - current_key = "%ix%i:%i".printf (width, height, shadow_size); - if (old_key == current_key) { - return null; - } - - if (old_key != null) { - decrement_shadow_users (old_key); - } - - Shadow? shadow = null; - if ((shadow = shadow_cache.@get (current_key)) != null) { - shadow.users++; - return shadow.texture; - } - - var surface = new Cairo.ImageSurface (Cairo.Format.ARGB32, width, height); - var cr = new Cairo.Context (surface); - cr.set_source_rgba (0, 0, 0, 0); - cr.fill (); - - cr.set_operator (Cairo.Operator.OVER); - cr.save (); - cr.scale (scale_factor, scale_factor); - style_context.save (); - if (css_class != null) { - style_context.add_class (css_class); - } - - style_context.set_scale ((int)scale_factor); - style_context.render_background (cr, shadow_size, shadow_size, width - shadow_size * 2, height - shadow_size * 2); - style_context.restore (); - cr.restore (); - - cr.paint (); - - try { - var texture = new Cogl.Texture2D.from_data (context, width, height, Cogl.PixelFormat.BGRA_8888_PRE, - surface.get_stride (), surface.get_data ()); - shadow_cache.@set (current_key, new Shadow (texture)); - - return texture; - } catch (Error e) { - debug (e.message); - return null; - } - } - - private void decrement_shadow_users (string key) { - var shadow = shadow_cache.@get (key); - - if (shadow == null) { - return; - } - - if (--shadow.users == 0) { - shadow_cache.unset (key); - } - } - - public override void paint (Clutter.PaintNode node, Clutter.PaintContext context, Clutter.EffectPaintFlags flags) { - var bounding_box = get_bounding_box (); - var width = (int) (bounding_box.x2 - bounding_box.x1); - var height = (int) (bounding_box.y2 - bounding_box.y1); - - var shadow = get_shadow (context.get_framebuffer ().get_context (), width, height, shadow_size); - if (shadow != null) { - pipeline.set_layer_texture (0, shadow); - } - - var opacity = actor.get_paint_opacity () * shadow_opacity / 255; - var alpha = Cogl.Color.from_4ub (255, 255, 255, opacity); - alpha.premultiply (); - - pipeline.set_color (alpha); - - context.get_framebuffer ().draw_rectangle (pipeline, bounding_box.x1, bounding_box.y1, bounding_box.x2, bounding_box.y2); - - actor.continue_paint (context); - } - - public virtual Clutter.ActorBox get_bounding_box () { - var size = shadow_size * scale_factor; - var bounding_box = Clutter.ActorBox (); - - bounding_box.set_origin (-size, -size); - bounding_box.set_size (actor.width + size * 2, actor.height + size * 2); - - return bounding_box; - } - - public override bool modify_paint_volume (Clutter.PaintVolume volume) { - var bounding_box = get_bounding_box (); - - volume.set_width (bounding_box.get_width ()); - volume.set_height (bounding_box.get_height ()); - - float origin_x, origin_y; - bounding_box.get_origin (out origin_x, out origin_y); - var origin = volume.get_origin (); - origin.x += origin_x; - origin.y += origin_y; - volume.set_origin (origin); - - return true; - } -} diff --git a/plugins/pip/meson.build b/plugins/pip/meson.build index 57a1aff7..198d1bbf 100644 --- a/plugins/pip/meson.build +++ b/plugins/pip/meson.build @@ -1,8 +1,7 @@ gala_pip_sources = [ 'Main.vala', 'PopupWindow.vala', - 'SelectionArea.vala', - 'ShadowEffect.vala', + 'SelectionArea.vala' ] gala_pip_lib = shared_library( diff --git a/src/meson.build b/src/meson.build index 6177a429..a60a295e 100644 --- a/src/meson.build +++ b/src/meson.build @@ -13,7 +13,6 @@ gala_bin_sources = files( 'ScreenSaverManager.vala', 'ScreenshotManager.vala', 'SessionManager.vala', - 'ShadowEffect.vala', 'WindowListener.vala', 'WindowManager.vala', 'WindowTracker.vala',