Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 19:57:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

FZ: format FancyZones.cpp

Browse Source
This commit is contained in:
yuyoyuppe
2020-10-26 19:23:50 +03:00
committed by Andrey Nekrasov
parent 8ca0c35242
commit 129342edff
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/modules/fancyzones/lib/FancyZones.cpp
View File

@@ -616,7 +616,7 @@ void FancyZones::ToggleEditor() noexcept
winrt::com_ptr<IZoneWindow> zoneWindow; winrt::com_ptr<IZoneWindow> zoneWindow;
std::shared_lock readLock(m_lock); std::shared_lock readLock(m_lock);
if (m_settings->GetSettings()->spanZonesAcrossMonitors) if (m_settings->GetSettings()->spanZonesAcrossMonitors)
{ {
zoneWindow = m_workAreaHandler.GetWorkArea(m_currentDesktopId, NULL); zoneWindow = m_workAreaHandler.GetWorkArea(m_currentDesktopId, NULL);
@@ -625,7 +625,7 @@ void FancyZones::ToggleEditor() noexcept
{ {
zoneWindow = m_workAreaHandler.GetWorkArea(m_currentDesktopId, monitor); zoneWindow = m_workAreaHandler.GetWorkArea(m_currentDesktopId, monitor);
} }
if (!zoneWindow) if (!zoneWindow)
{ {
return; return;
@@ -639,7 +639,8 @@ void FancyZones::ToggleEditor() noexcept
m_dpiUnawareThread.submit(OnThreadExecutor::task_t{ [&] { m_dpiUnawareThread.submit(OnThreadExecutor::task_t{ [&] {
allMonitors = FancyZonesUtils::GetAllMonitorRects<&MONITORINFOEX::rcWork>(); allMonitors = FancyZonesUtils::GetAllMonitorRects<&MONITORINFOEX::rcWork>();
} }).wait(); } })
.wait();
UINT currentDpi = 0; UINT currentDpi = 0;
for (const auto& monitor : allMonitors) for (const auto& monitor : allMonitors)
@@ -650,15 +651,15 @@ void FancyZones::ToggleEditor() noexcept
{ {
if (currentDpi == 0) if (currentDpi == 0)
{ {
currentDpi = dpiX; currentDpi = dpiX;
continue; continue;
} }
if (currentDpi != dpiX) if (currentDpi != dpiX)
{ {
MessageBoxW(NULL, MessageBoxW(NULL,
GET_RESOURCE_STRING(IDS_SPAN_ACROSS_ZONES_WARNING).c_str(), GET_RESOURCE_STRING(IDS_SPAN_ACROSS_ZONES_WARNING).c_str(),
GET_RESOURCE_STRING(IDS_POWERTOYS_FANCYZONES).c_str(), GET_RESOURCE_STRING(IDS_POWERTOYS_FANCYZONES).c_str(),
MB_OK | MB_ICONWARNING); MB_OK | MB_ICONWARNING);
break; break;
} }
} }
@@ -693,8 +694,9 @@ void FancyZones::ToggleEditor() noexcept
mi.cbSize = sizeof(mi); mi.cbSize = sizeof(mi);
m_dpiUnawareThread.submit(OnThreadExecutor::task_t{ [&] { m_dpiUnawareThread.submit(OnThreadExecutor::task_t{ [&] {
GetMonitorInfo(monitor, &mi); GetMonitorInfo(monitor, &mi);
} }).wait(); } })
.wait();
const auto x = mi.rcWork.left; const auto x = mi.rcWork.left;
const auto y = mi.rcWork.top; const auto y = mi.rcWork.top;
@@ -981,7 +983,7 @@ void FancyZones::UpdateZoneWindows() noexcept
auto callback = [](HMONITOR monitor, HDC, RECT*, LPARAM data) -> BOOL { auto callback = [](HMONITOR monitor, HDC, RECT*, LPARAM data) -> BOOL {
capture* params = reinterpret_cast<capture*>(data); capture* params = reinterpret_cast<capture*>(data);
MONITORINFOEX mi{ { .cbSize = sizeof(mi)} }; MONITORINFOEX mi{ { .cbSize = sizeof(mi) } };
if (GetMonitorInfoW(monitor, &mi)) if (GetMonitorInfoW(monitor, &mi))
{ {
auto& displayDeviceIdxMap = *(params->displayDeviceIdx); auto& displayDeviceIdxMap = *(params->displayDeviceIdx);
@@ -1006,8 +1008,8 @@ void FancyZones::UpdateZoneWindows() noexcept
if (deviceId.empty()) if (deviceId.empty())
{ {
deviceId = GetSystemMetrics(SM_REMOTESESSION) ? deviceId = GetSystemMetrics(SM_REMOTESESSION) ?
L"\\\\?\\DISPLAY#REMOTEDISPLAY#" : L"\\\\?\\DISPLAY#REMOTEDISPLAY#" :
L"\\\\?\\DISPLAY#LOCALDISPLAY#"; L"\\\\?\\DISPLAY#LOCALDISPLAY#";
fancyZones->AddZoneWindow(monitor, deviceId); fancyZones->AddZoneWindow(monitor, deviceId);
} }