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

Simplify code, remove flashZones, remove unused code

Browse Source
This commit is contained in:
ivan100sic
2020-10-22 23:27:55 +02:00
committed by Ivan Stosic
parent 92e8a84a4e
commit f7d3c20648
5 changed files with 42 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -937,17 +937,13 @@ void FancyZones::AddZoneWindow(HMONITOR monitor, const std::wstring& deviceId) n
uniqueId = ZoneWindowUtils::GenerateUniqueIdAllMonitorsArea(virtualDesktopId.get());
}
// "Turning FLASHING_ZONE option off"
//const bool flash = m_settings->GetSettings()->zoneSetChange_flashZones;
const bool flash = false;
std::wstring parentId{};
auto parentArea = m_workAreaHandler.GetWorkArea(m_previousDesktopId, monitor);
if (parentArea)
{
parentId = parentArea->UniqueId();
}
auto workArea = MakeZoneWindow(this, m_hinstance, monitor, uniqueId, parentId, flash);
auto workArea = MakeZoneWindow(this, m_hinstance, monitor, uniqueId, parentId);
if (workArea)
{
m_workAreaHandler.AddWorkArea(m_currentDesktopId, monitor, workArea);

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

@@ -61,54 +61,6 @@ namespace ZoneWindowUtils
return result;
}
void PaintZoneWindow(HDC hdc,
HWND window,
bool hasActiveZoneSet,
COLORREF hostZoneColor,
COLORREF hostZoneBorderColor,
COLORREF hostZoneHighlightColor,
int hostZoneHighlightOpacity,
IZoneSet::ZonesMap zones,
std::vector<size_t> highlightZone,
bool flashMode)
{
PAINTSTRUCT ps;
HDC oldHdc = hdc;
if (!hdc)
{
hdc = BeginPaint(window, &ps);
}
RECT clientRect;
GetClientRect(window, &clientRect);
wil::unique_hdc hdcMem;
HPAINTBUFFER bufferedPaint = BeginBufferedPaint(hdc, &clientRect, BPBF_TOPDOWNDIB, nullptr, &hdcMem);
if (bufferedPaint)
{
ZoneWindowDrawingNS::DrawBackdrop(hdcMem, clientRect);
if (hasActiveZoneSet)
{
ZoneWindowDrawingNS::DrawActiveZoneSet(hdcMem,
hostZoneColor,
hostZoneBorderColor,
hostZoneHighlightColor,
hostZoneHighlightOpacity,
zones,
highlightZone,
flashMode);
}
EndBufferedPaint(bufferedPaint, TRUE);
}
if (!oldHdc)
{
EndPaint(window, &ps);
}
}
}
struct ZoneWindow : public winrt::implements<ZoneWindow, IZoneWindow>
@@ -117,7 +69,7 @@ public:
ZoneWindow(HINSTANCE hinstance);
~ZoneWindow();
bool Init(IZoneWindowHost* host, HINSTANCE hinstance, HMONITOR monitor, const std::wstring& uniqueId, const std::wstring& parentUniqueId, bool flashZones);
bool Init(IZoneWindowHost* host, HINSTANCE hinstance, HMONITOR monitor, const std::wstring& uniqueId, const std::wstring& parentUniqueId);
IFACEMETHODIMP MoveSizeEnter(HWND window) noexcept;
IFACEMETHODIMP MoveSizeUpdate(POINT const& ptScreen, bool dragEnabled, bool selectManyZones) noexcept;
@@ -162,14 +114,12 @@ private:
void OnKeyUp(WPARAM wparam) noexcept;
std::vector<size_t> ZonesFromPoint(POINT pt) noexcept;
void CycleActiveZoneSetInternal(DWORD wparam, Trace::ZoneWindow::InputMode mode) noexcept;
void FlashZones() noexcept;
winrt::com_ptr<IZoneWindowHost> m_host;
HMONITOR m_monitor{};
std::wstring m_uniqueId; // Parsed deviceId + resolution + virtualDesktopId
wil::unique_hwnd m_window{}; // Hidden tool window used to represent current monitor desktop work area.
HWND m_windowMoveSize{};
bool m_flashMode{};
winrt::com_ptr<IZoneSet> m_activeZoneSet;
std::vector<winrt::com_ptr<IZoneSet>> m_zoneSets;
std::vector<size_t> m_initialHighlightZone;
@@ -178,10 +128,6 @@ private:
size_t m_keyCycle{};
static const UINT m_showAnimationDuration = 200; // ms
static const UINT m_flashDuration = 700; // ms
std::atomic<bool> m_animating; // TODO remove
OnThreadExecutor m_paintExecutor;
ULONG_PTR gdiplusToken;
std::unique_ptr<ZoneWindowDrawing> m_zoneWindowDrawing;
};
@@ -194,19 +140,13 @@ ZoneWindow::ZoneWindow(HINSTANCE hinstance)
wcex.lpszClassName = NonLocalizable::ToolWindowClassName;
wcex.hCursor = LoadCursorW(nullptr, IDC_ARROW);
RegisterClassExW(&wcex);
Gdiplus::GdiplusStartupInput gdiplusStartupInput;
Gdiplus::GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL);
m_paintExecutor.submit(OnThreadExecutor::task_t{ []() { BufferedPaintInit(); } });
}
ZoneWindow::~ZoneWindow()
{
Gdiplus::GdiplusShutdown(gdiplusToken);
m_paintExecutor.submit(OnThreadExecutor::task_t{ []() { BufferedPaintUnInit(); } });
}
bool ZoneWindow::Init(IZoneWindowHost* host, HINSTANCE hinstance, HMONITOR monitor, const std::wstring& uniqueId, const std::wstring& parentUniqueId, bool flashZones)
bool ZoneWindow::Init(IZoneWindowHost* host, HINSTANCE hinstance, HMONITOR monitor, const std::wstring& uniqueId, const std::wstring& parentUniqueId)
{
m_host.copy_from(host);
@@ -243,22 +183,6 @@ 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)
{
// Don't flash if the foreground window is in full screen mode
RECT windowRect;
if (!(GetWindowRect(GetForegroundWindow(), &windowRect) &&
windowRect.left == mi.rcMonitor.left &&
windowRect.top == mi.rcMonitor.top &&
windowRect.right == mi.rcMonitor.right &&
windowRect.bottom == mi.rcMonitor.bottom))
{
FlashZones();
}
}
*/
return true;
}
@@ -409,10 +333,6 @@ ZoneWindow::CycleActiveZoneSet(DWORD wparam) noexcept
{
InvalidateRect(m_window.get(), nullptr, true);
}
else
{
FlashZones();
}
}
IFACEMETHODIMP_(void)
@@ -443,8 +363,6 @@ ZoneWindow::ShowZoneWindow() noexcept
return;
}
m_flashMode = false;
UINT flags = SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE;
HWND windowInsertAfter = m_windowMoveSize;
@@ -525,7 +443,7 @@ void ZoneWindow::CalculateZoneSet() noexcept
activeZoneSet.type,
m_monitor,
sensitivityRadius));
RECT workArea;
if (m_monitor)
{
@@ -548,9 +466,9 @@ void ZoneWindow::CalculateZoneSet() noexcept
bool showSpacing = deviceInfoData->showSpacing;
int spacing = showSpacing ? deviceInfoData->spacing : 0;
int zoneCount = deviceInfoData->zoneCount;
zoneSet->CalculateZones(workArea, zoneCount, spacing);
UpdateActiveZoneSet(zoneSet.get());
UpdateActiveZoneSet(zoneSet.get());
}
}
@@ -586,11 +504,6 @@ LRESULT ZoneWindow::WndProc(UINT message, WPARAM wparam, LPARAM lparam) noexcept
case WM_ERASEBKGND:
return 1;
case WM_PRINTCLIENT:
{
// OnPaint(reinterpret_cast<HDC>(wparam));
}
break;
case WM_PAINT:
{
OnPaintD2D();
@@ -605,52 +518,6 @@ LRESULT ZoneWindow::WndProc(UINT message, WPARAM wparam, LPARAM lparam) noexcept
return 0;
}
void ZoneWindow::OnPaint(HDC hdc) noexcept
{
HWND window = m_window.get();
bool hasActiveZoneSet = m_activeZoneSet && m_host;
COLORREF hostZoneColor{};
COLORREF hostZoneBorderColor{};
COLORREF hostZoneHighlightColor{};
int hostZoneHighlightOpacity{};
IZoneSet::ZonesMap zones;
std::vector<size_t> highlightZone = m_highlightZone;
bool flashMode = m_flashMode;
if (hasActiveZoneSet)
{
hostZoneColor = m_host->GetZoneColor();
hostZoneBorderColor = m_host->GetZoneBorderColor();
hostZoneHighlightColor = m_host->GetZoneHighlightColor();
hostZoneHighlightOpacity = m_host->GetZoneHighlightOpacity();
zones = m_activeZoneSet->GetZones();
}
OnThreadExecutor::task_t task{
[=]() {
ZoneWindowUtils::PaintZoneWindow(hdc,
window,
hasActiveZoneSet,
hostZoneColor,
hostZoneBorderColor,
hostZoneHighlightColor,
hostZoneHighlightOpacity,
zones,
highlightZone,
flashMode);
} };
if (m_animating)
{
task();
}
else
{
m_paintExecutor.cancel();
m_paintExecutor.submit(std::move(task));
}
}
void ZoneWindow::OnPaintD2D() noexcept
{
m_zoneWindowDrawing->DrawActiveZoneSet(m_activeZoneSet->GetZones(), m_highlightZone, m_host);
@@ -726,21 +593,6 @@ void ZoneWindow::CycleActiveZoneSetInternal(DWORD wparam, Trace::ZoneWindow::Inp
m_highlightZone = {};
}
void ZoneWindow::FlashZones() noexcept
{
// "Turning FLASHING_ZONE option off"
if (true)
{
return;
}
m_flashMode = true;
ShowWindow(m_window.get(), SW_SHOWNA);
std::thread([window = m_window.get()]() {
AnimateWindow(window, m_flashDuration, AW_HIDE | AW_BLEND);
}).detach();
}
#pragma endregion
LRESULT CALLBACK ZoneWindow::s_WndProc(HWND window, UINT message, WPARAM wparam, LPARAM lparam) noexcept
@@ -757,10 +609,10 @@ LRESULT CALLBACK ZoneWindow::s_WndProc(HWND window, UINT message, WPARAM wparam,
DefWindowProc(window, message, wparam, lparam);
}
winrt::com_ptr<IZoneWindow> MakeZoneWindow(IZoneWindowHost* host, HINSTANCE hinstance, HMONITOR monitor, const std::wstring& uniqueId, const std::wstring& parentUniqueId, bool flashZones) noexcept
winrt::com_ptr<IZoneWindow> MakeZoneWindow(IZoneWindowHost* host, HINSTANCE hinstance, HMONITOR monitor, const std::wstring& uniqueId, const std::wstring& parentUniqueId) noexcept
{
auto self = winrt::make_self<ZoneWindow>(hinstance);
if (self->Init(host, hinstance, monitor, uniqueId, parentUniqueId, flashZones))
if (self->Init(host, hinstance, monitor, uniqueId, parentUniqueId))
{
return self;
}

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

@@ -127,4 +127,4 @@ interface __declspec(uuid("{7F017528-8110-4FB3-BE41-F472969C2560}")) IZoneWindow
};
winrt::com_ptr<IZoneWindow> MakeZoneWindow(IZoneWindowHost* host, HINSTANCE hinstance, HMONITOR monitor,
const std::wstring& uniqueId, const std::wstring& parentUniqueId, bool flashZones) noexcept;
const std::wstring& uniqueId, const std::wstring& parentUniqueId) noexcept;

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

