tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-12-05 04:39:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update dpiManagerV2 API

Browse Source 
- enable PmV2 dpi handling for Plugins Admin, Preference, and Style Configurator dialogs

Close #17165
This commit is contained in:
ozone10 2025-11-07 17:32:17 +01:00 committed by Don Ho
parent 00ed50fcac
commit bf646f0e16
9 changed files with 122 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1852,7 +1852,7 @@ intptr_t CALLBACK FindReplaceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARA
const auto style = static_cast<DWORD>(::GetWindowLongPtr(_hSelf, GWL_STYLE));
const auto exStyle = static_cast<DWORD>(::GetWindowLongPtr(_hSelf, GWL_EXSTYLE));
if (_dpiManager.adjustWindowRectExForDpi(&rcClient, style, FALSE, exStyle, newDpi) == FALSE)
if (!_dpiManager.adjustWindowRectExForDpi(&rcClient, style, FALSE, exStyle, newDpi))
{
const LONG padding = _dpiManager.getSystemMetricsForDpi(SM_CXPADDEDBORDER, newDpi);
xBorder = (_dpiManager.getSystemMetricsForDpi(SM_CXFRAME, newDpi) + padding) * 2;
@ -6656,7 +6656,7 @@ RECT Progress::getDpiScaledWindowRect(UINT dpi) const
const DWORD style = WS_POPUP | WS_CAPTION;
const DWORD exStyle = WS_EX_APPWINDOW | WS_EX_TOOLWINDOW | WS_EX_OVERLAPPEDWINDOW | (pNativeSpeaker->isRTL() ? WS_EX_LAYOUTRTL : 0);
if (_dpiManager.adjustWindowRectExForDpi(&rc, style, FALSE, exStyle, dpi) == FALSE)
if (!_dpiManager.adjustWindowRectExForDpi(&rc, style, FALSE, exStyle, dpi))
{
rc.right = xClient + xBorderPadding;
rc.bottom = yClient + yBorderPadding;

10
PowerEditor/src/WinControls/ColourPicker/ColourPopup.cpp
View File

@ -52,10 +52,7 @@ void ColourPopup::doDialog(POINT p)
{
const auto dpiContext = DPIManagerV2::setThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
createColorPopup();
if (dpiContext != NULL)
{
DPIManagerV2::setThreadDpiAwarenessContext(dpiContext);
}
DPIManagerV2::setThreadDpiAwarenessContext(dpiContext);
::SetWindowPos(_hSelf, HWND_TOP, p.x, p.y, 0, 0, SWP_NOSIZE | SWP_SHOWWINDOW);
}
@ -235,10 +232,7 @@ intptr_t CALLBACK ColourPopup::run_dlgProc(UINT message, WPARAM wParam, LPARAM l
const auto dpiContext = DPIManagerV2::setThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_UNAWARE_GDISCALED);
ChooseColorW(&cc);
if (dpiContext != NULL)
{
DPIManagerV2::setThreadDpiAwarenessContext(dpiContext);
}
DPIManagerV2::setThreadDpiAwarenessContext(dpiContext);
::SendMessage(_hParent, WM_PICKUP_COLOR, cc.rgbResult, 0);

4
PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp
View File

@ -1344,7 +1344,9 @@ void WordStyleDlg::doDialog(bool isRTL)
{
if (!isCreated())
{
create(IDD_STYLER_DLG, isRTL);
const auto dpiContext = DPIManagerV2::setThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
WordStyleDlg::create(IDD_STYLER_DLG, isRTL);
DPIManagerV2::setThreadDpiAwarenessContext(dpiContext);
prepare2Cancel();
}

4
PowerEditor/src/WinControls/PluginsAdmin/pluginsAdmin.h
View File

@ -146,7 +146,9 @@ public :
void doDialog(bool isRTL = false) {
if (!isCreated())
{
create(IDD_PLUGINSADMIN_DLG, isRTL);
const auto dpiContext = DPIManagerV2::setThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
PluginsAdminDlg::create(IDD_PLUGINSADMIN_DLG, isRTL);
DPIManagerV2::setThreadDpiAwarenessContext(dpiContext);
}
display();
}

2
PowerEditor/src/WinControls/Preference/preferenceDlg.h
View File

@ -385,8 +385,10 @@ public :
void doDialog(bool isRTL = false) {
if (!isCreated())
{
const auto dpiContext = DPIManagerV2::setThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
create(IDD_PREFERENCE_BOX, isRTL);
goToCenter(SWP_SHOWWINDOW | SWP_NOSIZE);
DPIManagerV2::setThreadDpiAwarenessContext(dpiContext);
}
display();
}

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

@ -19,7 +19,8 @@
#include "StaticDialog.h"
#include "Common.h"
//#include "NppDarkMode.h"
#include "NppDarkMode.h"
#include "dpiManagerV2.h"
StaticDialog::~StaticDialog()
{
@ -362,7 +363,6 @@ void StaticDialog::create(int dialogID, bool isRTL, bool msgDestParent, WORD fon
return;
}
NppDarkMode::setDarkTitleBar(_hSelf);
setDpi();
// if the destination of message NPPM_MODELESSDIALOG is not its parent, then it's the grand-parent
@ -395,4 +395,3 @@ intptr_t CALLBACK StaticDialog::dlgProc(HWND hwnd, UINT message, WPARAM wParam,
}
}
}

6
PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.cpp
View File

@ -728,13 +728,9 @@ void WindowsDlg::updateButtonState()
int WindowsDlg::doDialog()
{
const auto dpiContext = DPIManagerV2::setThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_UNAWARE_GDISCALED);
const auto result = static_cast<int>(StaticDialog::myCreateDialogBoxIndirectParam(IDD_WINDOWS, false));
DPIManagerV2::setThreadDpiAwarenessContext(dpiContext);
if (dpiContext != NULL)
{
DPIManagerV2::setThreadDpiAwarenessContext(dpiContext);
}
return result;
}

173
PowerEditor/src/dpiManagerV2.cpp
View File

@ -17,35 +17,88 @@
#include "dpiManagerV2.h"
#include <windows.h>
#include <commctrl.h>
template <typename P>
bool ptrFn(HMODULE handle, P& pointer, const char* name)
namespace NppDarkMode
{
auto p = reinterpret_cast<P>(::GetProcAddress(handle, name));
if (p != nullptr)
bool isWindows10();
}
template <typename P>
inline auto LoadFn(HMODULE handle, P& pointer, const char* name) noexcept -> bool
{
if (auto* proc = ::GetProcAddress(handle, name); proc != nullptr)
{
pointer = p;
pointer = reinterpret_cast<P>(reinterpret_cast<INT_PTR>(proc));
return true;
}
return false;
}
[[nodiscard]] static UINT WINAPI DummyGetDpiForSystem()
{
UINT dpi = USER_DEFAULT_SCREEN_DPI;
if (HDC hdc = ::GetDC(nullptr); hdc != nullptr)
{
dpi = static_cast<UINT>(::GetDeviceCaps(hdc, LOGPIXELSX));
::ReleaseDC(nullptr, hdc);
}
return dpi;
}
[[nodiscard]] static UINT WINAPI DummyGetDpiForWindow([[maybe_unused]] HWND hwnd)
{
return DummyGetDpiForSystem();
}
[[nodiscard]] static int WINAPI DummyGetSystemMetricsForDpi(int nIndex, UINT dpi)
{
return DPIManagerV2::scale(::GetSystemMetrics(nIndex), dpi);
}
[[nodiscard]] static BOOL WINAPI DummySystemParametersInfoForDpi(UINT uiAction, UINT uiParam, PVOID pvParam, UINT fWinIni, [[maybe_unused]] UINT dpi)
{
return ::SystemParametersInfoW(uiAction, uiParam, pvParam, fWinIni);
}
[[nodiscard]] static BOOL WINAPI DummyIsValidDpiAwarenessContext([[maybe_unused]] DPI_AWARENESS_CONTEXT value)
{
return FALSE;
}
[[nodiscard]] static DPI_AWARENESS_CONTEXT WINAPI DummySetThreadDpiAwarenessContext([[maybe_unused]] DPI_AWARENESS_CONTEXT dpiContext)
{
return nullptr;
}
static BOOL WINAPI DummyAdjustWindowRectExForDpi(
[[maybe_unused]] LPRECT lpRect,
[[maybe_unused]] DWORD dwStyle,
[[maybe_unused]] BOOL bMenu,
[[maybe_unused]] DWORD dwExStyle,
[[maybe_unused]] UINT dpi
)
{
return FALSE;
}
using fnGetDpiForSystem = UINT (WINAPI*)(VOID);
using fnGetDpiForWindow = UINT (WINAPI*)(HWND hwnd);
using fnGetSystemMetricsForDpi = int (WINAPI*)(int nIndex, UINT dpi);
using fnSystemParametersInfoForDpi = BOOL (WINAPI*)(UINT uiAction, UINT uiParam, PVOID pvParam, UINT fWinIni, UINT dpi);
using fnIsValidDpiAwarenessContext = BOOL (WINAPI*)(DPI_AWARENESS_CONTEXT value);
using fnSetThreadDpiAwarenessContext = DPI_AWARENESS_CONTEXT (WINAPI*)(DPI_AWARENESS_CONTEXT dpiContext);
using fnAdjustWindowRectExForDpi = BOOL (WINAPI*)(LPRECT lpRect, DWORD dwStyle, BOOL bMenu, DWORD dwExStyle, UINT dpi);
fnGetDpiForSystem _fnGetDpiForSystem = nullptr;
fnGetDpiForWindow _fnGetDpiForWindow = nullptr;
fnGetSystemMetricsForDpi _fnGetSystemMetricsForDpi = nullptr;
fnSystemParametersInfoForDpi _fnSystemParametersInfoForDpi = nullptr;
fnSetThreadDpiAwarenessContext _fnSetThreadDpiAwarenessContext = nullptr;
fnAdjustWindowRectExForDpi _fnAdjustWindowRectExForDpi = nullptr;
static fnGetDpiForSystem _fnGetDpiForSystem = DummyGetDpiForSystem;
static fnGetDpiForWindow _fnGetDpiForWindow = DummyGetDpiForWindow;
static fnGetSystemMetricsForDpi _fnGetSystemMetricsForDpi = DummyGetSystemMetricsForDpi;
static fnSystemParametersInfoForDpi _fnSystemParametersInfoForDpi = DummySystemParametersInfoForDpi;
static fnIsValidDpiAwarenessContext _fnIsValidDpiAwarenessContext = DummyIsValidDpiAwarenessContext;
static fnSetThreadDpiAwarenessContext _fnSetThreadDpiAwarenessContext = DummySetThreadDpiAwarenessContext;
static fnAdjustWindowRectExForDpi _fnAdjustWindowRectExForDpi = DummyAdjustWindowRectExForDpi;
void DPIManagerV2::initDpiAPI()
{
@ -54,12 +107,13 @@ void DPIManagerV2::initDpiAPI()
HMODULE hUser32 = ::GetModuleHandleW(L"user32.dll");
if (hUser32 != nullptr)
{
ptrFn(hUser32, _fnGetDpiForSystem, "GetDpiForSystem");
ptrFn(hUser32, _fnGetDpiForWindow, "GetDpiForWindow");
ptrFn(hUser32, _fnGetSystemMetricsForDpi, "GetSystemMetricsForDpi");
ptrFn(hUser32, _fnSystemParametersInfoForDpi, "SystemParametersInfoForDpi");
ptrFn(hUser32, _fnSetThreadDpiAwarenessContext, "SetThreadDpiAwarenessContext");
ptrFn(hUser32, _fnAdjustWindowRectExForDpi, "AdjustWindowRectExForDpi");
LoadFn(hUser32, _fnGetDpiForSystem, "GetDpiForSystem");
LoadFn(hUser32, _fnGetDpiForWindow, "GetDpiForWindow");
LoadFn(hUser32, _fnGetSystemMetricsForDpi, "GetSystemMetricsForDpi");
LoadFn(hUser32, _fnSystemParametersInfoForDpi, "SystemParametersInfoForDpi");
LoadFn(hUser32, _fnIsValidDpiAwarenessContext, "IsValidDpiAwarenessContext");
LoadFn(hUser32, _fnSetThreadDpiAwarenessContext, "SetThreadDpiAwarenessContext");
LoadFn(hUser32, _fnAdjustWindowRectExForDpi, "AdjustWindowRectExForDpi");
}
}
@ -67,59 +121,43 @@ void DPIManagerV2::initDpiAPI()
int DPIManagerV2::getSystemMetricsForDpi(int nIndex, UINT dpi)
{
if (_fnGetSystemMetricsForDpi != nullptr)
{
return _fnGetSystemMetricsForDpi(nIndex, dpi);
}
return DPIManagerV2::scale(::GetSystemMetrics(nIndex), dpi);
return _fnGetSystemMetricsForDpi(nIndex, dpi);
}
bool DPIManagerV2::isValidDpiAwarenessContext(DPI_AWARENESS_CONTEXT value)
{
return _fnIsValidDpiAwarenessContext(value) == TRUE;
}
DPI_AWARENESS_CONTEXT DPIManagerV2::setThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT dpiContext)
{
if (_fnSetThreadDpiAwarenessContext != nullptr)
if (DPIManagerV2::isValidDpiAwarenessContext(dpiContext))
{
return _fnSetThreadDpiAwarenessContext(dpiContext);
}
return NULL;
return nullptr;
}
BOOL DPIManagerV2::adjustWindowRectExForDpi(LPRECT lpRect, DWORD dwStyle, BOOL bMenu, DWORD dwExStyle, UINT dpi)
bool DPIManagerV2::adjustWindowRectExForDpi(LPRECT lpRect, DWORD dwStyle, BOOL bMenu, DWORD dwExStyle, UINT dpi)
{
if (_fnAdjustWindowRectExForDpi != nullptr)
{
return _fnAdjustWindowRectExForDpi(lpRect, dwStyle, bMenu, dwExStyle, dpi);
}
return FALSE;
return _fnAdjustWindowRectExForDpi(lpRect, dwStyle, bMenu, dwExStyle, dpi) == TRUE;
}
UINT DPIManagerV2::getDpiForSystem()
{
if (_fnGetDpiForSystem != nullptr)
{
return _fnGetDpiForSystem();
}
UINT dpi = USER_DEFAULT_SCREEN_DPI;
HDC hdc = ::GetDC(nullptr);
if (hdc != nullptr)
{
dpi = ::GetDeviceCaps(hdc, LOGPIXELSX);
::ReleaseDC(nullptr, hdc);
}
return dpi;
return _fnGetDpiForSystem();
}
UINT DPIManagerV2::getDpiForWindow(HWND hWnd)
{
if (_fnGetDpiForWindow != nullptr)
if (hWnd != nullptr)
{
const auto dpi = _fnGetDpiForWindow(hWnd);
if (dpi > 0)
if (const auto dpi = _fnGetDpiForWindow(hWnd); dpi > 0)
{
return dpi;
}
}
return getDpiForSystem();
return DPIManagerV2::getDpiForSystem();
}
void DPIManagerV2::setPositionDpi(LPARAM lParam, HWND hWnd, UINT flags)
@ -137,21 +175,11 @@ void DPIManagerV2::setPositionDpi(LPARAM lParam, HWND hWnd, UINT flags)
LOGFONT DPIManagerV2::getDefaultGUIFontForDpi(UINT dpi, FontType type)
{
int result = 0;
LOGFONT lf{};
NONCLIENTMETRICS ncm{};
ncm.cbSize = sizeof(NONCLIENTMETRICS);
if (_fnSystemParametersInfoForDpi != nullptr
&& (_fnSystemParametersInfoForDpi(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &ncm, 0, dpi) != FALSE))
{
result = 2;
}
else if (::SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &ncm, 0) != FALSE)
{
result = 1;
}
if (result > 0)
if (_fnSystemParametersInfoForDpi(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &ncm, 0, dpi) == TRUE)
{
switch (type)
{
@ -167,6 +195,12 @@ LOGFONT DPIManagerV2::getDefaultGUIFontForDpi(UINT dpi, FontType type)
break;
}
case FontType::message:
{
lf = ncm.lfMessageFont;
break;
}
case FontType::caption:
{
lf = ncm.lfCaptionFont;
@ -178,22 +212,17 @@ LOGFONT DPIManagerV2::getDefaultGUIFontForDpi(UINT dpi, FontType type)
lf = ncm.lfSmCaptionFont;
break;
}
//case FontType::message:
default:
{
lf = ncm.lfMessageFont;
break;
}
}
if (_fnSystemParametersInfoForDpi == DummySystemParametersInfoForDpi)
{
lf.lfHeight = scaleFont(lf.lfHeight, dpi);
}
}
else // should not happen, fallback
{
auto hf = static_cast<HFONT>(::GetStockObject(DEFAULT_GUI_FONT));
::GetObject(hf, sizeof(LOGFONT), &lf);
}
if (result < 2)
{
auto* hf = static_cast<HFONT>(::GetStockObject(DEFAULT_GUI_FONT));
::GetObjectW(hf, sizeof(LOGFONT), &lf);
lf.lfHeight = scaleFont(lf.lfHeight, dpi);
}

9
PowerEditor/src/dpiManagerV2.h
View File

@ -16,7 +16,7 @@
#pragma once
#include "NppDarkMode.h"
#include <windows.h>
#ifndef WM_DPICHANGED
#define WM_DPICHANGED 0x02E0
@ -50,9 +50,12 @@ public:
int getSystemMetricsForDpi(int nIndex) const {
return getSystemMetricsForDpi(nIndex, _dpi);
}
static DPI_AWARENESS_CONTEXT setThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT dpiContext);
static BOOL adjustWindowRectExForDpi(LPRECT lpRect, DWORD dwStyle, BOOL bMenu, DWORD dwExStyle, UINT dpi);
[[nodiscard]] static bool isValidDpiAwarenessContext(DPI_AWARENESS_CONTEXT value);
// includes check for `DPI_AWARENESS_CONTEXT dpiContext` via `isValidDpiAwarenessContext`
static DPI_AWARENESS_CONTEXT setThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT dpiContext);
static bool adjustWindowRectExForDpi(LPRECT lpRect, DWORD dwStyle, BOOL bMenu, DWORD dwExStyle, UINT dpi);
static UINT getDpiForSystem();
static UINT getDpiForWindow(HWND hWnd);