Merge branch 'backport' into work

[chaz/openbox] / render / render.h

diff --git a/render/render.h b/render/render.h
index 5f145083cb63fddbeb8eee4d8c99d2bb6c950be9..706843e33d3aaca4730651619fb2e7cb9547ef35 100644 (file)
--- a/render/render.h
+++ b/render/render.h
@@ -142,12 +142,12 @@ struct _RrTextureText {
     gint shadow_offset_x;
     gint shadow_offset_y;
     RrColor *shadow_color;
-    guchar shadow_alpha;
     gboolean shortcut; /*!< Underline a character */
     guint shortcut_pos; /*!< Position in bytes of the character to underline */
     RrEllipsizeMode ellipsize;
     gboolean flow; /* allow multiple lines.  must set maxwidth below */
     gint maxwidth;
+    guchar shadow_alpha; /* at the bottom to improve alignment */
 };
 
 struct _RrPixmapMask {
@@ -227,6 +227,9 @@ struct _RrAppearance {
 struct _RrImagePic {
     gint width, height;
     RrPixel32 *data;
+    /* The sum of all the pixels.  This is used to compare pictures if their
+       hashes match. */
+    gint sum;
 };
 
 /*! An RrImage is a sort of meta-image.  It can contain multiple versions of