diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2018-03-06 20:24:07 +0300 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2018-03-07 12:54:58 +0300 |
| commit | bebafc42ab6199e86d4c2c901fac8d091bfffef0 (patch) | |
| tree | f3961879845e89688c6628dccf1a3c9cd3ebb9b3 /plugins/Clist_modern | |
| parent | 7e9fef8a6ff35c63f9217fcc618d77f660e45245 (diff) | |
some fixes
Diffstat (limited to 'plugins/Clist_modern')
| -rw-r--r-- | plugins/Clist_modern/src/modern_clcpaint.cpp | 1 | ||||
| -rw-r--r-- | plugins/Clist_modern/src/modern_skinengine.cpp | 11 |
2 files changed, 4 insertions, 8 deletions
diff --git a/plugins/Clist_modern/src/modern_clcpaint.cpp b/plugins/Clist_modern/src/modern_clcpaint.cpp index e930994dea..c3208bfd1e 100644 --- a/plugins/Clist_modern/src/modern_clcpaint.cpp +++ b/plugins/Clist_modern/src/modern_clcpaint.cpp @@ -753,7 +753,6 @@ void CLCPaint::_PaintRowItemsEx(HDC hdcMem, ClcData *dat, ClcContact *Drawing, R SetRect(&rc, fr_rc.right - x, p_rect.top, fr_rc.right - x + ICON_HEIGHT, p_rect.bottom);
if (dat->text_rtl != 0) _RTLRect(&rc, free_row_rc.right);
Drawing->pos_extra[iImage] = rc;
- Drawing->pos_extra[iImage] = rc;
if (Drawing->iExtraImage[iImage] != EMPTY_EXTRA_ICON)
ske_ImageList_DrawEx(dat->himlExtraColumns, Drawing->iExtraImage[iImage], hdcMem, rc.left, rc.top, 0, 0, CLR_NONE, colourFg, mode);
}
diff --git a/plugins/Clist_modern/src/modern_skinengine.cpp b/plugins/Clist_modern/src/modern_skinengine.cpp index 9ac08875bd..986de4cac7 100644 --- a/plugins/Clist_modern/src/modern_skinengine.cpp +++ b/plugins/Clist_modern/src/modern_skinengine.cpp @@ -1016,11 +1016,9 @@ static int ske_DrawSkinObject(SKINDRAWREQUEST * preq, GLYPHOBJECT * pobj) membmp = ske_CreateDIB32(PRect.right - PRect.left, PRect.bottom - PRect.top); oldbmp = (HBITMAP)SelectObject(memdc, membmp); if (oldbmp == nullptr) { - if (mode == 2) { - SelectObject(memdc, oldbmp); - DeleteDC(memdc); - DeleteObject(membmp); - } + SelectObject(memdc, oldbmp); + DeleteDC(memdc); + DeleteObject(membmp); return 0; } } @@ -1244,8 +1242,7 @@ static int ske_DrawSkinObject(SKINDRAWREQUEST * preq, GLYPHOBJECT * pobj) if ((k > 0 || k == -1) && mode == 2) { { BLENDFUNCTION bf = { AC_SRC_OVER, 0, pobj->dwAlpha, BYTE(pobj->bmBitsPixel == 32 && pobj->Style != ST_BRUSH ? AC_SRC_ALPHA : 0) }; - if (mode == 2) - OffsetRect(&PRect, mode2offset.x, mode2offset.y); + OffsetRect(&PRect, mode2offset.x, mode2offset.y); ske_AlphaBlend(preq->hDC, PRect.left, PRect.top, PRect.right - PRect.left, PRect.bottom - PRect.top, memdc, 0, 0, PRect.right - PRect.left, PRect.bottom - PRect.top, bf); } |