@@ -10,156 +10,3 @@ namespace NonLocalizable
{
const wchar_t SegoeUiFont[] = L"Segoe ui";
}
namespace
{
void InitRGB(_Out_ RGBQUAD* quad, BYTE alpha, COLORREF color)
{
ZeroMemory(quad, sizeof(*quad));
quad->rgbReserved = alpha;
quad->rgbRed = GetRValue(color) * alpha / 255;
quad->rgbGreen = GetGValue(color) * alpha / 255;
quad->rgbBlue = GetBValue(color) * alpha / 255;
}
void FillRectARGB(wil::unique_hdc& hdc, RECT const* prcFill, BYTE alpha, COLORREF color, bool blendAlpha)
{
BITMAPINFO bi;
ZeroMemory(&bi, sizeof(bi));
bi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
bi.bmiHeader.biWidth = 1;
bi.bmiHeader.biHeight = 1;
bi.bmiHeader.biPlanes = 1;
bi.bmiHeader.biBitCount = 32;
bi.bmiHeader.biCompression = BI_RGB;
RECT fillRect;
CopyRect(&fillRect, prcFill);
RGBQUAD bitmapBits;
InitRGB(&bitmapBits, alpha, color);
StretchDIBits(
hdc.get(),
fillRect.left,
fillRect.top,
fillRect.right - fillRect.left,
fillRect.bottom - fillRect.top,
0,
0,
1,
1,
&bitmapBits,
&bi,
DIB_RGB_COLORS,
SRCCOPY);
}
BYTE OpacitySettingToAlpha(int opacity)
{
return static_cast<BYTE>(opacity * 2.55);
}
void DrawIndex(wil::unique_hdc& hdc, FancyZonesUtils::Rect rect, size_t index)
{
Gdiplus::Graphics g(hdc.get());
Gdiplus::FontFamily fontFamily(NonLocalizable::SegoeUiFont);
Gdiplus::Font font(&fontFamily, 80, Gdiplus::FontStyleRegular, Gdiplus::UnitPixel);
Gdiplus::SolidBrush solidBrush(Gdiplus::Color(255, 0, 0, 0));
std::wstring text = std::to_wstring(index);
g.SetTextRenderingHint(Gdiplus::TextRenderingHintAntiAlias);
Gdiplus::StringFormat stringFormat = new Gdiplus::StringFormat();
stringFormat.SetAlignment(Gdiplus::StringAlignmentCenter);
stringFormat.SetLineAlignment(Gdiplus::StringAlignmentCenter);
Gdiplus::RectF gdiRect(static_cast<Gdiplus::REAL>(rect.left()),
static_cast<Gdiplus::REAL>(rect.top()),
static_cast<Gdiplus::REAL>(rect.width()),
static_cast<Gdiplus::REAL>(rect.height()));
g.DrawString(text.c_str(), -1, &font, gdiRect, &stringFormat, &solidBrush);
}
void DrawZone(wil::unique_hdc& hdc, ZoneWindowDrawing::ColorSetting const& colorSetting, winrt::com_ptr<IZone> zone, bool flashMode)noexcept
{
RECT zoneRect = zone->GetZoneRect();
Gdiplus::Graphics g(hdc.get());
Gdiplus::Color fillColor(colorSetting.fillAlpha, GetRValue(colorSetting.fill), GetGValue(colorSetting.fill), GetBValue(colorSetting.fill));
Gdiplus::Color borderColor(colorSetting.borderAlpha, GetRValue(colorSetting.border), GetGValue(colorSetting.border), GetBValue(colorSetting.border));
Gdiplus::Rect rectangle(zoneRect.left, zoneRect.top, zoneRect.right - zoneRect.left - 1, zoneRect.bottom - zoneRect.top - 1);
Gdiplus::Pen pen(borderColor, static_cast<Gdiplus::REAL>(colorSetting.thickness));
g.FillRectangle(new Gdiplus::SolidBrush(fillColor), rectangle);
g.DrawRectangle(&pen, rectangle);
if (!flashMode)
{
DrawIndex(hdc, zoneRect, zone->Id() + 1);
}
}
}
namespace ZoneWindowDrawingNS
{
void DrawBackdrop(wil::unique_hdc& hdc, RECT const& clientRect) noexcept
{
FillRectARGB(hdc, &clientRect, 0, RGB(0, 0, 0), false);
}
void DrawActiveZoneSet(wil::unique_hdc& hdc,
COLORREF zoneColor,
COLORREF zoneBorderColor,
COLORREF highlightColor,
int zoneOpacity,
const IZoneSet::ZonesMap& zones,
const std::vector<size_t>& highlightZones,
bool flashMode) noexcept
{
// { fillAlpha, fill, borderAlpha, border, thickness }
ColorSetting colorViewer{ OpacitySettingToAlpha(zoneOpacity), 0, 255, RGB(40, 50, 60), -2 };
ColorSetting colorHighlight{ OpacitySettingToAlpha(zoneOpacity), 0, 255, 0, -2 };
ColorSetting const colorFlash{ OpacitySettingToAlpha(zoneOpacity), RGB(81, 92, 107), 200, RGB(104, 118, 138), -2 };
// First draw the inactive zones
for (auto iter = zones.begin(); iter != zones.end(); iter++)
{
winrt::com_ptr<IZone> zone = iter->second;
size_t zoneId = zone->Id();
if (!zone)
{
continue;
}
auto zoneIt = std::find(highlightZones.begin(), highlightZones.end(), zoneId);
if (zoneIt == highlightZones.end())
{
if (flashMode)
{
DrawZone(hdc, colorFlash, zone, flashMode);
}
else
{
colorViewer.fill = zoneColor;
colorViewer.border = zoneBorderColor;
DrawZone(hdc, colorViewer, zone, flashMode);
}
}
}
// Draw the active zones on top of the inactive zones
for (const auto& zoneId : highlightZones)
{
colorHighlight.fill = highlightColor;
colorHighlight.border = zoneBorderColor;
if (zones.contains(zoneId))
{
DrawZone(hdc, colorHighlight, zones.at(zoneId), flashMode);
}
}
}
}