diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-15 18:52:16 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-15 18:52:16 +0000 |
| commit | 58973a21a30bf95427fd43c456e41e35c386218c (patch) | |
| tree | 1413fba069ecd351b2c99fa5a53e52c68d8a662c /plugins/Popup/src/avatars_simple.cpp | |
| parent | 55b5cf8a5506f03350e5c80ac86f5717425e4d10 (diff) | |
another portion of "#ifsef Unicode" removal
git-svn-id: http://svn.miranda-ng.org/main/trunk@434 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Popup/src/avatars_simple.cpp')
| -rw-r--r-- | plugins/Popup/src/avatars_simple.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/plugins/Popup/src/avatars_simple.cpp b/plugins/Popup/src/avatars_simple.cpp index 2c3b3341cb..b152afdc47 100644 --- a/plugins/Popup/src/avatars_simple.cpp +++ b/plugins/Popup/src/avatars_simple.cpp @@ -104,7 +104,7 @@ void SimpleAvatar::draw(MyBitmap *bmp, int x, int y, int w, int h, POPUPOPTIONS SelectObject(hdcTmp, av->hbmPic);
SetStretchBltMode(bmp->getDC(), HALFTONE);
-#if defined(_UNICODE)
+
if (av->dwFlags & AVS_HASTRANSPARENCY)
{
BLENDFUNCTION bf;
@@ -113,17 +113,7 @@ void SimpleAvatar::draw(MyBitmap *bmp, int x, int y, int w, int h, POPUPOPTIONS bf.SourceConstantAlpha = 255;
bf.AlphaFormat = AC_SRC_ALPHA;
AlphaBlend(bmp->getDC(), x, y, w, h, hdcTmp, 0, 0, av->bmWidth, av->bmHeight, bf);
-#else
-// if (MyAlphaBlend && (av->dwFlags & AVS_PREMULTIPLIED))
- if (MyAlphaBlend && (av->dwFlags & AVS_HASTRANSPARENCY))
- {
- BLENDFUNCTION bf;
- bf.BlendOp = AC_SRC_OVER;
- bf.BlendFlags = 0;
- bf.SourceConstantAlpha = 255;
- bf.AlphaFormat = AC_SRC_ALPHA;
- MyAlphaBlend(bmp->getDC(), x, y, w, h, hdcTmp, 0, 0, av->bmWidth, av->bmHeight, bf);
-#endif
+
if (options->avatarBorders && options->avatarPNGBorders)
{
HBRUSH hbr = CreateSolidBrush(fonts.clAvatarBorder);
|