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

pcbnew: Replace CR inserted on macOS instead of LF when CTRL+Enter is pressed.

This commit is contained in:
Michal Schulz 2021-06-15 12:20:52 +00:00 committed by Jeff Young
parent a895dc15f9
commit aed0352828
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcbnew/dialogs/dialog_text_properties.cpp
View File

@ -359,7 +359,11 @@ bool DIALOG_TEXT_PROPERTIES::TransferDataFromWindow()
BOARD* board = m_Parent->GetBoard();
wxString txt = board->ConvertCrossReferencesToKIIDs( m_MultiLineText->GetValue() );
#ifdef __WINDOWS__
#ifdef __WXMAC__
// On macOS CTRL+Enter produces '\r' instead of '\n' regardless of EOL setting.
// Replace it now.
txt.Replace( "\r", "\n" );
#elif defined(__WINDOWS__)
// On Windows, a new line is coded as \r\n. We use only \n in kicad files and in
// drawing routines so strip the \r char.
txt.Replace( "\r", "" );