diff options
| author | Tobias Weimer <wishmaster51@googlemail.com> | 2015-02-09 21:46:06 +0000 |
|---|---|---|
| committer | Tobias Weimer <wishmaster51@googlemail.com> | 2015-02-09 21:46:06 +0000 |
| commit | cf75702c55570a6c7ffe7a980aef47538cd1522e (patch) | |
| tree | 037625c5837c5ba5c962d3fb00e836857f5b4e63 /plugins/wbOSD/src | |
| parent | 7e1c726175d39a6fa069d10fb0fdc88b0ec81b0b (diff) | |
wbOSD:
-Minor fixes
git-svn-id: http://svn.miranda-ng.org/main/trunk@12077 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/wbOSD/src')
| -rw-r--r-- | plugins/wbOSD/src/wbOSD.cpp | 45 |
1 files changed, 27 insertions, 18 deletions
diff --git a/plugins/wbOSD/src/wbOSD.cpp b/plugins/wbOSD/src/wbOSD.cpp index 88b770028a..bb7eb97355 100644 --- a/plugins/wbOSD/src/wbOSD.cpp +++ b/plugins/wbOSD/src/wbOSD.cpp @@ -14,21 +14,18 @@ const static osdmsg defstr={_T(""), 0, RGB(0, 0, 0), 0, 0}; int DrawMe(HWND hwnd, TCHAR *string, COLORREF color)
{
- PAINTSTRUCT ps;
- RECT rect, rect2;
- UINT talign=0;
- int sxo, syo;
- plgsettings plgs;
-
logmsg("DrawMe");
if (!string) string=_T("bullshit");
+ plgsettings plgs;
loadDBSettings(&plgs);
HFONT fh=CreateFontIndirect(&(plgs.lf));
-
+
+ PAINTSTRUCT ps;
HDC hdc=BeginPaint(hwnd, &ps);
SetBkMode(hdc, TRANSPARENT);
+ RECT rect;
GetClientRect(hwnd, &rect);
HBRUSH bkb=CreateSolidBrush(plgs.bkclr);
FillRect(hdc, &rect, bkb);
@@ -37,14 +34,15 @@ int DrawMe(HWND hwnd, TCHAR *string, COLORREF color) HGDIOBJ oo=SelectObject(hdc, fh);
- rect2 = rect;
+ UINT talign=0;
+ RECT rect2 = rect;
DrawText(hdc, string, -1, &rect2, DT_WORDBREAK|DT_CALCRECT);
- if (plgs.align>=1 && plgs.align<=3)
+ if (plgs.align<=3)
rect.top=0;
- if (plgs.align>=4 && plgs.align<=6)
+ else if (plgs.align<=6)
rect.top=(rect.bottom-rect2.bottom)/2;
- if (plgs.align>=7 && plgs.align<=9)
+ else if (plgs.align<=9)
rect.top=rect.bottom-rect2.bottom;
if (((plgs.align-1)%3)==0)
@@ -59,14 +57,25 @@ int DrawMe(HWND hwnd, TCHAR *string, COLORREF color) //draw shadow
if (plgs.showShadow) {
+ int sxo, syo;
logmsg("DrawMe::showShadow");
- if (plgs.salign>=1 && plgs.salign<=3) syo=-plgs.distance;
- if (plgs.salign>=4 && plgs.salign<=6) syo=0;
- if (plgs.salign>=7 && plgs.salign<=9) syo=plgs.distance;
-
- if (((plgs.salign-1)%3)==0) sxo=-plgs.distance;
- else if (((plgs.salign-2)%3)==0) sxo=0;
- else if (((plgs.salign-3)%3)==0) sxo=plgs.distance;
+ if (plgs.salign<=3)
+ syo=-plgs.distance;
+ else if (plgs.salign<=6)
+ syo=0;
+ else if (plgs.salign<=9)
+ syo=plgs.distance;
+ else
+ syo=0;
+
+ if (((plgs.salign-1)%3)==0)
+ sxo=-plgs.distance;
+ else if (((plgs.salign-2)%3)==0)
+ sxo=0;
+ else if (((plgs.salign-3)%3)==0)
+ sxo=plgs.distance;
+ else
+ sxo=0;
SetTextColor(hdc, plgs.clr_shadow);
if (plgs.altShadow==0) {
|