Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-02-23 19:49:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Wrap around colorIndex in a colors array (#669)

Browse Source
This commit is contained in:
yuyoyuppe
2019-11-07 19:50:04 +03:00
committed by Enrico Giordani
parent c4fc67301c
commit a9518c2e55
1 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/modules/fancyzones/lib/ZoneWindow.cpp
View File

@@ -817,33 +817,36 @@ void ZoneWindow::DrawActiveZoneSet(wil::unique_hdc& hdc, RECT const& clientRect)
ColorSetting const colorFlash { 200, RGB(81, 92, 107), 200, RGB(104, 118, 138), -2 };
auto zones = m_activeZoneSet->GetZones();
size_t colorIndex = zones.size() - 1;
const size_t maxColorIndex = min(size(zones) - 1, size(colors) - 1);
size_t colorIndex = maxColorIndex;
for (auto iter = zones.rbegin(); iter != zones.rend(); iter++)
{
if (winrt::com_ptr<IZone> zone = iter->try_as<IZone>())
winrt::com_ptr<IZone> zone = iter->try_as<IZone>();
if (!zone)
{
if (zone != m_highlightZone)
{
if (m_flashMode)
{
DrawZone(hdc, colorFlash, zone);
}
else if (m_drawHints)
{
DrawZone(hdc, colorHints, zone);
}
else if (m_editorMode)
{
DrawZone(hdc, colorEditorMode, zone);
}
else
{
colorViewer.fill = colors[colorIndex];
DrawZone(hdc, colorViewer, zone);
}
}
colorIndex--;
continue;
}
if (zone != m_highlightZone)
{
if (m_flashMode)
{
DrawZone(hdc, colorFlash, zone);
}
else if (m_drawHints)
{
DrawZone(hdc, colorHints, zone);
}
else if (m_editorMode)
{
DrawZone(hdc, colorEditorMode, zone);
}
else
{
colorViewer.fill = colors[colorIndex];
DrawZone(hdc, colorViewer, zone);
}
}
colorIndex = colorIndex != 0 ? colorIndex - 1 : maxColorIndex;
}
if (m_highlightZone)