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

Good progress on D2D

Browse Source
This commit is contained in:
ivan100sic
2020-10-20 15:19:10 +02:00
committed by Ivan Stosic
parent 92a3ff9b2a
commit 0c544409dd
2 changed files with 177 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -158,6 +158,7 @@ private:
void UpdateActiveZoneSet(_In_opt_ IZoneSet* zoneSet) noexcept;
LRESULT WndProc(UINT message, WPARAM wparam, LPARAM lparam) noexcept;
void OnPaint(HDC hdc) noexcept;
void OnPaintD2D() noexcept;
void OnKeyUp(WPARAM wparam) noexcept;
std::vector<size_t> ZonesFromPoint(POINT pt) noexcept;
void CycleActiveZoneSetInternal(DWORD wparam, Trace::ZoneWindow::InputMode mode) noexcept;
@@ -181,6 +182,7 @@ private:
std::atomic<bool> m_animating;
OnThreadExecutor m_paintExecutor;
ULONG_PTR gdiplusToken;
std::unique_ptr<ZoneWindowDrawing> m_zoneWindowDrawing;
};
ZoneWindow::ZoneWindow(HINSTANCE hinstance)
@@ -240,6 +242,7 @@ bool ZoneWindow::Init(IZoneWindowHost* host, HINSTANCE hinstance, HMONITOR monit
MakeWindowTransparent(m_window.get());
m_zoneWindowDrawing = std::make_unique<ZoneWindowDrawing>(m_window.get());
// Ignore flashZones
/*
if (flashZones)
@@ -596,12 +599,12 @@ LRESULT ZoneWindow::WndProc(UINT message, WPARAM wparam, LPARAM lparam) noexcept
case WM_PRINTCLIENT:
{
OnPaint(reinterpret_cast<HDC>(wparam));
// OnPaint(reinterpret_cast<HDC>(wparam));
}
break;
case WM_PAINT:
{
OnPaint(NULL);
OnPaintD2D();
}
break;
@@ -659,6 +662,12 @@ void ZoneWindow::OnPaint(HDC hdc) noexcept
}
}
void ZoneWindow::OnPaintD2D() noexcept
{
m_zoneWindowDrawing->DrawActiveZoneSet(m_activeZoneSet->GetZones(), m_highlightZone, m_host);
m_zoneWindowDrawing->Render();
}
void ZoneWindow::OnKeyUp(WPARAM wparam) noexcept
{
bool fRedraw = false;