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

Bring symbol editor in line with eeschema for empty text. 

Fixes https://gitlab.com/kicad/code/kicad/issues/11799
This commit is contained in:
Jeff Young 2022-07-10 20:37:06 -06:00
parent 43b82aeffc
commit d07c6699ce
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
eeschema/dialogs/dialog_lib_text_properties.cpp
View File

@ -32,7 +32,7 @@
#include <symbol_editor/symbol_editor_settings.h> #include <symbol_editor/symbol_editor_settings.h>
#include <tools/symbol_editor_drawing_tools.h> #include <tools/symbol_editor_drawing_tools.h>
#include <scintilla_tricks.h> #include <scintilla_tricks.h>
#include "confirm.h"
DIALOG_LIB_TEXT_PROPERTIES::DIALOG_LIB_TEXT_PROPERTIES( SYMBOL_EDIT_FRAME* aParent, DIALOG_LIB_TEXT_PROPERTIES::DIALOG_LIB_TEXT_PROPERTIES( SYMBOL_EDIT_FRAME* aParent,
LIB_TEXT* aText ) : LIB_TEXT* aText ) :
@ -211,9 +211,15 @@ bool DIALOG_LIB_TEXT_PROPERTIES::TransferDataFromWindow()
if( m_graphicText ) if( m_graphicText )
{ {
if( m_StyledTextCtrl->GetValue().IsEmpty() ) if( m_StyledTextCtrl->GetValue().IsEmpty() )
m_graphicText->SetText( wxT( "[null]" ) ); {
// Other text items do not have defined extents, and so will disappear if empty
DisplayError( this, _( "Text can not be empty." ) );
return false;
}
else else
{
m_graphicText->SetText( m_StyledTextCtrl->GetValue() ); m_graphicText->SetText( m_StyledTextCtrl->GetValue() );
}
if( m_fontCtrl->HaveFontSelection() ) if( m_fontCtrl->HaveFontSelection() )
{ {