From cf75702c55570a6c7ffe7a980aef47538cd1522e Mon Sep 17 00:00:00 2001
From: Tobias Weimer <wishmaster51@googlemail.com>
Date: Mon, 9 Feb 2015 21:46:06 +0000
Subject: wbOSD: -Minor fixes

git-svn-id: http://svn.miranda-ng.org/main/trunk@12077 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/wbOSD/src/wbOSD.cpp | 45 +++++++++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 18 deletions(-)

(limited to 'plugins/wbOSD/src/wbOSD.cpp')

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) {
-- 
cgit v1.2.3