PM/DYTSrouce
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'new_osg' of http://brigecode.icu:16623/PM/DYTSrouce into new_osg

Browse Source
This commit is contained in:
pimin 2025-11-18 09:54:25 +08:00
commit 8fee163887
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/ui/FramelessDelegateWin.cpp
View File

@ -162,24 +162,22 @@ bool FramelessDelegateWin::nativeEvent(const QByteArray & eventType, void* messa
if (monitor && GetMonitorInfo(monitor, &mi)) { if (monitor && GetMonitorInfo(monitor, &mi)) {
const RECT& work = mi.rcWork; const RECT& work = mi.rcWork;
const RECT& rcMon = mi.rcMonitor; const RECT& rcMon = mi.rcMonitor;
const int frameX = GetSystemMetrics(SM_CXFRAME) + GetSystemMetrics(SM_CXPADDEDBORDER); // Use monitor work area directly to avoid off-screen placement on multi-monitor setups
const int frameY = GetSystemMetrics(SM_CYFRAME) + GetSystemMetrics(SM_CXPADDEDBORDER); mmi->ptMaxPosition.x = 0;
mmi->ptMaxPosition.y = 0;
mmi->ptMaxSize.x = (work.right - work.left);
mmi->ptMaxSize.y = (work.bottom - work.top);
mmi->ptMaxPosition.x = work.left - frameX; mmi->ptMaxTrackSize.x = (rcMon.right - rcMon.left);
mmi->ptMaxPosition.y = work.top - frameY; mmi->ptMaxTrackSize.y = (rcMon.bottom - rcMon.top);
mmi->ptMaxSize.x = (work.right - work.left) + frameX * 2;
mmi->ptMaxSize.y = (work.bottom - work.top) + frameY * 2;
mmi->ptMaxTrackSize.x = (rcMon.right - rcMon.left) + frameX * 2;
mmi->ptMaxTrackSize.y = (rcMon.bottom - rcMon.top) + frameY * 2;
const QSize minSize = mainWidget_->minimumSize(); const QSize minSize = mainWidget_->minimumSize();
const double dpr = mainWidget_->devicePixelRatioF(); const double dpr = mainWidget_->devicePixelRatioF();
const int minWpx = static_cast<int>(std::round(minSize.width() * dpr)); const int minWpx = static_cast<int>(std::round(minSize.width() * dpr));
const int minHpx = static_cast<int>(std::round(minSize.height() * dpr)); const int minHpx = static_cast<int>(std::round(minSize.height() * dpr));
// Guard against zero/negative values // Guard against zero/negative values
const int clampedMinW = std::max(1, minWpx) + frameX * 2; const int clampedMinW = std::max(1, minWpx);
const int clampedMinH = std::max(1, minHpx) + frameY * 2; const int clampedMinH = std::max(1, minHpx);
mmi->ptMinTrackSize.x = clampedMinW; mmi->ptMinTrackSize.x = clampedMinW;
mmi->ptMinTrackSize.y = clampedMinH; mmi->ptMinTrackSize.y = clampedMinH;
} }
@ -258,6 +256,7 @@ void FramelessDelegateWin::OnClose() {
void FramelessDelegateWin::OnScreenChangeInternaal() { void FramelessDelegateWin::OnScreenChangeInternaal() {
if (mainWidget_->internalWinId()) { if (mainWidget_->internalWinId()) {
CheckMonitorChanged();
SetWindowPos(reinterpret_cast<HWND>(mainWidget_->winId()), nullptr, 0, 0, 0, 0, SetWindowPos(reinterpret_cast<HWND>(mainWidget_->winId()), nullptr, 0, 0, 0, 0,
SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE); SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE);
} }