diff options
| author | Peter Kim <pk15950@gmail.com> | 2022-09-08 07:00:12 +0300 |
|---|---|---|
| committer | Peter Kim <pk15950@gmail.com> | 2022-09-08 07:00:12 +0300 |
| commit | 00dcfdf916c69672210b006e62d966f1bc2fbeb7 (patch) | |
| tree | 0cbb1b91fe26c750197126085b74224a795a103c /intern/ghost/intern/GHOST_Wintab.h | |
| parent | a39532670f6b668da7be5810fb1f844b82feeba3 (diff) | |
| parent | d5934974219135102f364f57c45a8b1465e2b8d9 (diff) | |
Merge branch 'master' into xr-devxr-dev
Diffstat (limited to 'intern/ghost/intern/GHOST_Wintab.h')
| -rw-r--r-- | intern/ghost/intern/GHOST_Wintab.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/ghost/intern/GHOST_Wintab.h b/intern/ghost/intern/GHOST_Wintab.h index 80eacf1f3fa..565aeb6ca02 100644 --- a/intern/ghost/intern/GHOST_Wintab.h +++ b/intern/ghost/intern/GHOST_Wintab.h @@ -54,7 +54,7 @@ struct GHOST_WintabInfoWin32 { int32_t x = 0; int32_t y = 0; GHOST_TEventType type = GHOST_kEventCursorMove; - GHOST_TButtonMask button = GHOST_kButtonMaskNone; + GHOST_TButton button = GHOST_kButtonMaskNone; uint64_t time = 0; GHOST_TabletData tabletData = GHOST_TABLET_DATA_NONE; }; @@ -243,7 +243,7 @@ class GHOST_Wintab { * \param physicalButton: The physical button ID to inspect. * \return The system mapped button. */ - GHOST_TButtonMask mapWintabToGhostButton(UINT cursor, WORD physicalButton); + GHOST_TButton mapWintabToGhostButton(UINT cursor, WORD physicalButton); /** * Applies common modifications to Wintab context. |