From 7ab4d67e944232565e17cae4586fd7c850a13ca6 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Fri, 11 Mar 2022 23:13:05 +0000 Subject: [PATCH] Make sure line style comboboxes get a default entry. Fixes https://gitlab.com/kicad/code/kicad/issues/11083 --- eeschema/dialogs/dialog_lib_textbox_properties.cpp | 1 + eeschema/dialogs/dialog_text_properties.cpp | 1 + pcbnew/dialogs/dialog_graphic_item_properties.cpp | 2 ++ pcbnew/dialogs/dialog_textbox_properties.cpp | 2 ++ 4 files changed, 6 insertions(+) diff --git a/eeschema/dialogs/dialog_lib_textbox_properties.cpp b/eeschema/dialogs/dialog_lib_textbox_properties.cpp index 82c81ebcb5..da5d434c0a 100644 --- a/eeschema/dialogs/dialog_lib_textbox_properties.cpp +++ b/eeschema/dialogs/dialog_lib_textbox_properties.cpp @@ -52,6 +52,7 @@ DIALOG_LIB_TEXTBOX_PROPERTIES::DIALOG_LIB_TEXTBOX_PROPERTIES( SYMBOL_EDIT_FRAME* m_borderStyleCombo->Append( typeEntry.second.name, KiBitmap( typeEntry.second.bitmap ) ); m_borderStyleCombo->Append( DEFAULT_STYLE ); + m_fillColorSwatch->SetDefaultColor( COLOR4D::UNSPECIFIED ); m_textCtrl->SetEOLMode( wxSTC_EOL_LF ); diff --git a/eeschema/dialogs/dialog_text_properties.cpp b/eeschema/dialogs/dialog_text_properties.cpp index 74c300ce9d..3037257aaf 100644 --- a/eeschema/dialogs/dialog_text_properties.cpp +++ b/eeschema/dialogs/dialog_text_properties.cpp @@ -59,6 +59,7 @@ DIALOG_TEXT_PROPERTIES::DIALOG_TEXT_PROPERTIES( SCH_EDIT_FRAME* aParent, SCH_ITE m_borderStyleCombo->Append( typeEntry.second.name, KiBitmap( typeEntry.second.bitmap ) ); m_borderStyleCombo->Append( DEFAULT_STYLE ); + m_fillColorSwatch->SetDefaultColor( COLOR4D::UNSPECIFIED ); } else diff --git a/pcbnew/dialogs/dialog_graphic_item_properties.cpp b/pcbnew/dialogs/dialog_graphic_item_properties.cpp index f27adbdf47..c5fd3e6ac7 100644 --- a/pcbnew/dialogs/dialog_graphic_item_properties.cpp +++ b/pcbnew/dialogs/dialog_graphic_item_properties.cpp @@ -130,6 +130,8 @@ DIALOG_GRAPHIC_ITEM_PROPERTIES::DIALOG_GRAPHIC_ITEM_PROPERTIES( PCB_BASE_EDIT_FR for( const std::pair& typeEntry : lineTypeNames ) m_lineStyleCombo->Append( typeEntry.second.name, KiBitmap( typeEntry.second.bitmap ) ); + m_lineStyleCombo->Append( DEFAULT_STYLE ); + m_LayerSelectionCtrl->SetLayersHotkeys( false ); m_LayerSelectionCtrl->SetBoardFrame( m_parent ); m_LayerSelectionCtrl->Resync(); diff --git a/pcbnew/dialogs/dialog_textbox_properties.cpp b/pcbnew/dialogs/dialog_textbox_properties.cpp index a855d36a9b..d2bddbea18 100644 --- a/pcbnew/dialogs/dialog_textbox_properties.cpp +++ b/pcbnew/dialogs/dialog_textbox_properties.cpp @@ -133,6 +133,8 @@ DIALOG_TEXTBOX_PROPERTIES::DIALOG_TEXTBOX_PROPERTIES( PCB_BASE_EDIT_FRAME* aPare for( const std::pair& typeEntry : lineTypeNames ) m_borderStyleCombo->Append( typeEntry.second.name, KiBitmap( typeEntry.second.bitmap ) ); + m_borderStyleCombo->Append( DEFAULT_STYLE ); + SetupStandardButtons(); // wxTextCtrls fail to generate wxEVT_CHAR events when the wxTE_MULTILINE flag is set,