tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-25 14:54:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix find in files progress window alway on top issue.

Browse Source 
Closes #1202. Fixes #293, fixes #1198

Progress window is not "always on top" anymore.
This commit is contained in:
Pavel Nedev 2015-11-30 02:32:50 +02:00 committed by Don Ho
parent 0e6e84c0ed
commit accf7da2d1
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
View File

@ -3017,9 +3017,8 @@ Progress::Progress(HINSTANCE hInst) : _hwnd(NULL), _hCallerWnd(NULL)
if (::InterlockedIncrement(&refCount) == 1) if (::InterlockedIncrement(&refCount) == 1)
{ {
_hInst = hInst; _hInst = hInst;
WNDCLASSEX wcex;
::SecureZeroMemory(&wcex, sizeof(wcex)); WNDCLASSEX wcex = {0};
wcex.cbSize = sizeof(wcex); wcex.cbSize = sizeof(wcex);
wcex.style = CS_HREDRAW | CS_VREDRAW; wcex.style = CS_HREDRAW | CS_VREDRAW;
wcex.lpfnWndProc = wndProc; wcex.lpfnWndProc = wndProc;
@ -3030,9 +3029,7 @@ Progress::Progress(HINSTANCE hInst) : _hwnd(NULL), _hCallerWnd(NULL)
::RegisterClassEx(&wcex); ::RegisterClassEx(&wcex);
INITCOMMONCONTROLSEX icex; INITCOMMONCONTROLSEX icex = {0};
::SecureZeroMemory(&icex, sizeof(icex));
icex.dwSize = sizeof(icex); icex.dwSize = sizeof(icex);
icex.dwICC = ICC_STANDARD_CLASSES | ICC_PROGRESS_CLASS; icex.dwICC = ICC_STANDARD_CLASSES | ICC_PROGRESS_CLASS;
@ -3055,7 +3052,7 @@ HWND Progress::open(HWND hCallerWnd, const TCHAR* header)
if (_hwnd) if (_hwnd)
return _hwnd; return _hwnd;
// Create manually reset non-signaled event // Create manually reset non-signalled event
_hActiveState = ::CreateEvent(NULL, TRUE, FALSE, NULL); _hActiveState = ::CreateEvent(NULL, TRUE, FALSE, NULL);
if (!_hActiveState) if (!_hActiveState)
return NULL; return NULL;
@ -3145,7 +3142,7 @@ int Progress::thread()
int Progress::createProgressWindow() int Progress::createProgressWindow()
{ {
_hwnd = ::CreateWindowEx( _hwnd = ::CreateWindowEx(
WS_EX_TOOLWINDOW | WS_EX_OVERLAPPEDWINDOW | WS_EX_TOPMOST, WS_EX_APPWINDOW | WS_EX_TOOLWINDOW | WS_EX_OVERLAPPEDWINDOW,
cClassName, _header, WS_POPUP | WS_CAPTION, cClassName, _header, WS_POPUP | WS_CAPTION,
CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
NULL, NULL, _hInst, (LPVOID)this); NULL, NULL, _hInst, (LPVOID)this);