Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-07 11:46:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rebase fix

Browse Source
This commit is contained in:
ivan100sic
2020-10-26 12:20:01 +01:00
committed by Ivan Stosic
parent 3b1a70c10a
commit 51faca5b69
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/modules/fancyzones/lib/ZoneWindowDrawing.cpp
View File

@@ -219,7 +219,7 @@ void ZoneWindowDrawing::Show(unsigned animationMillis)
} }
} }
void ZoneWindowDrawing::DrawActiveZoneSet(const std::vector<winrt::com_ptr<IZone>>& zones, void ZoneWindowDrawing::DrawActiveZoneSet(const IZoneSet::ZonesMap& zones,
const std::vector<size_t>& highlightZones, const std::vector<size_t>& highlightZones,
winrt::com_ptr<IZoneWindowHost> host) winrt::com_ptr<IZoneWindowHost> host)
{ {
@@ -236,17 +236,15 @@ void ZoneWindowDrawing::DrawActiveZoneSet(const std::vector<winrt::com_ptr<IZone
inactiveColor.a = host->GetZoneHighlightOpacity() / 100.f; inactiveColor.a = host->GetZoneHighlightOpacity() / 100.f;
highlightColor.a = host->GetZoneHighlightOpacity() / 100.f; highlightColor.a = host->GetZoneHighlightOpacity() / 100.f;
std::vector<bool> isHighlighted(zones.size(), false); std::vector<bool> isHighlighted(zones.size() + 1, false);
for (size_t x : highlightZones) for (size_t x : highlightZones)
{ {
isHighlighted[x] = true; isHighlighted[x] = true;
} }
// First draw the inactive zones // First draw the inactive zones
for (auto iter = zones.begin(); iter != zones.end(); iter++) for (const auto& [zoneId, zone] : zones)
{ {
int zoneId = static_cast<int>(iter - zones.begin());
winrt::com_ptr<IZone> zone = iter->try_as<IZone>();
if (!zone) if (!zone)
{ {
continue; continue;
@@ -266,10 +264,8 @@ void ZoneWindowDrawing::DrawActiveZoneSet(const std::vector<winrt::com_ptr<IZone
} }
// Draw the active zones on top of the inactive zones // Draw the active zones on top of the inactive zones
for (auto iter = zones.begin(); iter != zones.end(); iter++) for (const auto& [zoneId, zone] : zones)
{ {
int zoneId = static_cast<int>(iter - zones.begin());
winrt::com_ptr<IZone> zone = iter->try_as<IZone>();
if (!zone) if (!zone)
{ {
continue; continue;

2
src/modules/fancyzones/lib/ZoneWindowDrawing.h
View File

@@ -52,7 +52,7 @@ public:
void Hide(); void Hide();
void Show(unsigned animationMillis); void Show(unsigned animationMillis);
void ForceRender(); void ForceRender();
void DrawActiveZoneSet(const std::vector<winrt::com_ptr<IZone>>& zones, void DrawActiveZoneSet(const IZoneSet::ZonesMap& zones,
const std::vector<size_t>& highlightZones, const std::vector<size_t>& highlightZones,
winrt::com_ptr<IZoneWindowHost> host); winrt::com_ptr<IZoneWindowHost> host);
}; };