brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

window-actor: Replace no-shadow with a shadow-mode

Browse Source 
The elementary guys want to be able to force shadows *on*, for use in
their overview.
This commit is contained in:
Jasper St. Pierre 2015-07-05 23:27:49 -07:00
parent 9f04c58ffe
commit 9fc1c919e8
2 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/compositor/meta-window-actor.c
View File

@ -20,6 +20,7 @@
#include "frame.h" #include "frame.h"
#include <meta/window.h> #include <meta/window.h>
#include <meta/meta-shaped-texture.h> #include <meta/meta-shaped-texture.h>
#include <meta/meta-enum-types.h>
#include "compositor-private.h" #include "compositor-private.h"
#include "meta-shaped-texture-private.h" #include "meta-shaped-texture-private.h"
@ -74,6 +75,8 @@ struct _MetaWindowActorPrivate
MetaWindowShape *shadow_shape; MetaWindowShape *shadow_shape;
char * shadow_class; char * shadow_class;
MetaShadowMode shadow_mode;
guint send_frame_messages_timer; guint send_frame_messages_timer;
gint64 frame_drawn_time; gint64 frame_drawn_time;
@ -109,8 +112,6 @@ struct _MetaWindowActorPrivate
guint needs_destroy : 1; guint needs_destroy : 1;
guint no_shadow : 1;
guint updates_frozen : 1; guint updates_frozen : 1;
guint first_frame_state : 2; /* FirstFrameState */ guint first_frame_state : 2; /* FirstFrameState */
}; };
@ -146,7 +147,7 @@ static guint signals[LAST_SIGNAL] = { 0 };
enum enum
{ {
PROP_META_WINDOW = 1, PROP_META_WINDOW = 1,
PROP_NO_SHADOW, PROP_SHADOW_MODE,
PROP_SHADOW_CLASS PROP_SHADOW_CLASS
}; };
@ -244,14 +245,15 @@ meta_window_actor_class_init (MetaWindowActorClass *klass)
PROP_META_WINDOW, PROP_META_WINDOW,
pspec); pspec);
pspec = g_param_spec_boolean ("no-shadow", pspec = g_param_spec_enum ("shadow-mode",
"No shadow", "Shadow mode",
"Do not add shaddow to this window", "Decides when to paint shadows",
FALSE, META_TYPE_SHADOW_MODE,
G_PARAM_READWRITE); META_SHADOW_MODE_AUTO,
G_PARAM_READWRITE);
g_object_class_install_property (object_class, g_object_class_install_property (object_class,
PROP_NO_SHADOW, PROP_SHADOW_MODE,
pspec); pspec);
pspec = g_param_spec_string ("shadow-class", pspec = g_param_spec_string ("shadow-class",
@ -509,14 +511,14 @@ meta_window_actor_set_property (GObject *object,
g_signal_connect_object (priv->window, "notify::appears-focused", g_signal_connect_object (priv->window, "notify::appears-focused",
G_CALLBACK (window_appears_focused_notify), self, 0); G_CALLBACK (window_appears_focused_notify), self, 0);
break; break;
case PROP_NO_SHADOW: case PROP_SHADOW_MODE:
{ {
gboolean newv = g_value_get_boolean (value); MetaShadowMode newv = g_value_get_enum (value);
if (newv == priv->no_shadow) if (newv == priv->shadow_mode)
return; return;
priv->no_shadow = newv; priv->shadow_mode = newv;
meta_window_actor_invalidate_shadow (self); meta_window_actor_invalidate_shadow (self);
} }
@ -553,8 +555,8 @@ meta_window_actor_get_property (GObject *object,
case PROP_META_WINDOW: case PROP_META_WINDOW:
g_value_set_object (value, priv->window); g_value_set_object (value, priv->window);
break; break;
case PROP_NO_SHADOW: case PROP_SHADOW_MODE:
g_value_set_boolean (value, priv->no_shadow); g_value_set_enum (value, priv->shadow_mode);
break; break;
case PROP_SHADOW_CLASS: case PROP_SHADOW_CLASS:
g_value_set_string (value, priv->shadow_class); g_value_set_string (value, priv->shadow_class);
@ -801,8 +803,10 @@ meta_window_actor_has_shadow (MetaWindowActor *self)
{ {
MetaWindowActorPrivate *priv = self->priv; MetaWindowActorPrivate *priv = self->priv;
if (priv->no_shadow) if (priv->shadow_mode == META_SHADOW_MODE_FORCED_OFF)
return FALSE; return FALSE;
if (priv->shadow_mode == META_SHADOW_MODE_FORCED_ON)
return TRUE;
/* Leaving out shadows for maximized and fullscreen windows is an effeciency /* Leaving out shadows for maximized and fullscreen windows is an effeciency
* win and also prevents the unsightly effect of the shadow of maximized * win and also prevents the unsightly effect of the shadow of maximized

6
src/meta/meta-window-actor.h
View File

@ -62,4 +62,10 @@ MetaWindow * meta_window_actor_get_meta_window (MetaWindowActor *self
ClutterActor * meta_window_actor_get_texture (MetaWindowActor *self); ClutterActor * meta_window_actor_get_texture (MetaWindowActor *self);
gboolean meta_window_actor_is_destroyed (MetaWindowActor *self); gboolean meta_window_actor_is_destroyed (MetaWindowActor *self);
typedef enum {
META_SHADOW_MODE_AUTO,
META_SHADOW_MODE_FORCED_OFF,
META_SHADOW_MODE_FORCED_ON,
} MetaShadowMode;
#endif /* META_WINDOW_ACTOR_H */ #endif /* META_WINDOW_ACTOR_H */