Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-08-10 00:31:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

Focus nodes on mouse down instead of mouse up (testing, refers to issue #43).

Browse Source
This commit is contained in:
Martín Lucas Golini
2024-04-18 12:17:14 -03:00
parent 132db136f0
commit 803b2af136
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/eepp/scene/eventdispatcher.cpp
View File

@@ -1,4 +1,3 @@
#include <algorithm>
#include <eepp/scene/eventdispatcher.hpp>
#include <eepp/scene/scenenode.hpp>
#include <eepp/window/engine.hpp>
@@ -130,6 +129,12 @@ void EventDispatcher::update( const Time& time ) {
mOverNode->onMouseDown( mMousePosi, mInput->getPressTrigger() );
sendMsg( mOverNode, NodeMessage::MouseDown, mInput->getPressTrigger() );
}
if ( NULL != mFocusNode && mDownNode == mOverNode &&
( mInput->getPressTrigger() & ( EE_BUTTON_LMASK | EE_BUTTON_RMASK ) ) &&
( !nodeWasDragging || mMousePos == mLastMousePos ) ) {
setFocusNode( mOverNode );
}
} else if ( NULL != mOverNode && mInput->getReleaseTrigger() &&
!( mInput->getPressTrigger() & mInput->getReleaseTrigger() ) &&
!( mInput->getLastPressTrigger() & mInput->getReleaseTrigger() ) ) {
@@ -140,15 +145,17 @@ void EventDispatcher::update( const Time& time ) {
}
mOverNode->onMouseDown( mMousePosi, mInput->getReleaseTrigger() );
sendMsg( mOverNode, NodeMessage::MouseDown, mInput->getReleaseTrigger() );
if ( NULL != mFocusNode && mDownNode == mOverNode &&
( mInput->getReleaseTrigger() & ( EE_BUTTON_LMASK | EE_BUTTON_RMASK ) ) &&
( !nodeWasDragging || mMousePos == mLastMousePos ) ) {
setFocusNode( mOverNode );
}
}
if ( mInput->getReleaseTrigger() ) {
if ( NULL != mFocusNode ) {
if ( !nodeWasDragging || mMousePos == mLastMousePos ) {
if ( mDownNode == mOverNode &&
( mInput->getReleaseTrigger() & ( EE_BUTTON_LMASK | EE_BUTTON_RMASK ) ) )
setFocusNode( mOverNode );
// The focused node can change after the MouseUp ( since the node can call
// "setFocus()" on other node And the MouseClick would be received by the new
// focused node instead of the real one