Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix Find In Files progress bar position bug

Browse Source 
Fixes #1531; Closes #1549
the bug concerns multi-monitor systems
This commit is contained in:
Pavel Nedev 2016-02-25 18:08:35 +02:00 committed by Don Ho
parent 24bb021d71
commit 76bf262c2a
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3193,7 +3193,10 @@ int Progress::createProgressWindow()
RECT Progress::adjustSizeAndPos(int width, int height) RECT Progress::adjustSizeAndPos(int width, int height)
{ {
RECT maxWin; RECT maxWin;
::GetWindowRect(::GetDesktopWindow(), &maxWin); maxWin.left = ::GetSystemMetrics(SM_XVIRTUALSCREEN);
maxWin.top = ::GetSystemMetrics(SM_YVIRTUALSCREEN);
maxWin.right = ::GetSystemMetrics(SM_CXVIRTUALSCREEN) + maxWin.left;
maxWin.bottom = ::GetSystemMetrics(SM_CYVIRTUALSCREEN) + maxWin.top;
POINT center; POINT center;
@ -3223,9 +3226,14 @@ RECT Progress::adjustSizeAndPos(int width, int height)
if (width < maxWin.right - maxWin.left) if (width < maxWin.right - maxWin.left)
{ {
win.left = center.x - width / 2; win.left = center.x - width / 2;
if (win.left < 0) if (win.left < maxWin.left)
win.left = 0; win.left = maxWin.left;
win.right = win.left + width; win.right = win.left + width;
if (win.right > maxWin.right)
{
win.right = maxWin.right;
win.left = win.right - width;
}
} }
else else
{ {
@ -3236,9 +3244,14 @@ RECT Progress::adjustSizeAndPos(int width, int height)
if (height < maxWin.bottom - maxWin.top) if (height < maxWin.bottom - maxWin.top)
{ {
win.top = center.y - height / 2; win.top = center.y - height / 2;
if (win.top < 0) if (win.top < maxWin.top)
win.top = 0; win.top = maxWin.top;
win.bottom = win.top + height; win.bottom = win.top + height;
if (win.bottom > maxWin.bottom)
{
win.bottom = maxWin.bottom;
win.top = win.bottom - height;
}
} }
else else
{ {