Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dpi unaware placement bug #2121

Merged
merged 7 commits into from
Apr 15, 2020
Merged

Dpi unaware placement bug #2121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4b22e2c
First version
PrzemyslawTusinski Apr 9, 2020
7ae5c87
First version
PrzemyslawTusinski Apr 9, 2020
25030a7
test update
PrzemyslawTusinski Apr 14, 2020
dfa4329
Updated test
PrzemyslawTusinski Apr 14, 2020
1aacb9e
Single monitor fix
PrzemyslawTusinski Apr 15, 2020
8e5f78b
minor fix
PrzemyslawTusinski Apr 15, 2020
5ca0e74
Small refactor
PrzemyslawTusinski Apr 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/common/monitors.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ std::vector<MonitorInfo> MonitorInfo::GetMonitors(bool include_toolbar)
return monitors;
}

int MonitorInfo::GetMonitorsCount()
{
return GetMonitors(true).size();
}

static BOOL CALLBACK get_primary_display_enum_cb(HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM data)
{
MONITORINFOEX monitor_info;
Expand Down
1 change: 1 addition & 0 deletions src/common/monitors.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ struct MonitorInfo : ScreenSize

// Returns monitor rects ordered from left to right
static std::vector<MonitorInfo> GetMonitors(bool include_toolbar);
static int GetMonitorsCount();
// Return primary display
static MonitorInfo GetPrimaryMonitor();
// Return monitor on which hwnd window is displayed
Expand Down
18 changes: 11 additions & 7 deletions src/modules/fancyzones/lib/Zone.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#include "Zone.h"
#include "Settings.h"

#include "common/monitors.h"

struct Zone : winrt::implements<Zone, IZone>
{
public:
Expand Down Expand Up @@ -77,14 +79,15 @@ void Zone::SizeWindowToZone(HWND window, HWND zoneWindow) noexcept

const auto level = DPIAware::GetAwarenessLevel(GetWindowDpiAwarenessContext(window));
const bool accountForUnawareness = level < DPIAware::PER_MONITOR_AWARE;

if (SUCCEEDED(DwmGetWindowAttribute(window, DWMWA_EXTENDED_FRAME_BOUNDS, &frameRect, sizeof(frameRect))))
{
const auto left_margin = frameRect.left - windowRect.left;
const auto right_margin = frameRect.right - windowRect.right;
const auto bottom_margin = frameRect.bottom - windowRect.bottom;
newWindowRect.left -= left_margin;
newWindowRect.right -= right_margin;
newWindowRect.bottom -= bottom_margin;
LONG leftMargin = frameRect.left - windowRect.left;
LONG rightMargin = frameRect.right - windowRect.right;
LONG bottomMargin = frameRect.bottom - windowRect.bottom;
newWindowRect.left -= leftMargin;
newWindowRect.right -= rightMargin;
newWindowRect.bottom -= bottomMargin;
}

// Map to screen coords
Expand All @@ -96,7 +99,8 @@ void Zone::SizeWindowToZone(HWND window, HWND zoneWindow) noexcept
const auto taskbar_left_size = std::abs(mi.rcMonitor.left - mi.rcWork.left);
const auto taskbar_top_size = std::abs(mi.rcMonitor.top - mi.rcWork.top);
OffsetRect(&newWindowRect, -taskbar_left_size, -taskbar_top_size);
if (accountForUnawareness)

if (accountForUnawareness && MonitorInfo::GetMonitorsCount() > 1)
{
newWindowRect.left = max(mi.rcMonitor.left, newWindowRect.left);
newWindowRect.right = min(mi.rcMonitor.right - taskbar_left_size, newWindowRect.right);
Expand Down