pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-04-07 14:09:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'Fix bug 77990' (#521) from fix/bug-77990 into develop

Browse Source 
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/desktop-apps/pulls/521
This commit is contained in:
Oleg Kozhukharenko
2025-11-14 08:17:54 +00:00
parent 1371ac3a9d 88565d9f83
commit ecceca8178
1 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
win-linux/src/windows/platform_win/cwindowplatform.cpp
View File

@ -48,7 +48,14 @@
#define SKIP_EVENTS_QUEUE(callback) QTimer::singleShot(0, this, callback)
using WinVer = Utils::WinVer;
using GetSystemMetricsForDpi_t = int (WINAPI*)(int nIndex, UINT dpi);
static auto pGetSystemMetricsForDpi = []() -> GetSystemMetricsForDpi_t
{
if (HMODULE hUser32 = GetModuleHandle(L"user32"))
return (GetSystemMetricsForDpi_t)GetProcAddress(hUser32, "GetSystemMetricsForDpi");
return nullptr;
}();
static double GetLogicalDpi(QWidget *wgt)
{
@ -65,6 +72,17 @@ static double GetLogicalDpi(QWidget *wgt)
static void GetFrameMetricsForDpi(FRAME &frame, double dpi, bool maximized = false)
{
if (pGetSystemMetricsForDpi) {
frame.left = 0;
frame.top = pGetSystemMetricsForDpi(SM_CYCAPTION, dpi * 96);
if (!maximized) {
int cyFrame = pGetSystemMetricsForDpi(SM_CYSIZEFRAME, dpi * 96);
int cyBorder = pGetSystemMetricsForDpi(SM_CXPADDEDBORDER, dpi * 96);
frame.top += (cyFrame + cyBorder);
}
return;
}
WinVer ver = Utils::getWinVersion();
int row = ver == WinVer::WinXP ? 0 :
ver <= WinVer::Win7 ? 1 :
@ -91,7 +109,6 @@ static void GetFrameMetricsForDpi(FRAME &frame, double dpi, bool maximized = fal
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, // Win10
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} // Win11
};
frame.left = left[row][column];
const int top[5][13] = { // Top margin for scales 100-500%
{0, 0, 0, 0, 0, 1, 1, 1, 2, 2, 2, 2, 2}, // WinXp: for NC width 3px
@ -100,10 +117,6 @@ static void GetFrameMetricsForDpi(FRAME &frame, double dpi, bool maximized = fal
{31, 38, 45, 52, 58, 65, 72, 85, 99, 112, 126, 139, 167}, // Win10
{30, 37, 43, 50, 56, 63, 69, 82, 95, 108, 121, 134, 161} // Win11
};
frame.top = top[row][column];
if (!maximized)
return;
const int left_ofs[5][13] = { // Left offset for scales 100-500%
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, // WinXp
@ -112,7 +125,6 @@ static void GetFrameMetricsForDpi(FRAME &frame, double dpi, bool maximized = fal
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, // Win10
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} // Win11
};
frame.left -= left_ofs[row][column];
const int top_ofs[5][13] = { // Top offset for scales 100-500%
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, // WinXp
@ -121,7 +133,13 @@ static void GetFrameMetricsForDpi(FRAME &frame, double dpi, bool maximized = fal
{8, 9, 11, 12, 13, 14, 16, 18, 21, 24, 27, 30, 36}, // Win10
{7, 8, 9, 10, 11, 12, 13, 15, 17, 19, 21, 23, 28} // Win11
};
frame.top -= top_ofs[row][column];
frame.left = left[row][column];
frame.top = top[row][column];
if (maximized) {
frame.left -= left_ofs[row][column];
frame.top -= top_ofs[row][column];
}
}
static QColor GetBorderColor(bool isActive, const QColor &bkgColor)
@ -492,6 +510,10 @@ bool CWindowPlatform::nativeEvent(const QByteArray &eventType, void *message, lo
}
case WM_SETTINGCHANGE: {
if (msg->wParam == SPI_SETNONCLIENTMETRICS) {
GetFrameMetricsForDpi(m_frame, m_dpi, m_isMaximized);
SetWindowPos(m_hWnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED);
} else
if (msg->wParam == SPI_SETWINARRANGING) {
if (Utils::getWinVersion() > Utils::WinVer::Win10 && m_boxTitleBtns)
SendMessage((HWND)m_boxTitleBtns->winId(), WM_SETTINGCHANGE, 0, 0);