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

Added node focus reason information.

Browse Source
This commit is contained in:
Martín Lucas Golini
2024-04-20 01:04:57 -03:00
parent 395a01532b
commit a4a56d2154
28 changed files with 100 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/eepp/scene/event.hpp
+17 -2
View File
@@ -1,7 +1,8 @@
#ifndef EE_UICUIEVENT_HPP
#define EE_UICUIEVENT_HPP
#ifndef EE_SCENE_EVENT_HPP
#define EE_SCENE_EVENT_HPP
#include <eepp/config.hpp>
#include <eepp/scene/nodefocusreason.hpp>
#include <string>
namespace EE { namespace UI {
@@ -19,6 +20,7 @@ class TextInputEvent;
class WindowEvent;
class ItemValueEvent;
class RowCreatedEvent;
class FocusEvent;
class EE_API Event {
public:
@@ -141,6 +143,8 @@ class EE_API Event {
const RowCreatedEvent* asRowCreatedEvent() const;
const FocusEvent* asFocusEvent() const;
protected:
friend class Node;
Node* mNode;
@@ -200,6 +204,17 @@ class EE_API RowCreatedEvent : public Event {
UI::UITableRow* row;
};
class EE_API FocusEvent : public Event {
public:
FocusEvent( Node* node, const Uint32& EventNum, NodeFocusReason reason ) :
Event( node, EventNum ), mReason( reason ) {}
const NodeFocusReason& getReason() const { return mReason; }
protected:
NodeFocusReason mReason;
};
}} // namespace EE::Scene
#endif
include/eepp/scene/eventdispatcher.hpp
+2 -2
View File
@@ -5,7 +5,7 @@
#include <eepp/math/vector2.hpp>
#include <eepp/system/time.hpp>
#include <eepp/window/keycodes.hpp>
#include <vector>
#include <eepp/scene/nodefocusreason.hpp>
using namespace EE::System;
using namespace EE::Math;
@@ -38,7 +38,7 @@ class EE_API EventDispatcher {
Node* getFocusNode() const;
void setFocusNode( Node* node );
void setFocusNode( Node* node, NodeFocusReason reason = NodeFocusReason::Unknown );
Node* getMouseOverNode() const;
include/eepp/scene/node.hpp
+2 -2
View File
@@ -357,7 +357,7 @@ class EE_API Node : public Transformable {
bool hasFocusWithin() const;
virtual Node* setFocus();
virtual Node* setFocus( NodeFocusReason reason = NodeFocusReason::Unknown );
Node* getFirstWidget() const;
@@ -546,7 +546,7 @@ class EE_API Node : public Transformable {
virtual void onSceneChange();
virtual Uint32 onFocus();
virtual Uint32 onFocus( NodeFocusReason reason );
virtual Uint32 onFocusLoss();
include/eepp/scene/nodefocusreason.hpp
+10
View File
@@ -0,0 +1,10 @@
#ifndef EE_SCENE_NODEFOCUSREASON_HPP
#define EE_SCENE_NODEFOCUSREASON_HPP
namespace EE { namespace Scene {
enum class NodeFocusReason { Unknown, Click, Tab };
}} // namespace EE::Scene
#endif // EE_SCENE_NODEFOCUSREASON_HPP
include/eepp/ui/abstract/uiabstracttableview.hpp
+1 -1
View File
@@ -184,7 +184,7 @@ class EE_API UIAbstractTableView : public UIAbstractView {
virtual void updateColumnsWidth();
virtual Uint32 onFocus();
virtual Uint32 onFocus( NodeFocusReason reason );
virtual Uint32 onFocusLoss();
include/eepp/ui/uicodeeditor.hpp
+1 -1
View File
@@ -768,7 +768,7 @@ class EE_API UICodeEditor : public UIWidget, public TextDocument::Client {
std::pair<size_t, Float> findLongestLineInRange( const TextRange& range );
virtual Uint32 onFocus();
virtual Uint32 onFocus( NodeFocusReason reason );
virtual Uint32 onFocusLoss();
include/eepp/ui/uiconsole.hpp
+1 -1
View File
@@ -218,7 +218,7 @@ class EE_API UIConsole : public UIWidget,
virtual Uint32 onMouseUp( const Vector2i& position, const Uint32& flags );
virtual Uint32 onFocus();
virtual Uint32 onFocus( NodeFocusReason reason );
virtual Uint32 onFocusLoss();
include/eepp/ui/uinode.hpp
+2 -2
View File
@@ -235,7 +235,7 @@ class EE_API UINode : public Node {
const Uint32& getDragButton() const;
virtual Node* setFocus();
virtual Node* setFocus( NodeFocusReason reason = NodeFocusReason::Unknown );
Float
getPropertyRelativeTargetContainerLength( const CSS::PropertyRelativeTarget& relativeTarget,
@@ -382,7 +382,7 @@ class EE_API UINode : public Node {
virtual Uint32 onMouseLeave( const Vector2i& position, const Uint32& flags );
virtual Uint32 onFocus();
virtual Uint32 onFocus( NodeFocusReason reason );
virtual Uint32 onFocusLoss();
include/eepp/ui/uiscenenode.hpp
+1 -1
View File
@@ -197,7 +197,7 @@ class EE_API UISceneNode : public SceneNode {
virtual void onDrawDebugDataChange();
virtual Node* setFocus();
virtual Node* setFocus( NodeFocusReason reason = NodeFocusReason::Unknown);
virtual void onParentChange();
include/eepp/ui/uitablecell.hpp
+2 -2
View File
@@ -58,9 +58,9 @@ class EE_API UITableCell : public UIPushButton {
virtual void onModelIndexChange() {}
Uint32 onFocus() {
Uint32 onFocus( NodeFocusReason reason ) {
getUISceneNode()->getWindow()->startTextInput();
return UIPushButton::onFocus();
return UIPushButton::onFocus( reason );
}
Uint32 onFocusLoss() {
include/eepp/ui/uitextinput.hpp
+8 -3
View File
@@ -119,6 +119,10 @@ class EE_API UITextInput : public UITextView, public TextDocument::Client {
HintDisplay getHintDisplay() const;
bool getSelectAllDocOnTabNavigate() const;
void setSelectAllDocOnTabNavigate( bool selectAllDocOnTabNavigate );
protected:
TextDocument mDoc;
Float mWaitCursorTime;
@@ -134,6 +138,7 @@ class EE_API UITextInput : public UITextView, public TextDocument::Client {
bool mCreateDefaultContextMenuOptions{ true };
bool mEscapePastedText{ false };
bool mEnabledCreateContextMenu{ true };
bool mSelectAllDocOnTabNavigate{ true };
Uint32 mMaxLength{ 0 };
KeyBindings mKeyBindings;
Clock mLastDoubleClick;
@@ -164,7 +169,7 @@ class EE_API UITextInput : public UITextView, public TextDocument::Client {
virtual Uint32 onMouseLeave( const Vector2i& position, const Uint32& flags );
virtual Uint32 onFocus();
virtual Uint32 onFocus( NodeFocusReason reason );
virtual Uint32 onFocusLoss();
@@ -206,9 +211,9 @@ class EE_API UITextInput : public UITextView, public TextDocument::Client {
virtual void onDocumentMoved( TextDocument* );
void onDocumentClosed( TextDocument* ){};
void onDocumentClosed( TextDocument* ) {};
void onDocumentDirtyOnFileSystem( TextDocument* ){};
void onDocumentDirtyOnFileSystem( TextDocument* ) {};
void registerKeybindings();
include/eepp/ui/uiwidget.hpp
+1 -1
View File
@@ -349,7 +349,7 @@ class EE_API UIWidget : public UINode {
virtual void onFocusNextWidget();
virtual Uint32 onFocus();
virtual Uint32 onFocus( NodeFocusReason reason );
virtual Uint32 onFocusLoss();
projects/linux/ee.files
+1
View File
@@ -228,6 +228,7 @@
../../include/eepp/scene/keyevent.hpp
../../include/eepp/scene/mouseevent.hpp
../../include/eepp/scene/node.hpp
../../include/eepp/scene/nodefocusreason.hpp
../../include/eepp/scene/nodemessage.hpp
../../include/eepp/scene/scenemanager.hpp
../../include/eepp/scene/scenenode.hpp
src/eepp/scene/event.cpp
+4
View File
@@ -53,4 +53,8 @@ const RowCreatedEvent* Event::asRowCreatedEvent() const {
return static_cast<const RowCreatedEvent*>( this );
}
const FocusEvent* Event::asFocusEvent() const {
return static_cast<const FocusEvent*>( this );
}
}} // namespace EE::Scene
src/eepp/scene/eventdispatcher.cpp
+4 -4
View File
@@ -133,7 +133,7 @@ void EventDispatcher::update( const Time& time ) {
if ( NULL != mFocusNode && mDownNode == mOverNode &&
( mInput->getPressTrigger() & ( EE_BUTTON_LMASK | EE_BUTTON_RMASK ) ) &&
( !nodeWasDragging || mMousePos == mLastMousePos ) ) {
setFocusNode( mOverNode );
setFocusNode( mOverNode, NodeFocusReason::Click );
}
} else if ( NULL != mOverNode && mInput->getReleaseTrigger() &&
!( mInput->getPressTrigger() & mInput->getReleaseTrigger() ) &&
@@ -149,7 +149,7 @@ void EventDispatcher::update( const Time& time ) {
if ( NULL != mFocusNode && mDownNode == mOverNode &&
( mInput->getReleaseTrigger() & ( EE_BUTTON_LMASK | EE_BUTTON_RMASK ) ) &&
( !nodeWasDragging || mMousePos == mLastMousePos ) ) {
setFocusNode( mOverNode );
setFocusNode( mOverNode, NodeFocusReason::Click );
}
}
@@ -291,7 +291,7 @@ void EventDispatcher::sendMouseDown( Node* toNode, const Vector2i& pos, const Ui
toNode->onMouseDown( pos, flags );
}
void EventDispatcher::setFocusNode( Node* node ) {
void EventDispatcher::setFocusNode( Node* node, NodeFocusReason reason ) {
if ( NULL != mFocusNode && NULL != node && node != mFocusNode ) {
mWindow->getIME().stop();
@@ -302,7 +302,7 @@ void EventDispatcher::setFocusNode( Node* node ) {
mLossFocusNode->onFocusLoss();
sendMsg( mLossFocusNode, NodeMessage::FocusLoss );
mFocusNode->onFocus();
mFocusNode->onFocus( reason );
sendMsg( mFocusNode, NodeMessage::Focus );
if ( !mFocusCbs.empty() ) {
src/eepp/scene/node.cpp
+4 -3
View File
@@ -1646,10 +1646,11 @@ void Node::setRotationOrigin( float x, float y ) {
setRotationOriginPoint( OriginPoint( x, y ) );
}
Uint32 Node::onFocus() {
Uint32 Node::onFocus( NodeFocusReason reason ) {
mNodeFlags |= NODE_FLAG_HAS_FOCUS;
sendCommonEvent( Event::OnFocus );
FocusEvent event( this, Event::OnFocus, reason );
sendEvent( &event );
invalidateDraw();
@@ -1674,7 +1675,7 @@ bool Node::hasFocusWithin() const {
return hasFocus() || inParentTreeOf( getEventDispatcher()->getFocusNode() );
}
Node* Node::setFocus() {
Node* Node::setFocus( NodeFocusReason ) {
return this;
}
src/eepp/ui/abstract/uiabstracttableview.cpp
+2 -2
View File
@@ -338,10 +338,10 @@ void UIAbstractTableView::updateColumnsWidth() {
}
}
Uint32 UIAbstractTableView::onFocus() {
Uint32 UIAbstractTableView::onFocus( NodeFocusReason reason ) {
if ( !Sys::isMobile() )
getUISceneNode()->getWindow()->startTextInput();
return UIAbstractView::onFocus();
return UIAbstractView::onFocus( reason );
}
Uint32 UIAbstractTableView::onFocusLoss() {
src/eepp/ui/tools/uidocfindreplace.cpp
+2
View File
@@ -289,6 +289,8 @@ UIDocFindReplace::UIDocFindReplace( UIWidget* parent, const std::shared_ptr<Doc:
mFindInput->setTabStop();
mReplaceInput->setTabStop();
mFindInput->setSelectAllDocOnTabNavigate( false );
mReplaceInput->setSelectAllDocOnTabNavigate( false );
mFindInput->addEventListener( Event::OnTabNavigate, [this]( const Event* ) {
if ( mReplaceDisabled )
return;
src/eepp/ui/uicodeeditor.cpp
+2 -2
View File
@@ -882,7 +882,7 @@ void UICodeEditor::invalidateLongestLineWidth() {
mLongestLineWidthLastUpdate.restart();
}
Uint32 UICodeEditor::onFocus() {
Uint32 UICodeEditor::onFocus( NodeFocusReason reason ) {
if ( !mLocked ) {
mLastExecuteEventId = getUISceneNode()->getWindow()->getInput()->getEventsSentId();
resetCursor();
@@ -893,7 +893,7 @@ Uint32 UICodeEditor::onFocus() {
for ( auto& plugin : mPlugins )
plugin->onFocus( this );
mLastActivity.restart();
return UIWidget::onFocus();
return UIWidget::onFocus( reason );
}
Uint32 UICodeEditor::onFocusLoss() {
src/eepp/ui/uiconsole.cpp
+2 -2
View File
@@ -1019,8 +1019,8 @@ void UIConsole::resetCursor() {
mBlinkTimer.restart();
}
Uint32 UIConsole::onFocus() {
UIWidget::onFocus();
Uint32 UIConsole::onFocus( NodeFocusReason reason ) {
UIWidget::onFocus( reason );
resetCursor();
src/eepp/ui/uinode.cpp
+4 -4
View File
@@ -1559,9 +1559,9 @@ void UINode::onWidgetFocusLoss() {
invalidateDraw();
}
Node* UINode::setFocus() {
Node* UINode::setFocus( NodeFocusReason reason ) {
if ( NULL != getEventDispatcher() )
getEventDispatcher()->setFocusNode( this );
getEventDispatcher()->setFocusNode( this, reason );
return this;
}
@@ -1646,10 +1646,10 @@ Float UINode::lengthFromValueAsDp( const CSS::StyleSheetProperty& property,
property.getIndex() );
}
Uint32 UINode::onFocus() {
Uint32 UINode::onFocus( NodeFocusReason reason ) {
pushState( UIState::StateFocus );
return Node::onFocus();
return Node::onFocus( reason );
}
Uint32 UINode::onFocusLoss() {
src/eepp/ui/uiscenenode.cpp
+2 -2
View File
@@ -106,9 +106,9 @@ void UISceneNode::onDrawDebugDataChange() {
}
}
Node* UISceneNode::setFocus() {
Node* UISceneNode::setFocus( NodeFocusReason reason ) {
if ( NULL != getEventDispatcher() )
getEventDispatcher()->setFocusNode( mRoot );
getEventDispatcher()->setFocusNode( mRoot, reason );
return this;
}
src/eepp/ui/uitextinput.cpp
+13 -2
View File
@@ -162,8 +162,8 @@ void UITextInput::draw() {
}
}
Uint32 UITextInput::onFocus() {
UIWidget::onFocus();
Uint32 UITextInput::onFocus( NodeFocusReason reason ) {
UIWidget::onFocus( reason );
if ( mAllowEditing ) {
resetWaitCursor();
@@ -175,6 +175,9 @@ Uint32 UITextInput::onFocus() {
updateIMELocation();
}
if ( mSelectAllDocOnTabNavigate && reason == NodeFocusReason::Tab )
mDoc.selectAll();
return 1;
}
@@ -960,4 +963,12 @@ HintDisplay UITextInput::getHintDisplay() const {
return mHintDisplay;
}
bool UITextInput::getSelectAllDocOnTabNavigate() const {
return mSelectAllDocOnTabNavigate;
}
void UITextInput::setSelectAllDocOnTabNavigate( bool selectAllDocOnTabNavigate ) {
mSelectAllDocOnTabNavigate = selectAllDocOnTabNavigate;
}
}} // namespace EE::UI
src/eepp/ui/uiwidget.cpp
+4 -4
View File
@@ -1040,7 +1040,7 @@ void UIWidget::popState( const Uint32& State, bool emitEvent ) {
}
}
Uint32 UIWidget::onFocus() {
Uint32 UIWidget::onFocus( NodeFocusReason reason ) {
pushState( UIState::StateFocusWithin );
Node* parent = mParentNode;
@@ -1050,7 +1050,7 @@ Uint32 UIWidget::onFocus() {
parent = parent->getParent();
}
return UINode::onFocus();
return UINode::onFocus( reason );
}
Uint32 UIWidget::onFocusLoss() {
@@ -2218,7 +2218,7 @@ void UIWidget::onFocusPrevWidget() {
if ( !isTabStop() ) {
Node* node = getPrevTabWidget();
if ( NULL != node ) {
node->setFocus();
node->setFocus( NodeFocusReason::Tab );
sendCommonEvent( Event::OnTabNavigate );
}
} else {
@@ -2230,7 +2230,7 @@ void UIWidget::onFocusNextWidget() {
if ( !isTabStop() ) {
Node* node = getNextTabWidget();
if ( NULL != node ) {
node->setFocus();
node->setFocus( NodeFocusReason::Tab );
sendCommonEvent( Event::OnTabNavigate );
}
} else {
src/modules/eterm/include/eterm/ui/uiterminal.hpp
+1 -1
View File
@@ -155,7 +155,7 @@ class UITerminal : public UIWidget {
virtual void onPaddingChange();
virtual Uint32 onFocus();
virtual Uint32 onFocus( NodeFocusReason reason );
virtual Uint32 onFocusLoss();
src/modules/eterm/src/eterm/ui/uiterminal.cpp
+2 -2
View File
@@ -512,13 +512,13 @@ void UITerminal::onSizeChange() {
UIWidget::onSizeChange();
}
Uint32 UITerminal::onFocus() {
Uint32 UITerminal::onFocus( NodeFocusReason reason ) {
getUISceneNode()->getWindow()->startTextInput();
updateScreenPos();
mTerm->setPosition( mScreenPosi.asFloat() );
mTerm->setFocus( true );
invalidateDraw();
return UIWidget::onFocus();
return UIWidget::onFocus( reason );
}
Uint32 UITerminal::onFocusLoss() {
src/tools/ecode/docsearchcontroller.cpp
+3
View File
@@ -158,6 +158,9 @@ void DocSearchController::initSearchBar(
addClickListener( findReplaceButton, "find-and-replace" );
addClickListener( replaceAllButton, "replace-all" );
addClickListener( closeButton, "close-searchbar" );
mFindInput->setSelectAllDocOnTabNavigate( false );
mReplaceInput->setSelectAllDocOnTabNavigate( false );
mReplaceInput->addEventListener( Event::OnTabNavigate,
[this]( const Event* ) { mFindInput->setFocus(); } );
}
src/tools/ecode/globalsearchcontroller.cpp
+2
View File
@@ -248,6 +248,8 @@ void GlobalSearchController::initGlobalSearchBar(
mGlobalSearchTree->forceKeyDown( keyEvent );
}
};
mGlobalSearchInput->setSelectAllDocOnTabNavigate( false );
mGlobalSearchWhereInput->setSelectAllDocOnTabNavigate( false );
mGlobalSearchInput->on( Event::OnPressEnter, pressEnterCb );
mGlobalSearchWhereInput->on( Event::OnPressEnter, pressEnterCb );
mGlobalSearchWhereInput->on( Event::OnTabNavigate,