9bb6d57515
* [FancyZones] Remove obsolete code The field `m_zoneSets` is unused, and may be removed. * [FancyZones] Remove obsolete code The field `m_windows` is unused, and may be removed. * [FancyZones] Move adjustment of `RECT` to utils.cpp By doing so, also fix a bug where a non-`WS_SIZEBOX` window (a window that should not be resized) was resized (and not properly resized) if it was zoned into more than one zone. * [FancyZones] Complete rename `ZoneWindow` -> `WorkArea` Fix leftovers from "[FancyZones] Rename ZoneWindow -> WorkArea (#12223)" * [FancyZones] Refer to the move/size action as dragging * [FancyZones] Rename `ActiveZoneSet` -> `ZoneSet` There is only one zone set used by a work area. * [FancyZones] Rename `zoneUuid` -> `layoutUuid` The variable holds the UUID of the layout (not of a zone). Co-authored-by: float4 <float4-unspecified-mail>
55 lines
1.4 KiB
C++
55 lines
1.4 KiB
C++
#include "pch.h"
|
|
|
|
|
|
#include <Shellscalingapi.h>
|
|
|
|
#include <common/display/dpi_aware.h>
|
|
#include <common/display/monitors.h>
|
|
#include "Zone.h"
|
|
#include "Settings.h"
|
|
#include "util.h"
|
|
|
|
namespace
|
|
{
|
|
bool ValidateZoneRect(const RECT& rect)
|
|
{
|
|
int width = rect.right - rect.left;
|
|
int height = rect.bottom - rect.top;
|
|
return rect.left >= ZoneConstants::MAX_NEGATIVE_SPACING &&
|
|
rect.right >= ZoneConstants::MAX_NEGATIVE_SPACING &&
|
|
rect.top >= ZoneConstants::MAX_NEGATIVE_SPACING &&
|
|
rect.bottom >= ZoneConstants::MAX_NEGATIVE_SPACING &&
|
|
width >= 0 && height >= 0;
|
|
}
|
|
}
|
|
|
|
struct Zone : winrt::implements<Zone, IZone>
|
|
{
|
|
public:
|
|
Zone(RECT zoneRect, const ZoneIndex zoneId) :
|
|
m_zoneRect(zoneRect),
|
|
m_id(zoneId)
|
|
{
|
|
}
|
|
|
|
IFACEMETHODIMP_(RECT) GetZoneRect() const noexcept { return m_zoneRect; }
|
|
IFACEMETHODIMP_(long) GetZoneArea() const noexcept { return max(m_zoneRect.bottom - m_zoneRect.top, 0) * max(m_zoneRect.right - m_zoneRect.left, 0); }
|
|
IFACEMETHODIMP_(ZoneIndex) Id() const noexcept { return m_id; }
|
|
|
|
private:
|
|
RECT m_zoneRect{};
|
|
const ZoneIndex m_id{};
|
|
};
|
|
|
|
winrt::com_ptr<IZone> MakeZone(const RECT& zoneRect, const ZoneIndex zoneId) noexcept
|
|
{
|
|
if (ValidateZoneRect(zoneRect) && zoneId >= 0)
|
|
{
|
|
return winrt::make_self<Zone>(zoneRect, zoneId);
|
|
}
|
|
else
|
|
{
|
|
return nullptr;
|
|
}
|
|
}
|