haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Select all when UNIT_BINDER is a token rather than a string. 

Fixes https://gitlab.com/kicad/code/kicad/issues/9757
This commit is contained in:
Jeff Young 2022-03-15 23:51:50 +00:00
parent 4225f92573
commit ce21da8cbb
2 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
common/widgets/unit_binder.cpp
View File

@ -74,6 +74,8 @@ UNIT_BINDER::UNIT_BINDER( EDA_BASE_FRAME* aParent, wxStaticText* aLabel, wxWindo
nullptr, this ); nullptr, this );
m_valueCtrl->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( UNIT_BINDER::onKillFocus ), m_valueCtrl->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( UNIT_BINDER::onKillFocus ),
nullptr, this ); nullptr, this );
m_valueCtrl->Connect( wxEVT_LEFT_UP, wxMouseEventHandler( UNIT_BINDER::onClick ), nullptr,
this );
Connect( DELAY_FOCUS, wxCommandEventHandler( UNIT_BINDER::delayedFocusHandler ), nullptr, Connect( DELAY_FOCUS, wxCommandEventHandler( UNIT_BINDER::delayedFocusHandler ), nullptr,
this ); this );
@ -130,21 +132,48 @@ void UNIT_BINDER::onUnitsChanged( wxCommandEvent& aEvent )
} }
void UNIT_BINDER::onClick( wxMouseEvent& aEvent )
{
wxTextEntry* textEntry = dynamic_cast<wxTextEntry*>( m_valueCtrl );
if( textEntry && ( textEntry->GetValue() == INDETERMINATE_ACTION
|| textEntry->GetValue() == INDETERMINATE_STATE ) )
{
// These are tokens, not strings, so do a select all
textEntry->SelectAll();
}
else
{
aEvent.Skip();
}
}
void UNIT_BINDER::onSetFocus( wxFocusEvent& aEvent ) void UNIT_BINDER::onSetFocus( wxFocusEvent& aEvent )
{ {
wxTextEntry* textEntry = dynamic_cast<wxTextEntry*>( m_valueCtrl ); wxTextEntry* textEntry = dynamic_cast<wxTextEntry*>( m_valueCtrl );
if( m_allowEval && textEntry ) if( textEntry )
{ {
wxString oldStr = m_eval.OriginalText(); if( m_allowEval )
if( oldStr.length() && oldStr != textEntry->GetValue() )
{ {
textEntry->SetValue( oldStr ); wxString oldStr = m_eval.OriginalText();
textEntry->SetSelection( m_selStart, m_selEnd );
if( oldStr.length() && oldStr != textEntry->GetValue() )
{
textEntry->SetValue( oldStr );
textEntry->SetSelection( m_selStart, m_selEnd );
}
m_needsEval = true;
} }
m_needsEval = true; if( textEntry->GetValue() == INDETERMINATE_ACTION
|| textEntry->GetValue() == INDETERMINATE_STATE )
{
// These are tokens, not strings, so do a select all
textEntry->SelectAll();
}
} }
aEvent.Skip(); aEvent.Skip();

1
include/widgets/unit_binder.h
View File

@ -195,6 +195,7 @@ public:
} }
protected: protected:
void onClick( wxMouseEvent& aEvent );
void onSetFocus( wxFocusEvent& aEvent ); void onSetFocus( wxFocusEvent& aEvent );
void onKillFocus( wxFocusEvent& aEvent ); void onKillFocus( wxFocusEvent& aEvent );