[mutter] compositor: remove the overlay_group concept
- From: Giovanni Campagna <gcampagna src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] compositor: remove the overlay_group concept
- Date: Wed, 22 May 2013 16:36:10 +0000 (UTC)
commit e10804727d6b48947753958c30f41b571c1cc6e7
Author: Giovanni Campagna <gcampagna src gnome org>
Date: Wed May 22 18:24:00 2013 +0200
compositor: remove the overlay_group concept
The hierarchy handling is handled in the shell by adding stuff
directly to the uiGroup, and we have a dedicated actor for
the overview there, so we don't need this anymore.
https://bugzilla.gnome.org/show_bug.cgi?id=700735
src/compositor/compositor.c | 27 ++-------------------------
src/meta/compositor-mutter.h | 1 -
2 files changed, 2 insertions(+), 26 deletions(-)
---
diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
index dbaaca2..86abfaf 100644
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -53,17 +53,15 @@
*
* # Containers #
*
- * There's three containers in the stage that can be used to place actors, here
+ * There's two containers in the stage that are used to place window actors, here
* are listed in the order in which they are painted:
*
* - window group, accessible with meta_get_window_group_for_screen()
* - top window group, accessible with meta_get_top_window_group_for_screen()
- * - overlay group, accessible with meta_get_overlay_group_for_screen()
*
* Mutter will place actors representing windows in the window group, except for
* override-redirect windows (ie. popups and menus) which will be placed in the
- * top window group. Mutter won't put any actors in the overlay group, but it's
- * intended for compositors to place there panel, dashes, status bars, etc.
+ * top window group.
*/
#include <config.h>
@@ -256,23 +254,6 @@ meta_get_stage_for_screen (MetaScreen *screen)
}
/**
- * meta_get_overlay_group_for_screen:
- * @screen: a #MetaScreen
- *
- * Returns: (transfer none): The overlay group corresponding to @screen
- */
-ClutterActor *
-meta_get_overlay_group_for_screen (MetaScreen *screen)
-{
- MetaCompScreen *info = meta_screen_get_compositor_data (screen);
-
- if (!info)
- return NULL;
-
- return info->overlay_group;
-}
-
-/**
* meta_get_window_group_for_screen:
* @screen: a #MetaScreen
*
@@ -649,11 +630,9 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
info->window_group = meta_window_group_new (screen);
info->top_window_group = meta_window_group_new (screen);
- info->overlay_group = clutter_actor_new ();
clutter_actor_add_child (info->stage, info->window_group);
clutter_actor_add_child (info->stage, info->top_window_group);
- clutter_actor_add_child (info->stage, info->overlay_group);
info->plugin_mgr = meta_plugin_manager_new (screen);
@@ -684,8 +663,6 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
info->pending_input_region = None;
}
- clutter_actor_show (info->overlay_group);
-
/* Map overlay window before redirecting windows offscreen so we catch their
* contents until we show the stage.
*/
diff --git a/src/meta/compositor-mutter.h b/src/meta/compositor-mutter.h
index 665330a..357b42e 100644
--- a/src/meta/compositor-mutter.h
+++ b/src/meta/compositor-mutter.h
@@ -35,7 +35,6 @@
/* Public compositor API */
ClutterActor *meta_get_stage_for_screen (MetaScreen *screen);
-ClutterActor *meta_get_overlay_group_for_screen (MetaScreen *screen);
Window meta_get_overlay_window (MetaScreen *screen);
GList *meta_get_window_actors (MetaScreen *screen);
ClutterActor *meta_get_window_group_for_screen (MetaScreen *screen);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]