From 7fe6e93058f0e9253e2a79d7fc2d7a136784f791 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 15 Mar 2013 16:26:10 +0000 Subject: various popup related code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@4056 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Xfire/src/tools.cpp | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) (limited to 'protocols/Xfire/src') diff --git a/protocols/Xfire/src/tools.cpp b/protocols/Xfire/src/tools.cpp index 626745d3e9..8d16127d26 100644 --- a/protocols/Xfire/src/tools.cpp +++ b/protocols/Xfire/src/tools.cpp @@ -89,12 +89,11 @@ int displayPopup(HWND hWnd, LPCSTR lpText, LPCSTR lpCaption, UINT uType,HICON hi static HICON hicNotify = NULL, hicWarning = NULL, hicError = NULL; - if ((uType&MB_TYPEMASK) == MB_OK) - { - POPUPDATA ppd = {0}; + if ((uType & MB_TYPEMASK) == MB_OK) { + POPUPDATA ppd = { 0 }; + ppd.lchIcon = hicon; - if (bIconsNotLoaded) - { + if (bIconsNotLoaded) { hicNotify = Skin_GetIcon("popup_notify"); hicWarning = Skin_GetIcon("popup_warning"); hicError = Skin_GetIcon("popup_error"); @@ -104,28 +103,22 @@ int displayPopup(HWND hWnd, LPCSTR lpText, LPCSTR lpCaption, UINT uType,HICON hi lstrcpynA(ppd.lpzContactName, lpCaption, sizeof(ppd.lpzContactName)); lstrcpynA(ppd.lpzText, lpText, sizeof(ppd.lpzText)); - if ((uType&MB_ICONMASK) == MB_ICONSTOP) - { + if ((uType & MB_ICONMASK) == MB_ICONSTOP) { ppd.lchIcon = hicError; ppd.colorBack = RGB(191,0,0); ppd.colorText = RGB(255,245,225); - } else - if ((uType&MB_ICONMASK) == MB_ICONWARNING) - { + } + else if ((uType & MB_ICONMASK) == MB_ICONWARNING) { ppd.lchIcon = hicWarning; ppd.colorBack = RGB(210,210,150); ppd.colorText = RGB(0,0,0); - } else - /* if ((uType&MB_ICONMASK) == MB_ICONINFORMATION) */ - { + } + else { ppd.lchIcon = hicNotify; ppd.colorBack = RGB(230,230,230); ppd.colorText = RGB(0,0,0); } - if(hicon!=NULL) - ppd.lchIcon=hicon; - PUAddPopUp(&ppd); } -- cgit v1.2.3