tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-29 08:44:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix find dialog flicker

Browse Source 
When using Select and Find cmds first time, and find dialog is not already created.

Fix #9536, fix #13381, close #13383
This commit is contained in:
ozone10 2023-03-20 16:46:05 +01:00 committed by Don Ho
parent c59c07b4fa
commit 1f96776757
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp
View File

@ -282,7 +282,7 @@ FindReplaceDlg::~FindReplaceDlg()
delete[] _uniFileName; delete[] _uniFileName;
} }
void FindReplaceDlg::create(int dialogID, bool isRTL, bool msgDestParent) void FindReplaceDlg::create(int dialogID, bool isRTL, bool msgDestParent, bool toShow)
{ {
StaticDialog::create(dialogID, isRTL, msgDestParent); StaticDialog::create(dialogID, isRTL, msgDestParent);
fillFindHistory(); fillFindHistory();
@ -294,7 +294,7 @@ void FindReplaceDlg::create(int dialogID, bool isRTL, bool msgDestParent)
DPIManager& dpiManager = NppParameters::getInstance()._dpiManager; DPIManager& dpiManager = NppParameters::getInstance()._dpiManager;
RECT rect; RECT rect{};
getClientRect(rect); getClientRect(rect);
_tab.init(_hInst, _hSelf, false, true); _tab.init(_hInst, _hSelf, false, true);
NppDarkMode::subclassTabControl(_tab.getHSelf()); NppDarkMode::subclassTabControl(_tab.getHSelf());
@ -325,25 +325,29 @@ void FindReplaceDlg::create(int dialogID, bool isRTL, bool msgDestParent)
_initialWindowRect.bottom = _initialWindowRect.bottom - _initialWindowRect.top; _initialWindowRect.bottom = _initialWindowRect.bottom - _initialWindowRect.top;
_initialWindowRect.top = 0; _initialWindowRect.top = 0;
RECT dlgRc = {}; RECT dlgRc{};
getWindowRect(dlgRc); getWindowRect(dlgRc);
RECT countRc = {}; RECT countRc{};
::GetWindowRect(::GetDlgItem(_hSelf, IDCCOUNTALL), &countRc); ::GetWindowRect(::GetDlgItem(_hSelf, IDCCOUNTALL), &countRc);
NppParameters& nppParam = NppParameters::getInstance(); NppParameters& nppParam = NppParameters::getInstance();
NppGUI& nppGUI = nppParam.getNppGUI(); NppGUI& nppGUI = nppParam.getNppGUI();
const UINT swpFlags = toShow ? SWP_SHOWWINDOW : SWP_HIDEWINDOW;
if (nppGUI._findWindowPos.bottom - nppGUI._findWindowPos.top != 0) // check height against 0 as a test of valid data from config if (nppGUI._findWindowPos.bottom - nppGUI._findWindowPos.top != 0) // check height against 0 as a test of valid data from config
{ {
RECT rc = getViewablePositionRect(nppGUI._findWindowPos); RECT rc = getViewablePositionRect(nppGUI._findWindowPos);
::SetWindowPos(_hSelf, HWND_TOP, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, SWP_SHOWWINDOW); ::SetWindowPos(_hSelf, HWND_TOP, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, swpFlags);
} }
else else
{ {
goToCenter(); goToCenter(swpFlags);
} }
_lesssModeHeight = countRc.bottom - dlgRc.top + _statusBar.getHeight() + dpiManager.scaleY(10); RECT rcStatusBar{};
::GetClientRect(_statusBar.getHSelf(), &rcStatusBar);
_lesssModeHeight = (countRc.bottom - dlgRc.top) + (rcStatusBar.bottom - rcStatusBar.top) + dpiManager.scaleY(10);
if (nppGUI._findWindowLessMode) if (nppGUI._findWindowLessMode)
{ {
@ -4095,7 +4099,7 @@ void FindReplaceDlg::doDialog(DIALOG_TYPE whichType, bool isRTL, bool toShow)
if (!isCreated()) if (!isCreated())
{ {
_isRTL = isRTL; _isRTL = isRTL;
create(IDD_FIND_REPLACE_DLG, isRTL); create(IDD_FIND_REPLACE_DLG, isRTL, true, toShow);
} }
if (whichType == FINDINFILES_DLG) if (whichType == FINDINFILES_DLG)
@ -4107,7 +4111,7 @@ void FindReplaceDlg::doDialog(DIALOG_TYPE whichType, bool isRTL, bool toShow)
else else
enableReplaceFunc(whichType == REPLACE_DLG); enableReplaceFunc(whichType == REPLACE_DLG);
::SetFocus(::GetDlgItem(_hSelf, IDFINDWHAT)); ::SetFocus(toShow ? ::GetDlgItem(_hSelf, IDFINDWHAT) : (*_ppEditView)->getHSelf());
display(toShow, true); display(toShow, true);
} }

2
PowerEditor/src/ScintillaComponent/FindReplaceDlg.h
View File

@ -261,7 +261,7 @@ public :
_ppEditView = ppEditView; _ppEditView = ppEditView;
}; };
virtual void create(int dialogID, bool isRTL = false, bool msgDestParent = true); virtual void create(int dialogID, bool isRTL = false, bool msgDestParent = true, bool toShow = true);
void initOptionsFromDlg(); void initOptionsFromDlg();

4
PowerEditor/src/WinControls/StaticDialog/StaticDialog.cpp
View File

@ -64,7 +64,7 @@ POINT StaticDialog::getTopPoint(HWND hwnd, bool isLeft) const
return p; return p;
} }
void StaticDialog::goToCenter() void StaticDialog::goToCenter(UINT swpFlags)
{ {
RECT rc{}; RECT rc{};
::GetClientRect(_hParent, &rc); ::GetClientRect(_hParent, &rc);
@ -76,7 +76,7 @@ void StaticDialog::goToCenter()
int x = center.x - (_rc.right - _rc.left)/2; int x = center.x - (_rc.right - _rc.left)/2;
int y = center.y - (_rc.bottom - _rc.top)/2; int y = center.y - (_rc.bottom - _rc.top)/2;
::SetWindowPos(_hSelf, HWND_TOP, x, y, _rc.right - _rc.left, _rc.bottom - _rc.top, SWP_SHOWWINDOW); ::SetWindowPos(_hSelf, HWND_TOP, x, y, _rc.right - _rc.left, _rc.bottom - _rc.top, swpFlags);
} }
void StaticDialog::display(bool toShow, bool enhancedPositioningCheckWhenShowing) const void StaticDialog::display(bool toShow, bool enhancedPositioningCheckWhenShowing) const

2
PowerEditor/src/WinControls/StaticDialog/StaticDialog.h
View File

@ -49,7 +49,7 @@ public :
void redrawDlgItem(const int nIDDlgItem, bool forceUpdate = false) const; void redrawDlgItem(const int nIDDlgItem, bool forceUpdate = false) const;
void goToCenter(); void goToCenter(UINT swpFlags = SWP_SHOWWINDOW);
void display(bool toShow = true, bool enhancedPositioningCheckWhenShowing = false) const; void display(bool toShow = true, bool enhancedPositioningCheckWhenShowing = false) const;