diff options
| author | Michele Calgaro <[email protected]> | 2014-11-20 11:05:41 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2014-11-20 11:05:41 +0900 |
| commit | 46acebe4a0a93375e76c9a98481d03b64adfe357 (patch) | |
| tree | 4f1be720b4c799827abf16f94e32e74242106106 /kcontrol | |
| parent | a1125663869f976934e166f6612d235826a2fd51 (diff) | |
| parent | 154df4875e51f83f64b4c3f431867de79c1707fb (diff) | |
| download | tdebase-46acebe4a0a93375e76c9a98481d03b64adfe357.tar.gz tdebase-46acebe4a0a93375e76c9a98481d03b64adfe357.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'kcontrol')
| -rw-r--r-- | kcontrol/background/crossfade.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kcontrol/background/crossfade.h b/kcontrol/background/crossfade.h index dba34a3b4..da589aac4 100644 --- a/kcontrol/background/crossfade.h +++ b/kcontrol/background/crossfade.h @@ -31,8 +31,8 @@ inline TQPixmap crossFade(const TQPixmap &pix1, const TQPixmap &pix2, double r_a mw = pix1.width(); mh = pix1.height(); - int alpha = 0xffff * (1-r_alpha); - + short unsigned int alpha = 0xffff * (1-r_alpha); + XRenderColor clr = { 0, 0, 0, alpha }; XRenderPictureAttributes pa; pa.repeat = True; |