GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Merge branch 'MineBill-linux-doubleclick'

Browse Source
This commit is contained in:
Wojtek Figat
2023-10-08 22:14:09 +02:00
parent 552641c51a 0b786feb65
commit fd7ef38639
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Engine/Platform/Linux/LinuxWindow.cpp
View File

@@ -41,8 +41,10 @@ extern Dictionary<StringAnsi, X11::KeyCode> KeyNameMap;
extern Array<KeyboardKeys> KeyCodeMap; extern Array<KeyboardKeys> KeyCodeMap;
extern X11::Cursor Cursors[(int32)CursorType::MAX]; extern X11::Cursor Cursors[(int32)CursorType::MAX];
static const uint32 MouseDoubleClickTime = 500; static constexpr uint32 MouseDoubleClickTime = 500;
static constexpr uint32 MaxDoubleClickDistanceSquared = 10;
static X11::Time MouseLastButtonPressTime = 0; static X11::Time MouseLastButtonPressTime = 0;
static Float2 OldMouseClickPosition;
LinuxWindow::LinuxWindow(const CreateWindowSettings& settings) LinuxWindow::LinuxWindow(const CreateWindowSettings& settings)
: WindowBase(settings) : WindowBase(settings)
@@ -597,15 +599,19 @@ void LinuxWindow::OnButtonPress(void* event)
// Handle double-click // Handle double-click
if (buttonEvent->button == Button1) if (buttonEvent->button == Button1)
{ {
if (buttonEvent->time < (MouseLastButtonPressTime + MouseDoubleClickTime)) if (
buttonEvent->time < (MouseLastButtonPressTime + MouseDoubleClickTime) &&
Float2::DistanceSquared(mousePos, OldMouseClickPosition) < MaxDoubleClickDistanceSquared)
{ {
Input::Mouse->OnMouseDoubleClick(ClientToScreen(mousePos), mouseButton, this); Input::Mouse->OnMouseDoubleClick(ClientToScreen(mousePos), mouseButton, this);
MouseLastButtonPressTime = 0; MouseLastButtonPressTime = 0;
OldMouseClickPosition = mousePos;
return; return;
} }
else else
{ {
MouseLastButtonPressTime = buttonEvent->time; MouseLastButtonPressTime = buttonEvent->time;
OldMouseClickPosition = mousePos;
} }
} }