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

These grids *must* have a border on OSX to render correctly.

This commit is contained in:
Jeff Young 2021-04-10 00:32:37 +01:00
parent f606069bf6
commit 252fad1cc7
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pcbnew/dialogs/panel_fp_editor_defaults_base.cpp
View File

@ -26,7 +26,7 @@ PANEL_FP_EDITOR_DEFAULTS_BASE::PANEL_FP_EDITOR_DEFAULTS_BASE( wxWindow* parent,
wxBoxSizer* defaultTextItemsSizer; wxBoxSizer* defaultTextItemsSizer;
defaultTextItemsSizer = new wxBoxSizer( wxVERTICAL ); defaultTextItemsSizer = new wxBoxSizer( wxVERTICAL );
m_textItemsGrid = new WX_GRID( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), 0 ); m_textItemsGrid = new WX_GRID( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxBORDER_SIMPLE|wxTAB_TRAVERSAL );
// Grid // Grid
m_textItemsGrid->CreateGrid( 2, 3 ); m_textItemsGrid->CreateGrid( 2, 3 );
@ -36,7 +36,7 @@ PANEL_FP_EDITOR_DEFAULTS_BASE::PANEL_FP_EDITOR_DEFAULTS_BASE( wxWindow* parent,
m_textItemsGrid->SetMargins( 0, 0 ); m_textItemsGrid->SetMargins( 0, 0 );
// Columns // Columns
m_textItemsGrid->SetColSize( 0, 233 ); m_textItemsGrid->SetColSize( 0, 255 );
m_textItemsGrid->SetColSize( 1, 60 ); m_textItemsGrid->SetColSize( 1, 60 );
m_textItemsGrid->SetColSize( 2, 120 ); m_textItemsGrid->SetColSize( 2, 120 );
m_textItemsGrid->EnableDragColMove( false ); m_textItemsGrid->EnableDragColMove( false );
@ -104,7 +104,7 @@ PANEL_FP_EDITOR_DEFAULTS_BASE::PANEL_FP_EDITOR_DEFAULTS_BASE( wxWindow* parent,
defaultPropertiesLabel->Wrap( -1 ); defaultPropertiesLabel->Wrap( -1 );
defaultPropertiesSizer->Add( defaultPropertiesLabel, 0, wxBOTTOM|wxRIGHT, 5 ); defaultPropertiesSizer->Add( defaultPropertiesLabel, 0, wxBOTTOM|wxRIGHT, 5 );
m_graphicsGrid = new WX_GRID( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_graphicsGrid = new WX_GRID( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SIMPLE|wxTAB_TRAVERSAL );
// Grid // Grid
m_graphicsGrid->CreateGrid( 6, 5 ); m_graphicsGrid->CreateGrid( 6, 5 );
@ -122,31 +122,31 @@ PANEL_FP_EDITOR_DEFAULTS_BASE::PANEL_FP_EDITOR_DEFAULTS_BASE( wxWindow* parent,
m_graphicsGrid->EnableDragColMove( false ); m_graphicsGrid->EnableDragColMove( false );
m_graphicsGrid->EnableDragColSize( true ); m_graphicsGrid->EnableDragColSize( true );
m_graphicsGrid->SetColLabelSize( 22 ); m_graphicsGrid->SetColLabelSize( 22 );
m_graphicsGrid->SetColLabelValue( 0, _( "Line Thickness") ); m_graphicsGrid->SetColLabelValue( 0, _("Line Thickness") );
m_graphicsGrid->SetColLabelValue( 1, _( "Text Width") ); m_graphicsGrid->SetColLabelValue( 1, _("Text Width") );
m_graphicsGrid->SetColLabelValue( 2, _( "Text Height") ); m_graphicsGrid->SetColLabelValue( 2, _("Text Height") );
m_graphicsGrid->SetColLabelValue( 3, _( "Text Thickness") ); m_graphicsGrid->SetColLabelValue( 3, _("Text Thickness") );
m_graphicsGrid->SetColLabelValue( 4, _( "Italic") ); m_graphicsGrid->SetColLabelValue( 4, _("Italic") );
m_graphicsGrid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); m_graphicsGrid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );
// Rows // Rows
m_graphicsGrid->EnableDragRowSize( false ); m_graphicsGrid->EnableDragRowSize( false );
m_graphicsGrid->SetRowLabelSize( 125 ); m_graphicsGrid->SetRowLabelSize( 125 );
m_graphicsGrid->SetRowLabelValue( 0, _( "Silk Layers") ); m_graphicsGrid->SetRowLabelValue( 0, _("Silk Layers") );
m_graphicsGrid->SetRowLabelValue( 1, _( "Copper Layers") ); m_graphicsGrid->SetRowLabelValue( 1, _("Copper Layers") );
m_graphicsGrid->SetRowLabelValue( 2, _( "Edge Cuts") ); m_graphicsGrid->SetRowLabelValue( 2, _("Edge Cuts") );
m_graphicsGrid->SetRowLabelValue( 3, _( "Courtyards") ); m_graphicsGrid->SetRowLabelValue( 3, _("Courtyards") );
m_graphicsGrid->SetRowLabelValue( 4, _( "Fab Layers") ); m_graphicsGrid->SetRowLabelValue( 4, _("Fab Layers") );
m_graphicsGrid->SetRowLabelValue( 5, _( "Other Layers") ); m_graphicsGrid->SetRowLabelValue( 5, _("Other Layers") );
m_graphicsGrid->SetRowLabelAlignment( wxALIGN_LEFT, wxALIGN_CENTER ); m_graphicsGrid->SetRowLabelAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
// Label Appearance // Label Appearance
// Cell Defaults // Cell Defaults
m_graphicsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP ); m_graphicsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
m_graphicsGrid->SetToolTip( _( "Net Class parameters") ); m_graphicsGrid->SetToolTip( _("Net Class parameters") );
defaultPropertiesSizer->Add( m_graphicsGrid, 1, wxBOTTOM | wxLEFT, 20 ); defaultPropertiesSizer->Add( m_graphicsGrid, 1, wxBOTTOM|wxLEFT, 20 );
bSizerMargins->Add( defaultPropertiesSizer, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); bSizerMargins->Add( defaultPropertiesSizer, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );

6
pcbnew/dialogs/panel_fp_editor_defaults_base.fbp
View File

@ -164,7 +164,7 @@
<property name="col_label_values">&quot;Text Items&quot; &quot;Show&quot; &quot;Layer&quot;</property> <property name="col_label_values">&quot;Text Items&quot; &quot;Show&quot; &quot;Layer&quot;</property>
<property name="col_label_vert_alignment">wxALIGN_CENTER</property> <property name="col_label_vert_alignment">wxALIGN_CENTER</property>
<property name="cols">3</property> <property name="cols">3</property>
<property name="column_sizes">233,60,120</property> <property name="column_sizes">255,60,120</property>
<property name="context_help"></property> <property name="context_help"></property>
<property name="context_menu">1</property> <property name="context_menu">1</property>
<property name="default_pane">0</property> <property name="default_pane">0</property>
@ -218,7 +218,7 @@
<property name="tooltip"></property> <property name="tooltip"></property>
<property name="window_extra_style"></property> <property name="window_extra_style"></property>
<property name="window_name"></property> <property name="window_name"></property>
<property name="window_style"></property> <property name="window_style">wxBORDER_SIMPLE|wxTAB_TRAVERSAL</property>
<event name="OnSize">OnGridSize</event> <event name="OnSize">OnGridSize</event>
</object> </object>
</object> </object>
@ -627,7 +627,7 @@
<property name="tooltip">Net Class parameters</property> <property name="tooltip">Net Class parameters</property>
<property name="window_extra_style"></property> <property name="window_extra_style"></property>
<property name="window_name"></property> <property name="window_name"></property>
<property name="window_style">wxTAB_TRAVERSAL</property> <property name="window_style">wxBORDER_SIMPLE|wxTAB_TRAVERSAL</property>
</object> </object>
</object> </object>
</object> </object>