sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Platform/Events: Replace MousebuttonDoubleClicked with clickCount in MouseButtonEvent

Browse Source
This commit is contained in:
Jérôme Leclercq
2021-11-30 12:38:57 +01:00
parent f7b69e11c2
commit e73489e958
8 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/Nazara/Platform/Enums.hpp
View File

@@ -52,7 +52,6 @@ namespace Nz
LostFocus,
KeyPressed,
KeyReleased,
MouseButtonDoubleClicked,
MouseButtonPressed,
MouseButtonReleased,
MouseEntered,

5
include/Nazara/Platform/Event.hpp
View File

@@ -34,13 +34,14 @@ namespace Nz
};
// Used by:
// -WindowEventType::MouseButtonDoubleClicked
// -WindowEventType::MouseButtonPressed
// -WindowEventType::MouseButtonReleased
struct MouseButtonEvent
{
Mouse::Button button;
int x;
int y;
unsigned int clickCount; //< 1 for simple click, 2 for double click, 3 for triple click. (always 1 on release event)
};
// Used by:
@@ -104,8 +105,8 @@ namespace Nz
KeyEvent key;
// Used by:
// -WindowEventType::MouseButtonDoubleClicked
// -WindowEventType::MouseButtonPressed
// -WindowEventType::MouseButtonReleased
MouseButtonEvent mouseButton;
// Used by:

1
include/Nazara/Platform/EventHandler.hpp
View File

@@ -38,7 +38,6 @@ namespace Nz
NazaraSignal(OnLostFocus, const EventHandler* /*eventHandler*/);
NazaraSignal(OnKeyPressed, const EventHandler* /*eventHandler*/, const WindowEvent::KeyEvent& /*event*/);
NazaraSignal(OnKeyReleased, const EventHandler* /*eventHandler*/, const WindowEvent::KeyEvent& /*event*/);
NazaraSignal(OnMouseButtonDoubleClicked, const EventHandler* /*eventHandler*/, const WindowEvent::MouseButtonEvent& /*event*/);
NazaraSignal(OnMouseButtonPressed, const EventHandler* /*eventHandler*/, const WindowEvent::MouseButtonEvent& /*event*/);
NazaraSignal(OnMouseButtonReleased, const EventHandler* /*eventHandler*/, const WindowEvent::MouseButtonEvent& /*event*/);
NazaraSignal(OnMouseEntered, const EventHandler* /*eventHandler*/);

4
include/Nazara/Platform/EventHandler.inl
View File

@@ -35,10 +35,6 @@ namespace Nz
OnLostFocus(this);
break;
case WindowEventType::MouseButtonDoubleClicked:
OnMouseButtonDoubleClicked(this, event.mouseButton);
break;
case WindowEventType::MouseButtonPressed:
OnMouseButtonPressed(this, event.mouseButton);
break;

2
include/Nazara/Widgets/BaseWidget.hpp
View File

@@ -129,8 +129,10 @@ namespace Nz
virtual void OnKeyReleased(const WindowEvent::KeyEvent& key);
virtual void OnMouseEnter();
virtual void OnMouseMoved(int x, int y, int deltaX, int deltaY);
virtual void OnMouseButtonDoublePress(int x, int y, Mouse::Button button);
virtual void OnMouseButtonPress(int x, int y, Mouse::Button button);
virtual void OnMouseButtonRelease(int x, int y, Mouse::Button button);
virtual void OnMouseButtonTriplePress(int x, int y, Mouse::Button button);
virtual void OnMouseWheelMoved(int x, int y, float delta);
virtual void OnMouseExit();
virtual void OnParentResized(const Vector2f& newSize);