quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

on Enter in NonModalEntry, NonModalSpinner always do apply, since not every selected instance necessarily has shown property applied

Browse Source
This commit is contained in:
Garux 2023-02-02 17:39:40 +06:00
parent c08c2f9949
commit 544ade9bd0
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libs/gtkutil/nonmodal.h
View File

@ -36,7 +36,8 @@ class NonModalEntry : public LineEdit
public: public:
NonModalEntry( const Callback& apply, const Callback& cancel ) : LineEdit(), m_apply( apply ), m_cancel( cancel ){ NonModalEntry( const Callback& apply, const Callback& cancel ) : LineEdit(), m_apply( apply ), m_cancel( cancel ){
QObject::connect( this, &QLineEdit::textEdited, [this](){ m_editing = true; } ); QObject::connect( this, &QLineEdit::textEdited, [this](){ m_editing = true; } );
QObject::connect( this, &QLineEdit::editingFinished, [this](){ // on enter or focus out // triggered on enter & focus out; need to track editing state, as nonedited triggers this too
QObject::connect( this, &QLineEdit::editingFinished, [this](){
if( m_editing ){ if( m_editing ){
m_apply(); m_apply();
m_editing = false; m_editing = false;
@ -55,6 +56,9 @@ protected:
// defer clearFocus(); as immediately done after certain actions = cursor visible + not handling key input // defer clearFocus(); as immediately done after certain actions = cursor visible + not handling key input
QTimer::singleShot( 0, [this](){ clearFocus(); } ); QTimer::singleShot( 0, [this](){ clearFocus(); } );
} }
else if( keyEvent->key() == Qt::Key_Return || keyEvent->key() == Qt::Key_Enter ){
m_editing = true; // on Enter m_apply() is always wanted, since not every selected instance necessarily has shown property applied
}
} }
return LineEdit::event( event ); return LineEdit::event( event );
} }
@ -76,7 +80,7 @@ public:
void setCallbacks( const Callback& apply, const Callback& cancel ){ void setCallbacks( const Callback& apply, const Callback& cancel ){
m_apply = apply; m_apply = apply;
m_cancel = cancel; m_cancel = cancel;
// on enter & focus out; need to track editing, as nonedited triggers this too // triggered on enter & focus out; need to track editing state, as nonedited triggers this too
QObject::connect( this, &QAbstractSpinBox::editingFinished, [this](){ QObject::connect( this, &QAbstractSpinBox::editingFinished, [this](){
if( m_editing ){ if( m_editing ){
m_editing = false; m_editing = false;
@ -97,6 +101,9 @@ public:
clearFocus(); clearFocus();
event->accept(); event->accept();
} }
else if( keyEvent->key() == Qt::Key_Return || keyEvent->key() == Qt::Key_Enter ){
m_editing = true; // on Enter m_apply() is always wanted, since not every selected instance necessarily has shown property applied
}
} }
return DoubleSpinBox::event( event ); return DoubleSpinBox::event( event );
} }