← Back to branch summary

~ubuntu-branches/ubuntu/trusty/compiz/trusty

« back to all changes in this revision

Viewing changes to plugins/text/include/text/text.h

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release
  • Date: 2013-08-22 06:58:07 UTC
  • mto: This revision was merged to the branch mainline in revision 3352.
  • Revision ID: package-import@ubuntu.com-20130822065807-17nlzez0d30y09so
Tags: upstream-0.9.10+13.10.20130822
Import upstream version 0.9.10+13.10.20130822

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/text/include/text/text.h
30
30
        /**
31
31
         * Flags to be passed into the flags field of CompTextAttrib
32
32
         */
33
 
        typedef enum {
 
33
        typedef enum
 
34
        {
34
35
            StyleBold      = (1 << 0), /**< render the text in bold */
35
36
            StyleItalic    = (1 << 1), /**< render the text italic */
36
37
            Ellipsized     = (1 << 2), /**< ellipsize the text if the
42
43
                                           rendered text pixmap to a texture */
43
44
        } Flags;
44
45
 
45
 
        typedef struct {
 
46
        typedef struct
 
47
        {
46
48
            const char     *family;    /**< font family */
47
49
            int            size;       /**< font size in points */
48
50
            unsigned short color[4];   /**< font color (RGBA) */
55
57
                                            generated pixmap */
56
58
 
57
59
            int            bgHMargin;  /**< horizontal margin in pixels
58
 
                                            (offset of text into background) */
 
60
                                            (offset of text into background) */
59
61
            int            bgVMargin;  /**< vertical margin */
60
62
            unsigned short bgColor[4]; /**< background color (RGBA) */
61
63
        } Attrib;
83
85
                   float alpha) const;
84
86
 
85
87
    private:
86
 
        int width;
87
 
        int height;
 
88
 
 
89
        int             width;
 
90
        int             height;
88
91
 
89
92
        Pixmap          pixmap;
90
93
        GLTexture::List texture;