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

Don't put up error dialogs after a Cancel of a dialog. 

Fixes: lp:1800711
* https://bugs.launchpad.net/kicad/+bug/1800711
This commit is contained in:
Jeff Young 2018-10-30 23:12:55 +00:00
parent f660ec7cf8
commit de971df4c6
2 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
common/widgets/unit_binder.cpp
View File

@ -37,7 +37,6 @@ UNIT_BINDER::UNIT_BINDER( EDA_DRAW_FRAME* aParent,
m_label( aLabel ),
m_value( aValue ),
m_unitLabel( aUnitLabel ),
m_showMessage( true ),
m_eval( aParent->GetUserUnits(), aUseMils )
{
// Fix the units (to the current units) for the life of the binder
@ -117,8 +116,12 @@ wxString valueDescriptionFromLabel( wxStaticText* aLabel )
void UNIT_BINDER::delayedFocusHandler( wxIdleEvent& )
{
if( !m_errorMessage.IsEmpty() )
DisplayError( m_value->GetParent(), m_errorMessage );
m_errorMessage = wxEmptyString;
m_value->SetFocus();
m_showMessage = true;
m_value->Unbind( wxEVT_IDLE, &UNIT_BINDER::delayedFocusHandler, this );
}
@ -133,20 +136,15 @@ bool UNIT_BINDER::Validate( bool setFocusOnError )
if( m_min > INT_MIN && GetValue() < m_min )
{
if( m_showMessage )
{
wxString msg = wxString::Format( _( "%s must be larger than %s or equal." ),
m_errorMessage = wxString::Format( _( "%s must be larger than %s or equal." ),
valueDescriptionFromLabel( m_label ),
StringFromValue( m_units, m_min, true ) );
DisplayError( m_value->GetParent(), msg );
}
if( setFocusOnError )
{
textEntry->SelectAll();
// Don't focus directly; we might be inside a KillFocus event handler
m_value->Bind( wxEVT_IDLE, &UNIT_BINDER::delayedFocusHandler, this );
m_showMessage = false;
}
return false;
@ -154,20 +152,15 @@ bool UNIT_BINDER::Validate( bool setFocusOnError )
if( m_max < INT_MAX && GetValue() > m_max )
{
if( m_showMessage )
{
wxString msg = wxString::Format( _( "%s must be smaller than %s." ),
m_errorMessage = wxString::Format( _( "%s must be smaller than %s." ),
valueDescriptionFromLabel( m_label ),
StringFromValue( m_units, m_max, true ) );
DisplayError( m_value->GetParent(), msg );
}
if( setFocusOnError )
{
textEntry->SelectAll();
// Don't focus directly; we might be inside a KillFocus event handler
m_value->Bind( wxEVT_IDLE, &UNIT_BINDER::delayedFocusHandler, this );
m_showMessage = false;
}
return false;

2
include/widgets/unit_binder.h
View File

@ -139,7 +139,7 @@ protected:
///> Validation support.
int m_min;
int m_max;
bool m_showMessage;
wxString m_errorMessage;
///> Evaluator
NUMERIC_EVALUATOR m_eval;