← Back to branch summary

~ubuntu-branches/ubuntu/vivid/clutter-1.0/vivid-proposed

« back to all changes in this revision

Viewing changes to clutter/deprecated/clutter-rectangle.c

  • Committer: Package Import Robot
  • Author(s): Emilio Pozuelo Monfort
  • Date: 2014-03-26 11:51:28 UTC
  • mfrom: (1.5.1) (4.1.30 experimental)
  • Revision ID: package-import@ubuntu.com-20140326115128-timmbsde8734o6wz
Tags: 1.18.0-1
* New upstream release.
* debian/control.in:
  + Bump gtk-doc-tools build dependency.
  + Also break libcogl15.
  + Standards-Version is 3.9.5, no changes needed.
* debian/libclutter-1.0-0.symbols:
  + Drop a few symbols that were accidentally exported in the DSO because
    they had a clutter_ prefix but were not in the public headers.
  + Add one new symbol.
  + Drop unnecessary debian revisions from some symbols.
* debian/control.in,
  debian/rules,
  debian/libclutter-1.0-0.symbols:
  + Temporarily disable evdev input support. It was only enabled in 1.17.6-1
    in experimental and there is nothing using it yet, and I would like to
    wait a bit before uploading libinput to unstable as the ABI isn't stable
    yet.
* d/p/0001-wayland-Add-missing-CLUTTER_AVAILABLE-annotations.patch:
  + Add missing annotations so that a few symbols are exported in the DSO.

* Upload to unstable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
clutter/deprecated/clutter-rectangle.c
48
48
 
49
49
#include "cogl/cogl.h"
50
50
 
51
 
G_DEFINE_TYPE (ClutterRectangle, clutter_rectangle, CLUTTER_TYPE_ACTOR);
 
51
struct _ClutterRectanglePrivate
 
52
{
 
53
  ClutterColor color;
 
54
  ClutterColor border_color;
 
55
 
 
56
  guint border_width;
 
57
 
 
58
  guint has_border : 1;
 
59
};
52
60
 
53
61
enum
54
62
{
62
70
  /* FIXME: Add gradient, rounded corner props etc */
63
71
};
64
72
 
65
 
#define CLUTTER_RECTANGLE_GET_PRIVATE(obj) \
66
 
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), CLUTTER_TYPE_RECTANGLE, ClutterRectanglePrivate))
67
 
 
68
 
struct _ClutterRectanglePrivate
69
 
{
70
 
  ClutterColor color;
71
 
  ClutterColor border_color;
72
 
 
73
 
  guint border_width;
74
 
 
75
 
  guint has_border : 1;
76
 
};
77
 
 
78
73
static const ClutterColor default_color        = { 255, 255, 255, 255 };
79
74
static const ClutterColor default_border_color = {   0,   0,   0, 255 };
80
75
 
 
76
G_DEFINE_TYPE_WITH_PRIVATE (ClutterRectangle, clutter_rectangle, CLUTTER_TYPE_ACTOR)
 
77
 
81
78
static void
82
79
clutter_rectangle_paint (ClutterActor *self)
83
80
{
319
316
                                                         P_("Whether the rectangle should have a border"),
320
317
                                                         FALSE,
321
318
                                                         CLUTTER_PARAM_READWRITE));
322
 
 
323
 
  g_type_class_add_private (gobject_class, sizeof (ClutterRectanglePrivate));
324
319
}
325
320
 
326
321
static void
328
323
{
329
324
  ClutterRectanglePrivate *priv;
330
325
 
331
 
  self->priv = priv = CLUTTER_RECTANGLE_GET_PRIVATE (self);
 
326
  self->priv = priv = clutter_rectangle_get_instance_private (self);
332
327
 
333
328
  priv->color = default_color;
334
329
  priv->border_color = default_border_color;