diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rw-r--r-- | rounded_corners.patch | 31 |
4 files changed, 21 insertions, 20 deletions
@@ -1,7 +1,7 @@ pkgbase = mutter-rounded pkgdesc = A window manager for GNOME, with rounded corners patch (integrate mr1441) pkgver = 41.3 - pkgrel = 1.2 + pkgrel = 1.3 url = https://gitlab.gnome.org/GNOME/mutter install = mutter.install arch = x86_64 @@ -50,7 +50,7 @@ pkgbase = mutter-rounded source = mr1441.patch sha256sums = SKIP sha256sums = SKIP - sha256sums = 347cb5fd030d693b9d7892e8f27157f5fbc12c6e2611a12acc0174d89c4c6cf3 + sha256sums = 675b2e8e07ed0cd29578a4f4a5c251d52477848e1edcff68be5d96e0530c637a sha256sums = 895f35f5e8a458c71b4312061cf7d2b0108a3c6df4b0324ab342c5a3576ee09a sha256sums = dc4279ec3c0995ba9a9ee3ecd581376140c78089a058863dea0bd9ec7894dc49 sha256sums = 2ec553a260497f0ac0180512201c9819b10159a15fcbc6d5007932d8e2a44844 diff --git a/.gitignore b/.gitignore index e6f913c9d6f1..51ea8a2b6800 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ /src /pkg /mutter-rounded -/mutter-settings +/mutter_settings mutter-settings.tar mutter_setting *pkg.tar.zst @@ -7,7 +7,7 @@ pkgname=mutter-rounded pkgver=41.3 -pkgrel=1.2 +pkgrel=1.3 pkgdesc="A window manager for GNOME, with rounded corners patch (integrate mr1441)" url="https://gitlab.gnome.org/GNOME/mutter" arch=(x86_64) @@ -49,7 +49,7 @@ source=("$_mutter_src" ) sha256sums=('SKIP' 'SKIP' - '347cb5fd030d693b9d7892e8f27157f5fbc12c6e2611a12acc0174d89c4c6cf3' + '675b2e8e07ed0cd29578a4f4a5c251d52477848e1edcff68be5d96e0530c637a' '895f35f5e8a458c71b4312061cf7d2b0108a3c6df4b0324ab342c5a3576ee09a' 'dc4279ec3c0995ba9a9ee3ecd581376140c78089a058863dea0bd9ec7894dc49' '2ec553a260497f0ac0180512201c9819b10159a15fcbc6d5007932d8e2a44844' diff --git a/rounded_corners.patch b/rounded_corners.patch index ec007b8a15cf..cba8116b706f 100644 --- a/rounded_corners.patch +++ b/rounded_corners.patch @@ -854,7 +854,7 @@ index 9e64462ea..7c003a342 100644 /* The frame bounds are already subtracted from actor_x11->shadow_clip diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c -index b32df2010..9d2994e74 100644 +index b32df2010..012b67c2b 100644 --- a/src/compositor/meta-window-actor.c +++ b/src/compositor/meta-window-actor.c @@ -41,6 +41,9 @@ @@ -883,7 +883,7 @@ index b32df2010..9d2994e74 100644 int geometry_scale; /* -@@ -119,6 +131,247 @@ G_DEFINE_ABSTRACT_TYPE_WITH_CODE (MetaWindowActor, meta_window_actor, CLUTTER_TY +@@ -119,6 +131,246 @@ G_DEFINE_ABSTRACT_TYPE_WITH_CODE (MetaWindowActor, meta_window_actor, CLUTTER_TY G_IMPLEMENT_INTERFACE (META_TYPE_CULLABLE, cullable_iface_init) G_IMPLEMENT_INTERFACE (META_TYPE_SCREEN_CAST_WINDOW, screen_cast_window_iface_init)); @@ -1065,8 +1065,7 @@ index b32df2010..9d2994e74 100644 + MetaWindowActorPrivate *priv = meta_window_actor_get_instance_private (self); + MetaWindow *window = priv->window; + -+ if (/* meta_window_get_client_type(window) == META_WINDOW_CLIENT_TYPE_WAYLAND || */ -+ meta_prefs_in_black_list(window->res_name)) ++ if (meta_prefs_in_black_list(window->res_name)) + { + return FALSE; + } @@ -1131,7 +1130,7 @@ index b32df2010..9d2994e74 100644 static void meta_window_actor_class_init (MetaWindowActorClass *klass) { -@@ -216,6 +469,11 @@ meta_window_actor_init (MetaWindowActor *self) +@@ -216,6 +468,11 @@ meta_window_actor_init (MetaWindowActor *self) meta_window_actor_get_instance_private (self); priv->geometry_scale = 1; @@ -1143,7 +1142,7 @@ index b32df2010..9d2994e74 100644 } static void -@@ -368,6 +626,11 @@ meta_window_actor_real_assign_surface_actor (MetaWindowActor *self, +@@ -368,6 +625,11 @@ meta_window_actor_real_assign_surface_actor (MetaWindowActor *self, meta_window_actor_set_frozen (self, TRUE); else meta_window_actor_sync_thawed_state (self); @@ -1155,7 +1154,7 @@ index b32df2010..9d2994e74 100644 } void -@@ -399,6 +662,31 @@ init_surface_actor (MetaWindowActor *self) +@@ -399,6 +661,32 @@ init_surface_actor (MetaWindowActor *self) meta_window_actor_assign_surface_actor (self, surface_actor); } @@ -1180,6 +1179,7 @@ index b32df2010..9d2994e74 100644 + MetaWindowActor *actor = meta_window_actor_from_window (self); + MetaWindowActorPrivate *priv = meta_window_actor_get_instance_private (actor); + ++ priv->round_clip_effect = create_clip_effect(actor); + meta_window_actor_create_blur_actor(actor); + g_clear_signal_handler(&priv->wm_class_changed_id, self); +} @@ -1219,15 +1219,16 @@ index b32df2010..9d2994e74 100644 meta_compositor_remove_window_actor (compositor, self); g_clear_object (&priv->window); -@@ -470,6 +769,7 @@ meta_window_actor_set_property (GObject *object, +@@ -470,6 +769,8 @@ meta_window_actor_set_property (GObject *object, { case PROP_META_WINDOW: priv->window = g_value_dup_object (value); -+ priv->round_clip_effect = create_clip_effect(self); ++ if (priv->window->client_type == META_WINDOW_CLIENT_TYPE_X11) ++ priv->round_clip_effect = create_clip_effect(self); g_signal_connect_object (priv->window, "notify::appears-focused", G_CALLBACK (window_appears_focused_notify), self, 0); break; -@@ -588,6 +888,7 @@ meta_window_actor_effect_in_progress (MetaWindowActor *self) +@@ -588,6 +889,7 @@ meta_window_actor_effect_in_progress (MetaWindowActor *self) meta_window_actor_get_instance_private (self); return (priv->minimize_in_progress || @@ -1235,7 +1236,7 @@ index b32df2010..9d2994e74 100644 priv->size_change_in_progress || priv->map_in_progress || priv->destroy_in_progress); -@@ -606,6 +907,47 @@ is_freeze_thaw_effect (MetaPluginEffect event) +@@ -606,6 +908,47 @@ is_freeze_thaw_effect (MetaPluginEffect event) } } @@ -1283,7 +1284,7 @@ index b32df2010..9d2994e74 100644 static gboolean start_simple_effect (MetaWindowActor *self, MetaPluginEffect event) -@@ -625,15 +967,33 @@ start_simple_effect (MetaWindowActor *self, +@@ -625,15 +968,33 @@ start_simple_effect (MetaWindowActor *self, case META_PLUGIN_NONE: return FALSE; case META_PLUGIN_MINIMIZE: @@ -1317,7 +1318,7 @@ index b32df2010..9d2994e74 100644 counter = &priv->destroy_in_progress; break; case META_PLUGIN_SIZE_CHANGE: -@@ -682,6 +1042,7 @@ meta_window_actor_after_effects (MetaWindowActor *self) +@@ -682,6 +1043,7 @@ meta_window_actor_after_effects (MetaWindowActor *self) g_signal_emit (self, signals[EFFECTS_COMPLETED], 0); meta_window_actor_sync_visibility (self); meta_window_actor_sync_actor_geometry (self, FALSE); @@ -1325,7 +1326,7 @@ index b32df2010..9d2994e74 100644 } clutter_stage_repick_device (stage, clutter_seat_get_pointer (seat)); -@@ -803,6 +1164,19 @@ meta_window_actor_queue_destroy (MetaWindowActor *self) +@@ -803,6 +1165,19 @@ meta_window_actor_queue_destroy (MetaWindowActor *self) clutter_actor_destroy (CLUTTER_ACTOR (self)); } @@ -1345,7 +1346,7 @@ index b32df2010..9d2994e74 100644 MetaWindowActorChanges meta_window_actor_sync_actor_geometry (MetaWindowActor *self, gboolean did_placement) -@@ -1031,7 +1405,7 @@ meta_window_actor_sync_visibility (MetaWindowActor *self) +@@ -1031,7 +1406,7 @@ meta_window_actor_sync_visibility (MetaWindowActor *self) if (CLUTTER_ACTOR_IS_VISIBLE (self) != priv->visible) { |