pnx/spectre
1
0
Fork 0
Code Releases 2 Activity

include/Spectre/Input/Mouse.h rename Button1,Button2 to XButton1 and XButton2

Browse source 
Button1 and Button2 are defined by Xlib. So lets change our ones to avoid headache.
This commit is contained in:
Henrik Hautakoski 2020-12-26 17:30:32 +01:00
parent 81c7e34c58
commit c082700891
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/Spectre/Input/Mouse.h
View file

@ -16,8 +16,8 @@ public :
Left, Left,
Right, Right,
Middle, Middle,
Button1, XButton1,
Button2, XButton2,
NUM_MBUTTONS NUM_MBUTTONS
}; };

4
source/Input/Mouse.cpp
View file

@ -10,8 +10,8 @@ Mouse::~Mouse()
std::string Mouse::getButtonName(Button button) std::string Mouse::getButtonName(Button button)
{ {
switch(button) { switch(button) {
case Button::Button1 : return "Button1"; case Button::XButton1 : return "XButton1";
case Button::Button2 : return "Button2"; case Button::XButton2 : return "XButton2";
case Button::Left : return "Left"; case Button::Left : return "Left";
case Button::Right : return "Right"; case Button::Right : return "Right";
case Button::Middle : return "Middle"; case Button::Middle : return "Middle";

6
source/Platform/Win32/Win32Mouse.cpp
View file

@ -46,8 +46,8 @@ bool Win32Mouse::isButtonDown(Mouse::Button button) const
case Mouse::Left : btn = GetSystemMetrics(SM_SWAPBUTTON) ? VK_RBUTTON : VK_LBUTTON; break; case Mouse::Left : btn = GetSystemMetrics(SM_SWAPBUTTON) ? VK_RBUTTON : VK_LBUTTON; break;
case Mouse::Right : btn = GetSystemMetrics(SM_SWAPBUTTON) ? VK_LBUTTON : VK_RBUTTON; break; case Mouse::Right : btn = GetSystemMetrics(SM_SWAPBUTTON) ? VK_LBUTTON : VK_RBUTTON; break;
case Mouse::Middle : btn = VK_MBUTTON; break; case Mouse::Middle : btn = VK_MBUTTON; break;
case Mouse::Button1 : btn = VK_XBUTTON1; break; case Mouse::XButton1 : btn = VK_XBUTTON1; break;
case Mouse::Button2 : btn = VK_XBUTTON2; break; case Mouse::XButton2 : btn = VK_XBUTTON2; break;
default: btn = 0; default: btn = 0;
} }
@ -109,7 +109,7 @@ bool Win32Mouse::handleMessage(MSG msg, Event& event)
case WM_XBUTTONUP : case WM_XBUTTONUP :
case WM_XBUTTONDOWN : case WM_XBUTTONDOWN :
event.mouseButton.button = GET_XBUTTON_WPARAM(msg.wParam) == XBUTTON1 event.mouseButton.button = GET_XBUTTON_WPARAM(msg.wParam) == XBUTTON1
? Mouse::Button::Button1 : Mouse::Button::Button2; ? Mouse::Button::XButton1 : Mouse::Button::XButton2;
event.mouseButton.pressed = msg.message == WM_XBUTTONDOWN; event.mouseButton.pressed = msg.message == WM_XBUTTONDOWN;
return true; return true;