tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use new dpi management for Find & Replace dialog fonts 

ref #14959

Close #15098
This commit is contained in:
ozone10 2024-05-06 09:24:02 +02:00 committed by Don Ho
parent 4cd231114e
commit 71914ed545
2 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -272,8 +272,8 @@ FindReplaceDlg::~FindReplaceDlg()
if (_filterTip) if (_filterTip)
::DestroyWindow(_filterTip); ::DestroyWindow(_filterTip);
if (_hMonospaceFont) if (_hComboBoxFont)
::DeleteObject(_hMonospaceFont); ::DeleteObject(_hComboBoxFont);
if (_hLargerBolderFont) if (_hLargerBolderFont)
::DeleteObject(_hLargerBolderFont); ::DeleteObject(_hLargerBolderFont);
@ -1367,31 +1367,37 @@ intptr_t CALLBACK FindReplaceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARA
SetWindowLongPtr(cbinfo.hwndItem, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(comboEditProc)); SetWindowLongPtr(cbinfo.hwndItem, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(comboEditProc));
SetWindowLongPtr(cbinfo.hwndItem, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(cbinfo.hwndCombo)); SetWindowLongPtr(cbinfo.hwndItem, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(cbinfo.hwndCombo));
if ((NppParameters::getInstance()).getNppGUI()._monospacedFontFindDlg) setDpi();
HFONT hFont = nullptr;
const bool isMonospaced = NppParameters::getInstance().getNppGUI()._monospacedFontFindDlg;
if (isMonospaced)
{ {
_hMonospaceFont = createFont(TEXT("Courier New"), 8, false, _hSelf); hFont = createFont(TEXT("Courier New"), 8, false, _hSelf);
SendMessage(hFindCombo, WM_SETFONT, (WPARAM)_hMonospaceFont, MAKELPARAM(true, 0));
SendMessage(hReplaceCombo, WM_SETFONT, (WPARAM)_hMonospaceFont, MAKELPARAM(true, 0));
SendMessage(hFiltersCombo, WM_SETFONT, (WPARAM)_hMonospaceFont, MAKELPARAM(true, 0));
SendMessage(hDirCombo, WM_SETFONT, (WPARAM)_hMonospaceFont, MAKELPARAM(true, 0));
} }
else
DPIManager& dpiManager = NppParameters::getInstance()._dpiManager; {
hFont = reinterpret_cast<HFONT>(::SendMessage(hFindCombo, WM_GETFONT, 0, 0));
}
// Change ComboBox height to accomodate High-DPI settings. // Change ComboBox height to accomodate High-DPI settings.
// ComboBoxes are scaled using the font used in them, however this results in weird optics // ComboBoxes are scaled using the font used in them, however this results in weird optics
// on scaling > 200% (192 DPI). Using this method we accomodate these scalings way better // on scaling > 200% (192 DPI). Using this method we accomodate these scalings way better
// than the OS does with the current dpiAware.manifest... // than the OS does with the current dpiAware.manifest...
for (HWND hComboBox : { hFindCombo, hReplaceCombo, hFiltersCombo, hDirCombo })
LOGFONT lf{};
::GetObject(hFont, sizeof(lf), &lf);
lf.lfHeight = -(_dpiManager.scale(16) - 5);
_hComboBoxFont = ::CreateFontIndirect(&lf);
for (const auto& hComboBox : { hFindCombo, hReplaceCombo, hFiltersCombo, hDirCombo })
{ {
LOGFONT lf = {}; ::SendMessage(hComboBox, WM_SETFONT, reinterpret_cast<WPARAM>(_hComboBoxFont), MAKELPARAM(TRUE, 0));
HFONT font = reinterpret_cast<HFONT>(SendMessage(hComboBox, WM_GETFONT, 0, 0));
::GetObject(font, sizeof(lf), &lf);
lf.lfHeight = (dpiManager.scaleY(16) - 5) * -1;
SendMessage(hComboBox, WM_SETFONT, (WPARAM)CreateFontIndirect(&lf), MAKELPARAM(true, 0));
} }
if (isMonospaced && hFont != nullptr)
::DeleteObject(hFont);
NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance()).getNativeLangSpeaker(); NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance()).getNativeLangSpeaker();
generic_string searchButtonTip = pNativeSpeaker->getLocalizedStrFromID("shift-change-direction-tip", TEXT("Use Shift+Enter to search in the opposite direction.")); generic_string searchButtonTip = pNativeSpeaker->getLocalizedStrFromID("shift-change-direction-tip", TEXT("Use Shift+Enter to search in the opposite direction."));
@ -1415,11 +1421,11 @@ intptr_t CALLBACK FindReplaceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARA
// "⇅" enlargement // "⇅" enlargement
_hLargerBolderFont = createFont(TEXT("Courier New"), 14, true, _hSelf); _hLargerBolderFont = createFont(TEXT("Courier New"), 14, true, _hSelf);
SendMessage(_hSwapButton, WM_SETFONT, (WPARAM)_hLargerBolderFont, MAKELPARAM(true, 0)); ::SendMessage(_hSwapButton, WM_SETFONT, reinterpret_cast<WPARAM>(_hLargerBolderFont), MAKELPARAM(TRUE, 0));
// Make "˄" & "˅" look better // Make "˄" & "˅" look better
_hCourrierNewFont = createFont(TEXT("Courier New"), 12, false, _hSelf); _hCourrierNewFont = createFont(TEXT("Courier New"), 12, false, _hSelf);
SendMessage(::GetDlgItem(_hSelf, IDD_RESIZE_TOGGLE_BUTTON), WM_SETFONT, (WPARAM)_hCourrierNewFont, MAKELPARAM(true, 0)); ::SendDlgItemMessage(_hSelf, IDD_RESIZE_TOGGLE_BUTTON, WM_SETFONT, reinterpret_cast<WPARAM>(_hCourrierNewFont), MAKELPARAM(TRUE, 0));
return TRUE; return TRUE;
} }

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

@ -450,7 +450,7 @@ private:
HICON _statusbarTooltipIcon = nullptr; HICON _statusbarTooltipIcon = nullptr;
int _statusbarTooltipIconSize = 0; int _statusbarTooltipIconSize = 0;
HFONT _hMonospaceFont = nullptr; HFONT _hComboBoxFont = nullptr;
HFONT _hLargerBolderFont = nullptr; HFONT _hLargerBolderFont = nullptr;
HFONT _hCourrierNewFont = nullptr; HFONT _hCourrierNewFont = nullptr;