mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-04 18:26:39 +02:00
53f830bb38
* Migrate FancyZones data persisting from Registry to JSON file * Address PR comment: Remove redundant check * Addres PR comment: Remove unused Dpi and add CmdArgs enum * Address PR comment: Make methods const and inline * Address PR comments: Expose GenerateUniqueId function and use const ref instead of passing wstring by value * Address PR comment: Use lamdba as callback * Address PR comment: Move GenerateUniqueId to ZoneWindowUtils namespace * Address PR comment: Use regular comparison instead of std::wstring::compare * Address PR comment: Use std::wstring_view for tmp file paths * Address PR comment: Use scoped lock when accessing member data * Address PR comment: Remove typedefs to increase code readability * Address PR comment: removed nullptr checks with corresponding tests * Address PR comment: Move ZoneSet object instead of copying * Address PR comment: Make FancyZonesData instance const where possible * Remove unnecessary gutter variable during calculating zone coordinates * Remove uneeded subclass * Avoid unnecessary copying and reserve space for vector if possible * Save FancyZones data after exiting editor * App zone history (#18) * added window and zone set ids to app zone history * Rename JSON file * Remove AppZoneHistory migration * Move parsing of ZoneWindow independent temp files outside of it * Unit tests update (#19) * check device existence in map * updated ZoneSet tests * updated JsonHelpers tests * Use single zone count information * Remove uneeded tests * Remove one more test * Remove uneeded line * Address PR comments - Missing whitespace * Update zoneset data for new virtual desktops (#21) * update active zone set with actual data * Introduce Blank zone set (used to indicate that no layout applied yet). Move parsing completely outside of ZoneWindow. * Fix unit tests to match modifications in implementation * Fix applying layouts on startup (second monitor) Co-authored-by: vldmr11080 <57061786+vldmr11080@users.noreply.github.com> Co-authored-by: Seraphima <zykovas91@gmail.com>
66 lines
2.0 KiB
C++
66 lines
2.0 KiB
C++
#pragma once
|
|
|
|
#include "Zone.h"
|
|
#include "JsonHelpers.h"
|
|
|
|
|
|
interface __declspec(uuid("{E4839EB7-669D-49CF-84A9-71A2DFD851A3}")) IZoneSet : public IUnknown
|
|
{
|
|
IFACEMETHOD_(GUID, Id)() = 0;
|
|
IFACEMETHOD_(JSONHelpers::ZoneSetLayoutType, LayoutType)() = 0;
|
|
IFACEMETHOD(AddZone)(winrt::com_ptr<IZone> zone) = 0;
|
|
IFACEMETHOD_(winrt::com_ptr<IZone>, ZoneFromPoint)(POINT pt) = 0;
|
|
IFACEMETHOD_(int, GetZoneIndexFromWindow)(HWND window) = 0;
|
|
IFACEMETHOD_(std::vector<winrt::com_ptr<IZone>>, GetZones)() = 0;
|
|
IFACEMETHOD_(void, MoveWindowIntoZoneByIndex)(HWND window, HWND zoneWindow, int index) = 0;
|
|
IFACEMETHOD_(void, MoveWindowIntoZoneByDirection)(HWND window, HWND zoneWindow, DWORD vkCode) = 0;
|
|
IFACEMETHOD_(void, MoveWindowIntoZoneByPoint)(HWND window, HWND zoneWindow, POINT ptClient) = 0;
|
|
IFACEMETHOD_(bool, CalculateZones)(MONITORINFO monitorInfo, int zoneCount, int spacing) = 0;
|
|
};
|
|
|
|
#define VERSION_PERSISTEDDATA 0x0000F00D
|
|
struct ZoneSetPersistedData
|
|
{
|
|
static constexpr inline size_t MAX_ZONES = 40;
|
|
|
|
DWORD Version{VERSION_PERSISTEDDATA};
|
|
WORD LayoutId{};
|
|
DWORD ZoneCount{};
|
|
JSONHelpers::ZoneSetLayoutType Layout{};
|
|
RECT Zones[MAX_ZONES]{};
|
|
};
|
|
|
|
struct ZoneSetPersistedDataOLD
|
|
{
|
|
static constexpr inline size_t MAX_ZONES = 40;
|
|
DWORD Version{ VERSION_PERSISTEDDATA };
|
|
WORD LayoutId{};
|
|
DWORD ZoneCount{};
|
|
JSONHelpers::ZoneSetLayoutType Layout{};
|
|
DWORD PaddingInner{};
|
|
DWORD PaddingOuter{};
|
|
RECT Zones[MAX_ZONES]{};
|
|
};
|
|
|
|
|
|
struct ZoneSetConfig
|
|
{
|
|
ZoneSetConfig(
|
|
GUID id,
|
|
JSONHelpers::ZoneSetLayoutType layoutType,
|
|
HMONITOR monitor,
|
|
PCWSTR resolutionKey) noexcept :
|
|
Id(id),
|
|
LayoutType(layoutType),
|
|
Monitor(monitor),
|
|
ResolutionKey(resolutionKey)
|
|
{
|
|
}
|
|
|
|
GUID Id{};
|
|
JSONHelpers::ZoneSetLayoutType LayoutType{};
|
|
HMONITOR Monitor{};
|
|
PCWSTR ResolutionKey{};
|
|
};
|
|
|
|
winrt::com_ptr<IZoneSet> MakeZoneSet(ZoneSetConfig const& config) noexcept; |