diff --git a/PowerEditor/src/MISC/Common/Common.cpp b/PowerEditor/src/MISC/Common/Common.cpp index 66827126..e5b60bb3 100644 --- a/PowerEditor/src/MISC/Common/Common.cpp +++ b/PowerEditor/src/MISC/Common/Common.cpp @@ -592,7 +592,7 @@ generic_string PathAppend(generic_string &strDest, const generic_string & str2ap return strDest; } -COLORREF getCtrlBkColor(HWND hWnd) +COLORREF getCtrlBgColor(HWND hWnd) { COLORREF crRet = CLR_INVALID; if (hWnd && IsWindow(hWnd)) diff --git a/PowerEditor/src/MISC/Common/Common.h b/PowerEditor/src/MISC/Common/Common.h index 16154dd9..41d61a8e 100644 --- a/PowerEditor/src/MISC/Common/Common.h +++ b/PowerEditor/src/MISC/Common/Common.h @@ -178,6 +178,6 @@ private: generic_string PathRemoveFileSpec(generic_string & path); generic_string PathAppend(generic_string &strDest, const generic_string & str2append); -COLORREF getCtrlBkColor(HWND hWnd); +COLORREF getCtrlBgColor(HWND hWnd); #endif //M30_IDE_COMMUN_H diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp index bee6c1c3..51e6db7e 100644 --- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp +++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp @@ -2344,7 +2344,7 @@ void FindReplaceDlg::drawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) //printInt(fgColor); SetTextColor(lpDrawItemStruct->hDC, fgColor); - COLORREF bgColor = getCtrlBkColor(_statusBar.getHSelf()); + COLORREF bgColor = getCtrlBgColor(_statusBar.getHSelf()); ::SetBkColor(lpDrawItemStruct->hDC, bgColor); //::SetBkColor(lpDrawItemStruct->hDC, ::GetSysColor(COLOR_3DFACE)); //ExtTextOut(lpDIS->hDC, 0, 0, 0 , &lpDIS->rcItem,ptStr, _tcslen(ptStr), NULL); diff --git a/PowerEditor/src/WinControls/AboutDlg/URLCtrl.cpp b/PowerEditor/src/WinControls/AboutDlg/URLCtrl.cpp index 2032f6db..9115abf5 100644 --- a/PowerEditor/src/WinControls/AboutDlg/URLCtrl.cpp +++ b/PowerEditor/src/WinControls/AboutDlg/URLCtrl.cpp @@ -213,7 +213,7 @@ LRESULT URLCtrl::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) ::SetTextColor(hdc, _linkColor); - ::SetBkColor(hdc, getCtrlBkColor(GetParent(hwnd))); ///*::GetSysColor(COLOR_3DFACE)*/); + ::SetBkColor(hdc, getCtrlBgColor(GetParent(hwnd))); ///*::GetSysColor(COLOR_3DFACE)*/); // Create an underline font if(_hfUnderlined == 0) diff --git a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp index ba4db6b2..10e30040 100644 --- a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp +++ b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp @@ -2440,7 +2440,7 @@ BOOL CALLBACK MultiInstDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM) return FALSE; } -BOOL CALLBACK DelimiterSettingsDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM) +BOOL CALLBACK DelimiterSettingsDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lParam) { NppGUI & nppGUI = (NppGUI &)((NppParameters::getInstance())->getNppGUI()); switch (Message) @@ -2487,6 +2487,20 @@ BOOL CALLBACK DelimiterSettingsDlg::run_dlgProc(UINT Message, WPARAM wParam, LPA return TRUE; } + case WM_CTLCOLORSTATIC: + { + HDC hdcStatic = (HDC) wParam; + HWND hwnd = (HWND) lParam; + if (hwnd == ::GetDlgItem(_hSelf, IDD_STATIC_BLABLA) || hwnd == ::GetDlgItem(_hSelf, IDD_STATIC_BLABLA2NDLINE)) + { + COLORREF bgColor = getCtrlBgColor(_hSelf); + SetTextColor(hdcStatic, RGB(0, 0, 0)); + SetBkColor(hdcStatic, RGB(GetRValue(bgColor) - 30, GetGValue(bgColor) - 30, GetBValue(bgColor) - 30)); + return TRUE; + } + return FALSE; + } + case WM_COMMAND : { if (HIWORD(wParam) == EN_CHANGE)