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

Don't select all of textfield on each focus. 

GTK (at least) generates focus events when the app is reactivated so
the text keeps getting re-selected.

Fixes https://gitlab.com/kicad/code/kicad/issues/6757
This commit is contained in:
Jeff Young 2021-01-09 19:26:07 +00:00
parent 53691585f2
commit 753442c60a
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
eeschema/dialogs/dialog_edit_one_field.cpp
View File

@ -46,6 +46,7 @@ DIALOG_EDIT_ONE_FIELD::DIALOG_EDIT_ONE_FIELD( SCH_BASE_FRAME* aParent, const wxS
m_posX( aParent, m_xPosLabel, m_xPosCtrl, m_xPosUnits, true ), m_posX( aParent, m_xPosLabel, m_xPosCtrl, m_xPosUnits, true ),
m_posY( aParent, m_yPosLabel, m_yPosCtrl, m_yPosUnits, true ), m_posY( aParent, m_yPosLabel, m_yPosCtrl, m_yPosUnits, true ),
m_textSize( aParent, m_textSizeLabel, m_textSizeCtrl, m_textSizeUnits, true ), m_textSize( aParent, m_textSizeLabel, m_textSizeCtrl, m_textSizeUnits, true ),
m_firstFocus( true ),
m_scintillaTricks( nullptr ) m_scintillaTricks( nullptr )
{ {
wxASSERT( aTextItem ); wxASSERT( aTextItem );
@ -166,21 +167,26 @@ void DIALOG_EDIT_ONE_FIELD::OnTextValueSelectButtonClick( wxCommandEvent& aEvent
void DIALOG_EDIT_ONE_FIELD::OnSetFocusText( wxFocusEvent& event ) void DIALOG_EDIT_ONE_FIELD::OnSetFocusText( wxFocusEvent& event )
{ {
if( m_firstFocus )
{
#ifdef __WXGTK__ #ifdef __WXGTK__
// Force an update of the text control before setting the text selection // Force an update of the text control before setting the text selection
// This is needed because GTK seems to ignore the selection on first update // This is needed because GTK seems to ignore the selection on first update
// //
// Note that we can't do this on OSX as it tends to provoke Apple's // Note that we can't do this on OSX as it tends to provoke Apple's
// "[NSAlert runModal] may not be invoked inside of transaction begin/commit pair" // "[NSAlert runModal] may not be invoked inside of transaction begin/commit pair"
// bug. See: https://bugs.launchpad.net/kicad/+bug/1837225 // bug. See: https://bugs.launchpad.net/kicad/+bug/1837225
if( m_fieldId == REFERENCE_FIELD || m_fieldId == VALUE_FIELD || m_fieldId == SHEETNAME_V ) if( m_fieldId == REFERENCE_FIELD || m_fieldId == VALUE_FIELD || m_fieldId == SHEETNAME_V )
m_TextCtrl->Update(); m_TextCtrl->Update();
#endif #endif
if( m_fieldId == REFERENCE_FIELD ) if( m_fieldId == REFERENCE_FIELD )
KIUI::SelectReferenceNumber( static_cast<wxTextEntry*>( m_TextCtrl ) ); KIUI::SelectReferenceNumber( static_cast<wxTextEntry*>( m_TextCtrl ) );
else if( m_fieldId == VALUE_FIELD || m_fieldId == SHEETNAME_V ) else if( m_fieldId == VALUE_FIELD || m_fieldId == SHEETNAME_V )
m_TextCtrl->SetSelection( -1, -1 ); m_TextCtrl->SetSelection( -1, -1 );
m_firstFocus = false;
}
event.Skip(); event.Skip();
} }

2
eeschema/dialogs/dialog_edit_one_field.h
View File

@ -102,6 +102,8 @@ protected:
int m_horizontalJustification; int m_horizontalJustification;
bool m_isVisible; bool m_isVisible;
bool m_firstFocus;
SCINTILLA_TRICKS* m_scintillaTricks; SCINTILLA_TRICKS* m_scintillaTricks;
}; };