diff options
| author | bunnei <bunneidev@gmail.com> | 2021-05-30 01:35:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-30 01:35:26 -0700 |
| commit | a5ebba7e366dcd2b8818c6748296ca5fdeb45ad2 (patch) | |
| tree | b6be6dbfb6f5b4199cb5accaeba43493d80b2f7e /src/core/hle/service/hid/controllers/touchscreen.h | |
| parent | a6cfc73cb24d70b6f33e76a974bff79732629f6a (diff) | |
| parent | 5554de39332cb2647406a3159b5fefc409affb54 (diff) | |
Merge pull request #6377 from lioncash/point
common: Extract Point struct into common
Diffstat (limited to 'src/core/hle/service/hid/controllers/touchscreen.h')
| -rw-r--r-- | src/core/hle/service/hid/controllers/touchscreen.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/hle/service/hid/controllers/touchscreen.h b/src/core/hle/service/hid/controllers/touchscreen.h index 2869d0cfd..ef2becefd 100644 --- a/src/core/hle/service/hid/controllers/touchscreen.h +++ b/src/core/hle/service/hid/controllers/touchscreen.h @@ -7,6 +7,7 @@ #include "common/bit_field.h" #include "common/common_funcs.h" #include "common/common_types.h" +#include "common/point.h" #include "common/swap.h" #include "core/frontend/input.h" #include "core/hle/service/hid/controllers/controller_base.h" @@ -55,8 +56,7 @@ private: u64_le delta_time; Attributes attribute; u32_le finger; - u32_le x; - u32_le y; + Common::Point<u32_le> position; u32_le diameter_x; u32_le diameter_y; u32_le rotation_angle; @@ -81,8 +81,7 @@ private: struct Finger { u64_le last_touch{}; - float x{}; - float y{}; + Common::Point<float> position; u32_le id{}; bool pressed{}; Attributes attribute; |
