From 30ab6ceb71842f003f649b3d62b89af010cf40d1 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 20 Jun 2012 17:00:14 +0000 Subject: - direct call of MS_SKIN_ADDNEWSOUND replaced with Skin_AddSound() call; - obsolete structure SKINSOUNDDESC removed - dynamically translated hot keys; - checked correct LPGEN'ing of the sounds creation; - code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@500 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/FloatingContacts/bitmap_funcs.cpp | 2 +- plugins/FloatingContacts/filedrop.cpp | 36 +++++++++---------- plugins/FloatingContacts/main.cpp | 60 +++++++++++++++---------------- plugins/FloatingContacts/thumbs.cpp | 50 +++++++++++++------------- 4 files changed, 74 insertions(+), 74 deletions(-) (limited to 'plugins/FloatingContacts') diff --git a/plugins/FloatingContacts/bitmap_funcs.cpp b/plugins/FloatingContacts/bitmap_funcs.cpp index a99b5c4afe..334bf98abe 100644 --- a/plugins/FloatingContacts/bitmap_funcs.cpp +++ b/plugins/FloatingContacts/bitmap_funcs.cpp @@ -1144,7 +1144,7 @@ bool MyBitmap::loadFromFile_default(const char *fn, const char *fnAlpha) MyBitmap alpha; if (fnAlpha && alpha.loadFromFile(fnAlpha) && (alpha.getWidth() == width) && - (alpha.getHeight() == height) ) + (alpha.getHeight() == height)) { for (int i = 0; i < width*height; i++) bits[i] = (bits[i] & 0x00ffffff) | ( (alpha.bits[i] & 0x000000ff) << 24 ); diff --git a/plugins/FloatingContacts/filedrop.cpp b/plugins/FloatingContacts/filedrop.cpp index 6157e5dcf9..473c7a6814 100644 --- a/plugins/FloatingContacts/filedrop.cpp +++ b/plugins/FloatingContacts/filedrop.cpp @@ -6,7 +6,7 @@ static BOOL OnDropFiles ( HDROP hDrop, ThumbInfo *pThumb ); HRESULT STDMETHODCALLTYPE CDropTarget::QueryInterface(REFIID riid,LPVOID *ppvObj) { - if ( IsEqualIID( riid, IID_IDropTarget ) ) + if ( IsEqualIID( riid, IID_IDropTarget )) { *ppvObj = this; this->AddRef(); @@ -56,14 +56,14 @@ HRESULT STDMETHODCALLTYPE CDropTarget::DragEnter( IDataObject *pData, DWORD fKey ThumbInfo *pThumb; if ( S_OK == pData->QueryGetData( &feFile ) || - S_OK == pData->QueryGetData( &feText ) ) + S_OK == pData->QueryGetData( &feText )) { shortPt.x = pt.x; shortPt.y = pt.y; hwnd = WindowFromPoint( shortPt ); - if ( pThumb = thumbList.FindThumb( hwnd ) ) + if ( pThumb = thumbList.FindThumb( hwnd )) { hwndCurDrag = hwnd; pThumb->ThumbSelect( TRUE ); @@ -106,11 +106,11 @@ HRESULT STDMETHODCALLTYPE CDropTarget::Drop( IDataObject *pData,DWORD fKeyState, pThumb = (ThumbInfo*)GetWindowLongPtr( hwndCurDrag, GWLP_USERDATA ); if ( pThumb == NULL ) return( S_OK ); - if ( S_OK != pData->GetData( &fe,&stg ) ) + if ( S_OK != pData->GetData( &fe,&stg )) { fe.cfFormat = CF_TEXT; - if ( S_OK != pData->GetData( &fe,&stg ) ) + if ( S_OK != pData->GetData( &fe,&stg )) { return( S_OK ); } @@ -172,7 +172,7 @@ BOOL OnDropFiles( HDROP hDrop, ThumbInfo *pThumb ) nDroppedItemsCount = DragQueryFile( hDrop, 0xFFFFFFFF, NULL, 0 ); - ppDroppedItems = ( char** )malloc( sizeof(char*)*( nDroppedItemsCount + 1 ) ); + ppDroppedItems = ( char** )malloc( sizeof(char*)*( nDroppedItemsCount + 1 )); if ( ppDroppedItems == NULL ) { @@ -183,13 +183,13 @@ BOOL OnDropFiles( HDROP hDrop, ThumbInfo *pThumb ) for ( iItem = 0; iItem < nDroppedItemsCount; ++iItem ) { - DragQueryFileA( hDrop, iItem, szFilename, sizeof( szFilename ) ); + DragQueryFileA( hDrop, iItem, szFilename, sizeof( szFilename )); ppDroppedItems[ iItem ] = _strdup( szFilename ); } nFilesCount = CountDroppedFiles( ppDroppedItems, nDroppedItemsCount ); - ppFiles = ( char** )malloc( sizeof( char *)* ( nFilesCount+1 ) ); + ppFiles = ( char** )malloc( sizeof( char *)* ( nFilesCount+1 )); if ( ppFiles == NULL ) { @@ -235,13 +235,13 @@ static int CountFiles( char *szItem ) if ( fd.dwFileAttributes == FILE_ATTRIBUTE_DIRECTORY ) { // Skip parent directories - if ( ( 0 != strcmp( fd.cFileName, "." ) ) && - ( 0 != strcmp( fd.cFileName, ".." ) ) ) + if ( ( 0 != strcmp( fd.cFileName, "." )) && + ( 0 != strcmp( fd.cFileName, ".." )) ) { char szDirName[ MAX_PATH ]; strncpy( szDirName, szItem, MAX_PATH - 1 ); - if ( NULL != strstr( szItem, "*.*" ) ) + if ( NULL != strstr( szItem, "*.*" )) { sprintf( szDirName + strlen( szDirName ) - 3, "%s\0", fd.cFileName ); } @@ -256,7 +256,7 @@ static int CountFiles( char *szItem ) ++nCount; } } - while( FALSE != FindNextFileA( hFind, &fd ) ); + while( FALSE != FindNextFileA( hFind, &fd )); } return( nCount ); @@ -278,13 +278,13 @@ static void SaveFiles( char *szItem, char **ppFiles, int *pnCount ) if ( fd.dwFileAttributes == FILE_ATTRIBUTE_DIRECTORY ) { // Skip parent directories - if ( ( 0 != strcmp( fd.cFileName, "." ) ) && - ( 0 != strcmp( fd.cFileName, ".." ) ) ) + if ( ( 0 != strcmp( fd.cFileName, "." )) && + ( 0 != strcmp( fd.cFileName, ".." )) ) { char szDirName[ MAX_PATH ]; strncpy( szDirName, szItem, MAX_PATH - 1 ); - if ( NULL != strstr( szItem, "*.*" ) ) + if ( NULL != strstr( szItem, "*.*" )) { sprintf( szDirName + strlen( szDirName ) - 3, "%s\0", fd.cFileName ); } @@ -299,12 +299,12 @@ static void SaveFiles( char *szItem, char **ppFiles, int *pnCount ) } else { - int nSize = sizeof(char) * ( strlen( szItem ) + strlen( fd.cFileName ) + sizeof( char ) ); + int nSize = sizeof(char) * ( strlen( szItem ) + strlen( fd.cFileName ) + sizeof( char )); char *szFile = (char*) malloc( nSize ) ; strncpy( szFile, szItem, nSize - 1 ); - if ( NULL != strstr( szFile, "*.*" ) ) + if ( NULL != strstr( szFile, "*.*" )) { szFile[ strlen( szFile ) - 3 ] = '\0'; strncat( szFile, fd.cFileName, MAX_PATH - 1 ); @@ -314,7 +314,7 @@ static void SaveFiles( char *szItem, char **ppFiles, int *pnCount ) ++( *pnCount ); } } - while( FALSE != FindNextFileA( hFind, &fd ) ); + while( FALSE != FindNextFileA( hFind, &fd )); } } diff --git a/plugins/FloatingContacts/main.cpp b/plugins/FloatingContacts/main.cpp index f05fda305d..199cf1ee08 100644 --- a/plugins/FloatingContacts/main.cpp +++ b/plugins/FloatingContacts/main.cpp @@ -367,7 +367,7 @@ static int OnContactDrag( WPARAM wParam, LPARAM lParam ) if ( pThumb == NULL ) { idStatus = GetContactStatus( hContact ); - if ( !fcOpt.bHideAll && !HideOnFullScreen() && ( !fcOpt.bHideOffline || IsStatusVisible( idStatus ) ) && (!fcOpt.bHideWhenCListShow || !bIsCListShow)) { + if ( !fcOpt.bHideAll && !HideOnFullScreen() && ( !fcOpt.bHideOffline || IsStatusVisible( idStatus )) && (!fcOpt.bHideWhenCListShow || !bIsCListShow)) { CreateThumbWnd( ptName, hContact, pt.x, pt.y ); pNewThumb = thumbList.FindThumbByContact( hContact ); ShowWindow( pNewThumb->hwnd, SW_SHOWNA ); @@ -377,7 +377,7 @@ static int OnContactDrag( WPARAM wParam, LPARAM lParam ) } } else if ( hContact == hNewContact ) - pThumb->PositionThumb( (short)( pt.x - 5 ), (short)( pt.y - 5 ) ); + pThumb->PositionThumb( (short)( pt.x - 5 ), (short)( pt.y - 5 )); return( hNewContact != NULL ? 1 : 0 ); } @@ -393,16 +393,16 @@ static int OnContactDrop( WPARAM wParam, LPARAM lParam ) HANDLE hContact = ( HANDLE )wParam; ThumbInfo *pThumb = thumbList.FindThumbByContact( hContact ); - if ( ( hNewContact == hContact ) && ( pThumb != NULL ) ) + if ( ( hNewContact == hContact ) && ( pThumb != NULL )) { hNewContact = NULL; GetWindowRect( hwndMiranda, &rcMiranda ); pThumb->GetThumbRect( &rcThumb ); - //if ( IntersectRect( &rcOverlap, &rcThumb, &rcMiranda ) ) + //if ( IntersectRect( &rcOverlap, &rcThumb, &rcMiranda )) //{ - // pThumb->OnLButtonDown( (short)(rcThumb.left + 5), (short)(rcThumb.top + 5) ); + // pThumb->OnLButtonDown( (short)(rcThumb.left + 5), (short)(rcThumb.top + 5)); //} } @@ -417,7 +417,7 @@ static int OnContactDragStop( WPARAM wParam, LPARAM lParam ) HANDLE hContact = ( HANDLE )wParam; ThumbInfo *pThumb = thumbList.FindThumbByContact( hContact ); - if ( ( pThumb != NULL ) && ( hNewContact == hContact ) ) + if ( ( pThumb != NULL ) && ( hNewContact == hContact )) { thumbList.RemoveThumb( pThumb ); hNewContact = NULL; @@ -452,7 +452,7 @@ static int OnContactSettingChanged( WPARAM wParam, LPARAM lParam ) if ( hContact == NULL ) { - if (( 0 == stricmp( pdbcws->szModule, "CLC" ) ) || ( 0 == stricmp( pdbcws->szModule, sModule ) ) ) { + if (( 0 == stricmp( pdbcws->szModule, "CLC" )) || ( 0 == stricmp( pdbcws->szModule, sModule )) ) { LoadDBSettings(); ApplyOptionsChanges(); } @@ -463,15 +463,15 @@ static int OnContactSettingChanged( WPARAM wParam, LPARAM lParam ) if ( pThumb == NULL ) return( 0 ); // Only on these 2 events we need to refresh - if ( 0 == stricmp( pdbcws->szSetting, "Status" ) ) + if ( 0 == stricmp( pdbcws->szSetting, "Status" )) { idStatus = pdbcws->value.wVal; } - else if ( 0 == stricmp( pdbcws->szSetting, "Nick" ) ) + else if ( 0 == stricmp( pdbcws->szSetting, "Nick" )) { idStatus = GetContactStatus( hContact ); } - else if ( 0 == stricmp( pdbcws->szSetting, "MyHandle" ) ) + else if ( 0 == stricmp( pdbcws->szSetting, "MyHandle" )) { idStatus = GetContactStatus( hContact ); } @@ -520,7 +520,7 @@ static int OnPrebuildContactMenu( WPARAM wParam, LPARAM lParam ) ThumbInfo *pThumb = thumbList.FindThumbByContact( (HANDLE) wParam ); CLISTMENUITEM clmi; - ZeroMemory( &clmi, sizeof( clmi ) ); + ZeroMemory( &clmi, sizeof( clmi )); clmi.cbSize = sizeof( clmi ); clmi.flags = ( pThumb == NULL ) ? CMIM_FLAGS | CMIF_HIDDEN : CMIM_FLAGS &~CMIF_HIDDEN; @@ -650,7 +650,7 @@ static LRESULT __stdcall CommWndProc( HWND hwnd, break; case WM_LBUTTONDOWN: - if (pThumb) pThumb->OnLButtonDown( (short)LOWORD( lParam ), (short)HIWORD( lParam ) ); + if (pThumb) pThumb->OnLButtonDown( (short)LOWORD( lParam ), (short)HIWORD( lParam )); break; case WM_MOUSEMOVE: @@ -765,7 +765,7 @@ void ApplyOptionsChanges() static void RegisterWindowClass() { WNDCLASSEX wcx; - ZeroMemory( &wcx, sizeof( wcx ) ); + ZeroMemory( &wcx, sizeof( wcx )); wcx.cbSize = sizeof( WNDCLASSEX ); wcx.style = CS_VREDRAW | CS_HREDRAW | CS_DBLCLKS; @@ -823,7 +823,7 @@ static void CreateThumbWnd( TCHAR *ptszName, HANDLE hContact, int nX, int nY ) pThumb->ResizeThumb(); pThumb->SetThumbOpacity( fcOpt.thumbAlpha ); - ShowWindow( hwnd, ( fcOpt.bHideAll || HideOnFullScreen() || fcOpt.bHideOffline || (fcOpt.bHideWhenCListShow && bIsCListShow) )? SW_HIDE : SW_SHOWNA ); + ShowWindow( hwnd, ( fcOpt.bHideAll || HideOnFullScreen() || fcOpt.bHideOffline || (fcOpt.bHideWhenCListShow && bIsCListShow))? SW_HIDE : SW_SHOWNA ); pThumb->PositionThumb( (short)nX, (short)nY ); // force repaint @@ -839,7 +839,7 @@ static BOOL GetOSPlatform() OSVERSIONINFO VersionInfo; // Get OS platform - ZeroMemory( &VersionInfo, sizeof( VersionInfo ) ); + ZeroMemory( &VersionInfo, sizeof( VersionInfo )); VersionInfo.dwOSVersionInfoSize = sizeof( VersionInfo ); GetVersionEx( &VersionInfo ); @@ -976,7 +976,7 @@ static int ClcStatusToPf2( int status ) BOOL IsStatusVisible( int status ) { - return ( 0 == ( dwOfflineModes & ClcStatusToPf2( status ) ) ); + return ( 0 == ( dwOfflineModes & ClcStatusToPf2( status )) ); } @@ -995,7 +995,7 @@ void RegHotkey( HANDLE hContact, HWND hwnd ) strncpy(szBuf, dbv.pszVal, MAX_PATH - 1); DBFreeVariant( &dbv ); - if ( 0 != strlen( szBuf ) ) + if ( 0 != strlen( szBuf )) { UINT nModifiers = 0; char chKey = 0; @@ -1007,15 +1007,15 @@ void RegHotkey( HANDLE hContact, HWND hwnd ) for ( i = 0; i < 2; ++i ) { - if ( 0 == strncmp( szMod[ i ], "ALT", 19 ) ) + if ( 0 == strncmp( szMod[ i ], "ALT", 19 )) { nModifiers = nModifiers | MOD_ALT; } - else if ( 0 == strncmp( szMod[ i ], "CTRL", 19 ) ) + else if ( 0 == strncmp( szMod[ i ], "CTRL", 19 )) { nModifiers = nModifiers | MOD_CONTROL; } - else if ( 0 == strncmp( szMod[ i ], "SHIFT", 19 ) ) + else if ( 0 == strncmp( szMod[ i ], "SHIFT", 19 )) { nModifiers = nModifiers | MOD_SHIFT; } @@ -1023,7 +1023,7 @@ void RegHotkey( HANDLE hContact, HWND hwnd ) chKey = szKey[ 0 ]; - RegisterHotKey( hwnd, (int)hwnd, nModifiers, VkKeyScan( chKey ) ); + RegisterHotKey( hwnd, (int)hwnd, nModifiers, VkKeyScan( chKey )); } } @@ -1042,8 +1042,8 @@ void SaveContactsPos() thumbList[i]->GetThumbRect( &rc ); - if ( 0 == GetLastError() ) - DBWriteContactSettingDword( thumbList[i]->hContact, sModule, "ThumbsPos", DB_POS_MAKE_XY(rc.left, rc.top) ); + if ( 0 == GetLastError()) + DBWriteContactSettingDword( thumbList[i]->hContact, sModule, "ThumbsPos", DB_POS_MAKE_XY(rc.left, rc.top)); } } @@ -1069,19 +1069,19 @@ static void LoadMenus() mi.cbSize = sizeof( mi ); mi.position = 0xFFFFF; mi.flags = CMIF_TCHAR; - mi.hIcon = LoadIcon( hInst, MAKEINTRESOURCE( IDI_HIDE ) ); + mi.hIcon = LoadIcon( hInst, MAKEINTRESOURCE( IDI_HIDE )); mi.ptszName = _T("Remove thumb"); mi.pszService = sModule "/RemoveThumb"; hMenuItemRemove = Menu_AddContactMenuItem(&mi); // Hide all thumbs main menu item hMainHideAllThumbs = CreateServiceFunction( sModule "/MainHideAllThumbs", OnMainMenu_HideAll ); - ZeroMemory( &mi, sizeof( mi ) ); + ZeroMemory( &mi, sizeof( mi )); mi.cbSize = sizeof( mi ); mi.position = 0xFFFFF; mi.flags = CMIF_TCHAR; - mi.hIcon = LoadIcon( hInst, MAKEINTRESOURCE( fcOpt.bHideAll ? IDI_SHOW : IDI_HIDE ) ); + mi.hIcon = LoadIcon( hInst, MAKEINTRESOURCE( fcOpt.bHideAll ? IDI_SHOW : IDI_HIDE )); mi.ptszName = fcOpt.bHideAll ? _T("Show all thumbs") : _T("Hide all thumbs"); mi.pszService = sModule "/MainHideAllThumbs"; Menu_AddMainMenuItem(&mi); @@ -1149,7 +1149,7 @@ BOOL HideOnFullScreen() RECT WindowRect; GetWindowRect(hWnd, &WindowRect); - if ( (w == (WindowRect.right - WindowRect.left) ) && + if ( (w == (WindowRect.right - WindowRect.left)) && (h == (WindowRect.bottom - WindowRect.top))) { bFullscreen = TRUE; @@ -1198,7 +1198,7 @@ static INT_PTR OnMainMenu_HideAll( WPARAM wParam, LPARAM lParam ) clmi.cbSize = sizeof( clmi ); clmi.flags = CMIM_NAME | CMIM_ICON|CMIF_TCHAR; - clmi.hIcon = LoadIcon( hInst, MAKEINTRESOURCE( fcOpt.bHideAll ? IDI_SHOW : IDI_HIDE ) ); + clmi.hIcon = LoadIcon( hInst, MAKEINTRESOURCE( fcOpt.bHideAll ? IDI_SHOW : IDI_HIDE )); clmi.ptszName = fcOpt.bHideAll ? _T("Show all thumbs") : _T("Hide all thumbs"); b = CallService( MS_CLIST_MODIFYMENUITEM, ( WPARAM )hMainMenuItemHideAll, ( LPARAM )&clmi ); return 0; @@ -1224,7 +1224,7 @@ void ShowThumbsOnHideCList() return; for (int i = 0; i < thumbList.getCount(); ++i) - if ( !fcOpt.bHideOffline || IsStatusVisible( GetContactStatus(thumbList[i]->hContact) )) + if ( !fcOpt.bHideOffline || IsStatusVisible( GetContactStatus(thumbList[i]->hContact))) ShowWindow( thumbList[i]->hwnd, SW_SHOWNA ); } @@ -1269,5 +1269,5 @@ static LRESULT __stdcall newMirandaWndProc( HWND hwnd, UINT uMsg, WPARAM wParam, } } } - return( CallWindowProc(oldMirandaWndProc, hwnd, uMsg, wParam, lParam) ); + return( CallWindowProc(oldMirandaWndProc, hwnd, uMsg, wParam, lParam)); } diff --git a/plugins/FloatingContacts/thumbs.cpp b/plugins/FloatingContacts/thumbs.cpp index dffd19f153..0195ff0717 100644 --- a/plugins/FloatingContacts/thumbs.cpp +++ b/plugins/FloatingContacts/thumbs.cpp @@ -115,7 +115,7 @@ void ThumbInfo::PositionThumbWorker(short nX, short nY, POINT *newPos) if ( fcOpt.bMoveTogether ) { - UndockThumbs( this, thumbList.FindThumb( dockOpt.hwndLeft ) ); + UndockThumbs( this, thumbList.FindThumb( dockOpt.hwndLeft )); } @@ -161,23 +161,23 @@ void ThumbInfo::PositionThumbWorker(short nX, short nY, POINT *newPos) pt.y = rcThumb.top; bDocked = FALSE; - if ( PtInRect( &rcRight, pt ) ) + if ( PtInRect( &rcRight, pt )) { nNewX = rc.right; bDocked = TRUE; } - if ( PtInRect( &rcBottom, pt ) ) + if ( PtInRect( &rcBottom, pt )) { nNewY = rc.bottom; - if ( PtInRect( &rcLeft, pt ) ) + if ( PtInRect( &rcLeft, pt )) { nNewX = rc.left; } } - if ( PtInRect( &rcTop, pt ) ) + if ( PtInRect( &rcTop, pt )) { nNewY = rc.top; bDockedLeft = bDocked; @@ -188,7 +188,7 @@ void ThumbInfo::PositionThumbWorker(short nX, short nY, POINT *newPos) pt.y = rcThumb.top; bDocked = FALSE; - if ( !bLeading && PtInRect( &rcLeft, pt ) ) + if ( !bLeading && PtInRect( &rcLeft, pt )) { if ( !bDockedLeft ) { @@ -202,17 +202,17 @@ void ThumbInfo::PositionThumbWorker(short nX, short nY, POINT *newPos) } - if ( PtInRect( &rcBottom, pt ) ) + if ( PtInRect( &rcBottom, pt )) { nNewY = rc.bottom; - if ( PtInRect( &rcRight, pt ) ) + if ( PtInRect( &rcRight, pt )) { nNewX = rc.right - nWidth; } } - if ( !bLeading && PtInRect( &rcTop, pt ) ) + if ( !bLeading && PtInRect( &rcTop, pt )) { nNewY = rc.top; bDockedRight = bDocked; @@ -235,16 +235,16 @@ void ThumbInfo::PositionThumbWorker(short nX, short nY, POINT *newPos) pt.x = rcThumb.left; pt.y = rcThumb.bottom; - if ( PtInRect( &rcRight, pt ) ) + if ( PtInRect( &rcRight, pt )) { nNewX = rc.right; } - if ( PtInRect( &rcTop, pt ) ) + if ( PtInRect( &rcTop, pt )) { nNewY = rc.top - nHeight; - if ( PtInRect( &rcLeft, pt ) ) + if ( PtInRect( &rcLeft, pt )) { nNewX = rc.left; } @@ -255,16 +255,16 @@ void ThumbInfo::PositionThumbWorker(short nX, short nY, POINT *newPos) pt.x = rcThumb.right; pt.y = rcThumb.bottom; - if ( !bLeading && PtInRect( &rcLeft, pt ) ) + if ( !bLeading && PtInRect( &rcLeft, pt )) { nNewX = rc.left - nWidth; } - if ( !bLeading && PtInRect( &rcTop, pt ) ) + if ( !bLeading && PtInRect( &rcTop, pt )) { nNewY = rc.top - nHeight; - if ( PtInRect( &rcRight, pt ) ) + if ( PtInRect( &rcRight, pt )) { nNewX = rc.right - nWidth; } @@ -395,7 +395,7 @@ void ThumbInfo::RefreshContactIcon(int iIcon) void ThumbInfo::RefreshContactStatus(int idStatus) { - if ( IsStatusVisible( idStatus ) ) + if ( IsStatusVisible( idStatus )) { RegisterFileDropping( hwnd, dropTarget ); } @@ -404,7 +404,7 @@ void ThumbInfo::RefreshContactStatus(int idStatus) UnregisterFileDropping( hwnd ); } - ShowWindow( hwnd, fcOpt.bHideAll || HideOnFullScreen() || ( fcOpt.bHideOffline && ( !IsStatusVisible( idStatus ) ) ) || (fcOpt.bHideWhenCListShow && bIsCListShow) ? SW_HIDE : SW_SHOWNA ); + ShowWindow( hwnd, fcOpt.bHideAll || HideOnFullScreen() || ( fcOpt.bHideOffline && ( !IsStatusVisible( idStatus )) ) || (fcOpt.bHideWhenCListShow && bIsCListShow) ? SW_HIDE : SW_SHOWNA ); } void ThumbInfo::DeleteContactPos() @@ -451,15 +451,15 @@ void ThumbInfo::OnLButtonUp() if ( bMouseDown ) { bMouseDown = FALSE; - SetCursor( LoadCursor( NULL, IDC_ARROW ) ); + SetCursor( LoadCursor( NULL, IDC_ARROW )); // Check whether we shoud remove the window GetWindowRect( hwndMiranda, &rcMiranda ); GetThumbRect( &rcThumb ); - if ( IntersectRect( &rcOverlap, &rcMiranda, &rcThumb ) ) + if ( IntersectRect( &rcOverlap, &rcMiranda, &rcThumb )) { - if ( IsWindowVisible( hwndMiranda ) ) + if ( IsWindowVisible( hwndMiranda )) { DeleteContactPos( ); thumbList.RemoveThumb( this ); @@ -504,7 +504,7 @@ void ThumbInfo::OnMouseMove(short nX, short nY, WPARAM wParam) } else { - SetCursor( LoadCursor( NULL, IDC_ARROW ) ); + SetCursor( LoadCursor( NULL, IDC_ARROW )); } // Update selection status @@ -568,7 +568,7 @@ void ThumbInfo::ThumbDeselect(BOOL bMouse) void ThumbInfo::SetThumbOpacity(BYTE bAlpha) { - if ( pUpdateLayeredWindow && (bAlpha != btAlpha) ) + if ( pUpdateLayeredWindow && (bAlpha != btAlpha)) { btAlpha = bAlpha; UpdateContent(); @@ -734,7 +734,7 @@ void ThumbInfo::UpdateContent() nApparentMode = DBGetContactSettingWord(hContact, szProto, "ApparentMode", 0); if ( (nStatus == ID_STATUS_INVISIBLE && nApparentMode == ID_STATUS_ONLINE) || - (nStatus != ID_STATUS_INVISIBLE && nApparentMode == ID_STATUS_OFFLINE) ) + (nStatus != ID_STATUS_INVISIBLE && nApparentMode == ID_STATUS_OFFLINE)) { if (ID_STATUS_OFFLINE == nContactStatus) { @@ -887,7 +887,7 @@ void ThumbInfo::OnTimer(BYTE idTimer) void DockThumbs( ThumbInfo *pThumbLeft, ThumbInfo *pThumbRight, BOOL bMoveLeft ) { - if ( ( pThumbRight->dockOpt.hwndLeft == NULL ) && ( pThumbLeft->dockOpt.hwndRight == NULL ) ) + if ( ( pThumbRight->dockOpt.hwndLeft == NULL ) && ( pThumbLeft->dockOpt.hwndRight == NULL )) { pThumbRight->dockOpt.hwndLeft = pThumbLeft->hwnd; pThumbLeft->dockOpt.hwndRight = pThumbRight->hwnd; @@ -897,7 +897,7 @@ void DockThumbs( ThumbInfo *pThumbLeft, ThumbInfo *pThumbRight, BOOL bMoveLeft ) void UndockThumbs( ThumbInfo *pThumb1, ThumbInfo *pThumb2 ) { - if ( ( pThumb1 == NULL ) || ( pThumb2 == NULL ) ) + if ( ( pThumb1 == NULL ) || ( pThumb2 == NULL )) { return; } -- cgit v1.2.3