Skip to content

Code review for Mouse CoreWindow implementation #523

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

Merged
walbourn merged 1 commit into from
Jan 23, 2025
Merged

Code review for Mouse CoreWindow implementation #523

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 8 additions & 5 deletions Src/Mouse.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,13 +527,16 @@ void Mouse::SetWindow(HWND window)

#include <Windows.Devices.Input.h>

// This symbol is defined for Win32 desktop applications, but not for UWP
constexpr float USER_DEFAULT_SCREEN_DPI = 96.f;

class Mouse::Impl
{
public:
explicit Impl(Mouse* owner) noexcept(false) :
mState{},
mOwner(owner),
mDPI(96.f),
mDPI(USER_DEFAULT_SCREEN_DPI),
mMode(MODE_ABSOLUTE),
mAutoReset(true),
mLastX(0),
Expand Down Expand Up @@ -906,8 +909,8 @@ class Mouse::Impl

const float dpi = s_mouse->mDPI;

s_mouse->mState.x = static_cast<int>(pos.X * dpi / 96.f + 0.5f);
s_mouse->mState.y = static_cast<int>(pos.Y * dpi / 96.f + 0.5f);
s_mouse->mState.x = static_cast<int>(pos.X * dpi / USER_DEFAULT_SCREEN_DPI + 0.5f);
s_mouse->mState.y = static_cast<int>(pos.Y * dpi / USER_DEFAULT_SCREEN_DPI + 0.5f);
}

return S_OK;
Expand Down Expand Up @@ -970,8 +973,8 @@ class Mouse::Impl

float dpi = s_mouse->mDPI;

s_mouse->mState.x = static_cast<int>(pos.X * dpi / 96.f + 0.5f);
s_mouse->mState.y = static_cast<int>(pos.Y * dpi / 96.f + 0.5f);
s_mouse->mState.x = static_cast<int>(pos.X * dpi / USER_DEFAULT_SCREEN_DPI + 0.5f);
s_mouse->mState.y = static_cast<int>(pos.Y * dpi / USER_DEFAULT_SCREEN_DPI + 0.5f);
}
}

Expand Down
Loading