summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/input/input_win32.cpp
diff options
context:
space:
mode:
author Brad Hughes <bradhugh@outlook.com>2016-06-10 07:50:20 -0400
committer Brad Hughes <bradhugh@outlook.com>2016-06-10 22:55:00 -0400
commit6bea81d33a449f2892d1527f6acc1e6ae8057726 (patch)
tree7bfb7e55dd6b522484beed37dd16933b3afabebc /src/osd/modules/input/input_win32.cpp
parent2030b4f3e5819be4a9c73216c1e39f5edbf41b4a (diff)
Unify window_list in Windows and SDL OSD
Diffstat (limited to 'src/osd/modules/input/input_win32.cpp')
-rw-r--r--src/osd/modules/input/input_win32.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/osd/modules/input/input_win32.cpp b/src/osd/modules/input/input_win32.cpp
index d02c73c987a..780d235be58 100644
--- a/src/osd/modules/input/input_win32.cpp
+++ b/src/osd/modules/input/input_win32.cpp
@@ -152,7 +152,7 @@ public:
mouse.lY = (cursor_info.ptScreenPos.y - win32_mouse.last_point.y) * INPUT_RELATIVE_PER_PIXEL;
RECT window_pos = {0};
- GetWindowRect(win_window_list.front()->platform_window<HWND>(), &window_pos);
+ GetWindowRect(window_list.front()->platform_window<HWND>(), &window_pos);
// We reset the cursor position to the middle of the window each frame
win32_mouse.last_point.x = window_pos.left + (window_pos.right - window_pos.left) / 2;
@@ -269,13 +269,13 @@ public:
// get the cursor position and transform into final results
GetCursorPos(&mousepos);
- if (!win_window_list.empty())
+ if (!window_list.empty())
{
RECT client_rect;
// get the position relative to the window
- GetClientRect(win_window_list.front()->platform_window<HWND>(), &client_rect);
- ScreenToClient(win_window_list.front()->platform_window<HWND>(), &mousepos);
+ GetClientRect(window_list.front()->platform_window<HWND>(), &client_rect);
+ ScreenToClient(window_list.front()->platform_window<HWND>(), &mousepos);
// convert to absolute coordinates
xpos = normalize_absolute_axis(mousepos.x, client_rect.left, client_rect.right);
@@ -335,10 +335,10 @@ private:
POINT mousepos;
// get the position relative to the window
- GetClientRect(win_window_list.front()->platform_window<HWND>(), &client_rect);
+ GetClientRect(window_list.front()->platform_window<HWND>(), &client_rect);
mousepos.x = args.xpos;
mousepos.y = args.ypos;
- ScreenToClient(win_window_list.front()->platform_window<HWND>(), &mousepos);
+ ScreenToClient(window_list.front()->platform_window<HWND>(), &mousepos);
// convert to absolute coordinates
mouse.lX = normalize_absolute_axis(mousepos.x, client_rect.left, client_rect.right);