isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-23 08:24:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

clutter-wayland-surface: Rename the width/height properties

Browse Source 
This patch renames the width/height properties to
surface-width/surface-height so that they won't override the
width/height properties of ClutterActor which have different
semantics.

Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
This commit is contained in:
Neil Roberts 2012-01-09 16:13:03 +00:00
parent 1b77565e63
commit 8ac2200aac
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
clutter/wayland/clutter-wayland-surface.c
View File

@ -54,8 +54,8 @@
enum
{
PROP_SURFACE = 1,
PROP_WIDTH,
PROP_HEIGHT
PROP_SURFACE_WIDTH,
PROP_SURFACE_HEIGHT
};
#if 0
@ -204,12 +204,12 @@ set_size (ClutterWaylandSurface *self,
if (priv->width != width)
{
priv->width = width;
g_object_notify (G_OBJECT (self), "width");
g_object_notify (G_OBJECT (self), "surface-width");
}
if (priv->height != height)
{
priv->height = height;
g_object_notify (G_OBJECT (self), "height");
g_object_notify (G_OBJECT (self), "surface-height");
}
clutter_actor_set_size (CLUTTER_ACTOR (self), priv->width, priv->height);
@ -289,10 +289,10 @@ clutter_wayland_surface_get_property (GObject *object,
case PROP_SURFACE:
g_value_set_pointer (value, priv->surface);
break;
case PROP_WIDTH:
case PROP_SURFACE_WIDTH:
g_value_set_uint (value, priv->width);
break;
case PROP_HEIGHT:
case PROP_SURFACE_HEIGHT:
g_value_set_uint (value, priv->height);
break;
default:
@ -420,23 +420,23 @@ clutter_wayland_surface_class_init (ClutterWaylandSurfaceClass *klass)
g_object_class_install_property (object_class, PROP_SURFACE, pspec);
pspec = g_param_spec_uint ("width",
pspec = g_param_spec_uint ("surface-width",
P_("Surface width"),
P_("The width of the underlying wayland surface"),
0, G_MAXUINT,
0,
G_PARAM_READABLE);
g_object_class_install_property (object_class, PROP_WIDTH, pspec);
g_object_class_install_property (object_class, PROP_SURFACE_WIDTH, pspec);
pspec = g_param_spec_uint ("height",
pspec = g_param_spec_uint ("surface-height",
P_("Surface height"),
P_("The height of the underlying wayland surface"),
0, G_MAXUINT,
0,
G_PARAM_READABLE);
g_object_class_install_property (object_class, PROP_HEIGHT, pspec);
g_object_class_install_property (object_class, PROP_SURFACE_HEIGHT, pspec);
}
/**