From f83a9c0a225f2538c4c649f0af66e28064758358 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Sat, 15 Aug 2020 23:26:37 +0100 Subject: [PATCH] Clean up some OSX issues in new appearance panel. --- pcbnew/pcb_edit_frame.cpp | 6 +- pcbnew/widgets/appearance_controls.cpp | 22 ++-- pcbnew/widgets/appearance_controls_base.cpp | 58 ++++----- pcbnew/widgets/appearance_controls_base.fbp | 130 ++++++++++---------- pcbnew/widgets/appearance_controls_base.h | 6 +- 5 files changed, 116 insertions(+), 106 deletions(-) diff --git a/pcbnew/pcb_edit_frame.cpp b/pcbnew/pcb_edit_frame.cpp index 68b6dddb16..4baea14fb9 100644 --- a/pcbnew/pcb_edit_frame.cpp +++ b/pcbnew/pcb_edit_frame.cpp @@ -250,11 +250,11 @@ PCB_EDIT_FRAME::PCB_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) : m_auimgr.AddPane( m_appearancePanel, EDA_PANE().Name( "LayersManager" ).Right().Layer( 4 ) - .Caption( _( "Appearance" ) ).MinSize( 150, -1 ) - .BestSize( m_appearancePanel->GetBestSize() ) ); + .Caption( _( "Appearance" ) ).PaneBorder( false ) + .MinSize( 160, -1 ).BestSize( m_appearancePanel->GetBestSize() ) ); m_auimgr.AddPane( m_selectionFilterPanel, - EDA_PANE().Palette().Name( "SelectionFilter" ).Right().Layer( 4 ) + EDA_PANE().Name( "SelectionFilter" ).Right().Layer( 4 ) .Caption( _( "Selection Filter" ) ).PaneBorder( false ).Position( 2 ) .MinSize( 160, -1 ).BestSize( m_selectionFilterPanel->GetBestSize() ) ); diff --git a/pcbnew/widgets/appearance_controls.cpp b/pcbnew/widgets/appearance_controls.cpp index 6482a26777..6f6e09e537 100644 --- a/pcbnew/widgets/appearance_controls.cpp +++ b/pcbnew/widgets/appearance_controls.cpp @@ -974,6 +974,7 @@ void APPEARANCE_CONTROLS::rebuildObjects() COLOR_SETTINGS* theme = m_frame->GetColorSettings(); COLOR4D bgColor = theme->GetColor( LAYER_PCB_BACKGROUND ); GAL_SET visible = board->GetVisibleElements(); + bool firstSlider = true; m_objectSettings.clear(); m_objectsSizer->Clear( true ); @@ -982,6 +983,13 @@ void APPEARANCE_CONTROLS::rebuildObjects() [&]( int aRow, std::unique_ptr& aSetting ) { int layer = aSetting->id; + int topMargin = 0; + + if( aSetting->can_control_opacity && firstSlider ) + { + topMargin = wxTOP; + firstSlider = false; + } aSetting->visible = visible.Contains( ToGalLayer( layer ) ); COLOR4D color = theme->GetColor( layer ); @@ -995,7 +1003,7 @@ void APPEARANCE_CONTROLS::rebuildObjects() "right click for menu" ) ); m_objectsSizer->Add( swatch, wxGBPosition( aRow, 0 ), wxDefaultSpan, - wxALIGN_CENTER_VERTICAL | wxEXPAND | wxLEFT | wxRIGHT, 5 ); + wxALIGN_CENTER_VERTICAL | wxEXPAND | topMargin | wxLEFT | wxRIGHT, 5 ); aSetting->ctl_color = swatch; swatch->Bind( COLOR_SWATCH_CHANGED, @@ -1011,7 +1019,7 @@ void APPEARANCE_CONTROLS::rebuildObjects() btn_visible->SetToolTip( tip ); m_objectsSizer->Add( btn_visible, wxGBPosition( aRow, 1 ), wxDefaultSpan, - wxALIGN_CENTER_VERTICAL | wxRIGHT, 5 ); + wxALIGN_TOP | topMargin | wxRIGHT, 5 ); aSetting->ctl_visibility = btn_visible; btn_visible->Bind( TOGGLE_CHANGED, @@ -1029,23 +1037,23 @@ void APPEARANCE_CONTROLS::rebuildObjects() wxGBSpan labelSpan( 1, aSetting->can_control_opacity ? 1 : 2 ); m_objectsSizer->Add( label, wxGBPosition( aRow, 2 ), labelSpan, - wxALIGN_CENTER_VERTICAL | wxRIGHT, 5 ); + wxALIGN_TOP | topMargin | wxRIGHT, 5 ); if( aSetting->can_control_opacity ) { wxSlider* slider = new wxSlider( m_windowObjects, wxID_ANY, 100, 0, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL ); #ifdef __WXMAC__ - slider->SetMinSize( wxSize( 100, 32 ) ); + slider->SetMinSize( wxSize( 80, 22 ) ); #else - slider->SetMinSize( wxSize( 100, -1 ) ); + slider->SetMinSize( wxSize( 80, -1 ) ); #endif tip.Printf( _( "Set opacity of %s" ), aSetting->label.Lower() ); slider->SetToolTip( tip ); m_objectsSizer->Add( slider, wxGBPosition( aRow, 3 ), wxDefaultSpan, - wxALIGN_CENTER_VERTICAL | wxRIGHT | wxEXPAND, 5 ); + wxALIGN_BOTTOM | topMargin | wxRIGHT | wxEXPAND, 5 ); aSetting->ctl_opacity = slider; auto opacitySliderHandler = @@ -1063,7 +1071,7 @@ void APPEARANCE_CONTROLS::rebuildObjects() aSetting->ctl_text = label; }; - m_objectsSizer->SetEmptyCellSize( wxSize( m_pointSize, m_pointSize ) ); + m_objectsSizer->SetEmptyCellSize( wxSize( m_pointSize, m_pointSize * 2 / 3 ) ); int gridRow = 0; diff --git a/pcbnew/widgets/appearance_controls_base.cpp b/pcbnew/widgets/appearance_controls_base.cpp index 5e34dc85d7..e3a993adef 100644 --- a/pcbnew/widgets/appearance_controls_base.cpp +++ b/pcbnew/widgets/appearance_controls_base.cpp @@ -11,7 +11,8 @@ APPEARANCE_CONTROLS_BASE::APPEARANCE_CONTROLS_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name ) { - this->SetFont( wxFont( 9, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); + this->SetFont( wxFont( 10, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); + this->SetMinSize( wxSize( 200,360 ) ); m_sizerOuter = new wxBoxSizer( wxVERTICAL ); @@ -29,17 +30,17 @@ APPEARANCE_CONTROLS_BASE::APPEARANCE_CONTROLS_BASE( wxWindow* parent, wxWindowID m_windowLayers->SetSizer( m_layers_outer_sizer ); m_windowLayers->Layout(); m_layers_outer_sizer->Fit( m_windowLayers ); - m_panelLayersSizer->Add( m_windowLayers, 1, wxEXPAND | wxALL, 5 ); + m_panelLayersSizer->Add( m_windowLayers, 1, wxEXPAND, 5 ); - m_paneLayerDisplay = new wxCollapsiblePane( m_panelLayers, wxID_ANY, wxT("Layer Display Options"), wxDefaultPosition, wxDefaultSize, wxCP_DEFAULT_STYLE|wxCP_NO_TLW_RESIZE|wxBORDER_NONE|wxCLIP_CHILDREN|wxFULL_REPAINT_ON_RESIZE ); + m_paneLayerDisplay = new wxCollapsiblePane( m_panelLayers, wxID_ANY, wxT("Layer Display Options"), wxDefaultPosition, wxDefaultSize, wxCP_DEFAULT_STYLE|wxCP_NO_TLW_RESIZE ); m_paneLayerDisplay->Collapse( true ); wxBoxSizer* bSizer121; bSizer121 = new wxBoxSizer( wxVERTICAL ); - m_staticText13 = new wxStaticText( m_paneLayerDisplay->GetPane(), wxID_ANY, wxT("Show non-active layers as:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText13 = new wxStaticText( m_paneLayerDisplay->GetPane(), wxID_ANY, wxT("Non-active layers:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText13->Wrap( -1 ); - bSizer121->Add( m_staticText13, 0, wxALL, 5 ); + bSizer121->Add( m_staticText13, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); wxBoxSizer* bSizer19; bSizer19 = new wxBoxSizer( wxHORIZONTAL ); @@ -48,17 +49,17 @@ APPEARANCE_CONTROLS_BASE::APPEARANCE_CONTROLS_BASE( wxWindow* parent, wxWindowID m_rbHighContrastNormal->SetValue( true ); m_rbHighContrastNormal->SetToolTip( wxT("Non-active layers will be shown in full color") ); - bSizer19->Add( m_rbHighContrastNormal, 0, wxALL, 5 ); + bSizer19->Add( m_rbHighContrastNormal, 1, wxRIGHT|wxLEFT, 5 ); - m_rbHighContrastDim = new wxRadioButton( m_paneLayerDisplay->GetPane(), wxID_ANY, wxT("Dimmed"), wxDefaultPosition, wxDefaultSize, 0 ); + m_rbHighContrastDim = new wxRadioButton( m_paneLayerDisplay->GetPane(), wxID_ANY, wxT("Dim"), wxDefaultPosition, wxDefaultSize, 0 ); m_rbHighContrastDim->SetToolTip( wxT("Non-active layers will be dimmed") ); - bSizer19->Add( m_rbHighContrastDim, 0, wxALL, 5 ); + bSizer19->Add( m_rbHighContrastDim, 1, wxRIGHT|wxLEFT, 5 ); - m_rbHighContrastOff = new wxRadioButton( m_paneLayerDisplay->GetPane(), wxID_ANY, wxT("Off"), wxDefaultPosition, wxDefaultSize, 0 ); + m_rbHighContrastOff = new wxRadioButton( m_paneLayerDisplay->GetPane(), wxID_ANY, wxT("Hide"), wxDefaultPosition, wxDefaultSize, 0 ); m_rbHighContrastOff->SetToolTip( wxT("Non-active layers will be hidden") ); - bSizer19->Add( m_rbHighContrastOff, 0, wxALL, 5 ); + bSizer19->Add( m_rbHighContrastOff, 1, wxRIGHT|wxLEFT, 5 ); bSizer121->Add( bSizer19, 0, wxEXPAND, 5 ); @@ -67,19 +68,19 @@ APPEARANCE_CONTROLS_BASE::APPEARANCE_CONTROLS_BASE( wxWindow* parent, wxWindowID bSizer121->Add( m_staticline5, 0, wxEXPAND | wxALL, 5 ); m_cbFlipBoard = new wxCheckBox( m_paneLayerDisplay->GetPane(), wxID_ANY, wxT("Flip board view"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer121->Add( m_cbFlipBoard, 0, wxALL, 5 ); + bSizer121->Add( m_cbFlipBoard, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_paneLayerDisplay->GetPane()->SetSizer( bSizer121 ); m_paneLayerDisplay->GetPane()->Layout(); bSizer121->Fit( m_paneLayerDisplay->GetPane() ); - m_panelLayersSizer->Add( m_paneLayerDisplay, 0, wxBOTTOM|wxEXPAND|wxTOP, 5 ); + m_panelLayersSizer->Add( m_paneLayerDisplay, 0, wxEXPAND|wxTOP, 5 ); m_panelLayers->SetSizer( m_panelLayersSizer ); m_panelLayers->Layout(); m_panelLayersSizer->Fit( m_panelLayers ); - m_notebook->AddPage( m_panelLayers, wxT("Layers"), true ); + m_notebook->AddPage( m_panelLayers, wxT("Layers"), false ); m_panelObjects = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_panelObjects->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); @@ -97,7 +98,7 @@ APPEARANCE_CONTROLS_BASE::APPEARANCE_CONTROLS_BASE( wxWindow* parent, wxWindowID m_windowObjects->SetSizer( m_objectsSizer ); m_windowObjects->Layout(); m_objectsSizer->Fit( m_windowObjects ); - m_objectsPanelSizer->Add( m_windowObjects, 1, wxEXPAND | wxALL, 5 ); + m_objectsPanelSizer->Add( m_windowObjects, 1, wxEXPAND, 5 ); m_panelObjects->SetSizer( m_objectsPanelSizer ); @@ -197,30 +198,30 @@ APPEARANCE_CONTROLS_BASE::APPEARANCE_CONTROLS_BASE( wxWindow* parent, wxWindowID wxBoxSizer* bSizer1211; bSizer1211 = new wxBoxSizer( wxVERTICAL ); - m_staticText131 = new wxStaticText( m_paneNetDisplay->GetPane(), wxID_ANY, wxT("Show net colors on:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText131 = new wxStaticText( m_paneNetDisplay->GetPane(), wxID_ANY, wxT("Net colors:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText131->Wrap( -1 ); m_staticText131->SetToolTip( wxT("Choose when to show net and netclass colors") ); - bSizer1211->Add( m_staticText131, 0, wxALL|wxEXPAND, 5 ); + bSizer1211->Add( m_staticText131, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); wxBoxSizer* bSizer191; bSizer191 = new wxBoxSizer( wxHORIZONTAL ); - m_rbNetColorOff = new wxRadioButton( m_paneNetDisplay->GetPane(), wxID_ANY, wxT("Off"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); - m_rbNetColorOff->SetToolTip( wxT("Net and netclass colors are not shown") ); + m_rbNetColorAll = new wxRadioButton( m_paneNetDisplay->GetPane(), wxID_ANY, wxT("All"), wxDefaultPosition, wxDefaultSize, 0 ); + m_rbNetColorAll->SetToolTip( wxT("Net and netclass colors are shown on all copper items") ); - bSizer191->Add( m_rbNetColorOff, 0, wxLEFT|wxTOP, 5 ); + bSizer191->Add( m_rbNetColorAll, 1, wxRIGHT|wxLEFT, 5 ); m_rbNetColorRatsnest = new wxRadioButton( m_paneNetDisplay->GetPane(), wxID_ANY, wxT("Ratsnest"), wxDefaultPosition, wxDefaultSize, 0 ); m_rbNetColorRatsnest->SetValue( true ); m_rbNetColorRatsnest->SetToolTip( wxT("Net and netclass colors are shown on the ratsnest only") ); - bSizer191->Add( m_rbNetColorRatsnest, 0, wxLEFT|wxTOP, 5 ); + bSizer191->Add( m_rbNetColorRatsnest, 1, wxLEFT, 5 ); - m_rbNetColorAll = new wxRadioButton( m_paneNetDisplay->GetPane(), wxID_ANY, wxT("All Items"), wxDefaultPosition, wxDefaultSize, 0 ); - m_rbNetColorAll->SetToolTip( wxT("Net and netclass colors are shown on all copper items") ); + m_rbNetColorOff = new wxRadioButton( m_paneNetDisplay->GetPane(), wxID_ANY, wxT("None"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); + m_rbNetColorOff->SetToolTip( wxT("Net and netclass colors are not shown") ); - bSizer191->Add( m_rbNetColorAll, 0, wxALL, 5 ); + bSizer191->Add( m_rbNetColorOff, 1, wxLEFT, 5 ); bSizer1211->Add( bSizer191, 0, wxEXPAND, 5 ); @@ -229,15 +230,15 @@ APPEARANCE_CONTROLS_BASE::APPEARANCE_CONTROLS_BASE( wxWindow* parent, wxWindowID m_paneNetDisplay->GetPane()->SetSizer( bSizer1211 ); m_paneNetDisplay->GetPane()->Layout(); bSizer1211->Fit( m_paneNetDisplay->GetPane() ); - bSizer16->Add( m_paneNetDisplay, 0, wxEXPAND | wxALL, 5 ); + bSizer16->Add( m_paneNetDisplay, 0, wxEXPAND|wxTOP, 5 ); m_panelNetsAndClasses->SetSizer( bSizer16 ); m_panelNetsAndClasses->Layout(); bSizer16->Fit( m_panelNetsAndClasses ); - m_notebook->AddPage( m_panelNetsAndClasses, wxT("Nets"), false ); + m_notebook->AddPage( m_panelNetsAndClasses, wxT("Nets"), true ); - m_sizerOuter->Add( m_notebook, 1, wxEXPAND | wxALL, 5 ); + m_sizerOuter->Add( m_notebook, 1, wxEXPAND, 5 ); wxStaticBoxSizer* presetsSizer; presetsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxT("Layer Presets") ), wxHORIZONTAL ); @@ -246,13 +247,13 @@ APPEARANCE_CONTROLS_BASE::APPEARANCE_CONTROLS_BASE( wxWindow* parent, wxWindowID int m_cbLayerPresetsNChoices = sizeof( m_cbLayerPresetsChoices ) / sizeof( wxString ); m_cbLayerPresets = new wxChoice( presetsSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_cbLayerPresetsNChoices, m_cbLayerPresetsChoices, 0 ); m_cbLayerPresets->SetSelection( 1 ); - presetsSizer->Add( m_cbLayerPresets, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + presetsSizer->Add( m_cbLayerPresets, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); m_btnDeletePreset = new wxBitmapButton( presetsSizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); m_btnDeletePreset->Enable( false ); m_btnDeletePreset->SetToolTip( wxT("Delete this layer preset") ); - presetsSizer->Add( m_btnDeletePreset, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxTOP, 5 ); + presetsSizer->Add( m_btnDeletePreset, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_sizerOuter->Add( presetsSizer, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); @@ -260,6 +261,7 @@ APPEARANCE_CONTROLS_BASE::APPEARANCE_CONTROLS_BASE( wxWindow* parent, wxWindowID this->SetSizer( m_sizerOuter ); this->Layout(); + m_sizerOuter->Fit( this ); // Connect Events m_notebook->Connect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEventHandler( APPEARANCE_CONTROLS_BASE::OnNotebookPageChanged ), NULL, this ); diff --git a/pcbnew/widgets/appearance_controls_base.fbp b/pcbnew/widgets/appearance_controls_base.fbp index 31a9b60949..d7149a811f 100644 --- a/pcbnew/widgets/appearance_controls_base.fbp +++ b/pcbnew/widgets/appearance_controls_base.fbp @@ -36,14 +36,14 @@ 1 impl_virtual - ,90,90,9,70,0 + ,90,90,10,70,0 0 wxID_ANY - + 200,360 APPEARANCE_CONTROLS_BASE - 275,762 + -1,-1 ; ; forward_declare @@ -56,7 +56,7 @@ protected 5 - wxEXPAND | wxALL + wxEXPAND 1 1 @@ -174,9 +174,9 @@ protected 5 - wxEXPAND | wxALL + wxEXPAND 1 - + 1 1 1 @@ -229,7 +229,7 @@ wxHSCROLL|wxVSCROLL - + m_layers_outer_sizer wxVERTICAL @@ -239,7 +239,7 @@ 5 - wxBOTTOM|wxEXPAND|wxTOP + wxEXPAND|wxTOP 0 1 @@ -298,7 +298,7 @@ - wxBORDER_NONE|wxCLIP_CHILDREN|wxFULL_REPAINT_ON_RESIZE + OnLayerDisplayPaneChanged @@ -307,7 +307,7 @@ none 5 - wxALL + wxBOTTOM|wxRIGHT|wxLEFT 0 1 @@ -337,7 +337,7 @@ 0 0 wxID_ANY - Show non-active layers as: + Non-active layers: 0 0 @@ -370,15 +370,15 @@ 5 wxEXPAND 0 - + bSizer19 wxHORIZONTAL none 5 - wxALL - 0 + wxRIGHT|wxLEFT + 1 1 1 @@ -441,8 +441,8 @@ 5 - wxALL - 0 + wxRIGHT|wxLEFT + 1 1 1 @@ -471,7 +471,7 @@ 0 0 wxID_ANY - Dimmed + Dim 0 @@ -505,8 +505,8 @@ 5 - wxALL - 0 + wxRIGHT|wxLEFT + 1 1 1 @@ -535,7 +535,7 @@ 0 0 wxID_ANY - Off + Hide 0 @@ -629,7 +629,7 @@ 5 - wxALL + wxBOTTOM|wxRIGHT|wxLEFT 0 1 @@ -753,16 +753,16 @@ wxTAB_TRAVERSAL - + m_objectsPanelSizer wxVERTICAL protected - + 5 - wxEXPAND | wxALL + wxEXPAND 1 - + 1 1 1 @@ -815,7 +815,7 @@ wxHSCROLL|wxVSCROLL - + wxBOTH @@ -896,7 +896,7 @@ 5 wxEXPAND 1 - + 1 1 1 @@ -953,8 +953,8 @@ - - + + 1 1 1 @@ -1005,25 +1005,25 @@ wxTAB_TRAVERSAL - + bSizer192 wxVERTICAL none - + 5 wxEXPAND 0 - + bSizer17 wxHORIZONTAL none - + 5 wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND 1 - + 1 1 1 @@ -1218,11 +1218,11 @@ - + 5 wxEXPAND | wxALL 1 - + 1 1 1 @@ -1275,7 +1275,7 @@ wxHSCROLL|wxVSCROLL - + m_netsOuterSizer wxVERTICAL @@ -1286,8 +1286,8 @@ - - + + 1 1 1 @@ -1338,16 +1338,16 @@ wxTAB_TRAVERSAL - + bSizer21 wxVERTICAL none - + 5 wxEXPAND 0 - + bSizer20 wxHORIZONTAL @@ -1487,11 +1487,11 @@ - + 5 wxEXPAND | wxALL 1 - + 1 1 1 @@ -1544,7 +1544,7 @@ wxHSCROLL|wxVSCROLL - + m_netclassOuterSizer wxVERTICAL @@ -1559,9 +1559,9 @@ 5 - wxEXPAND | wxALL + wxEXPAND|wxTOP 0 - + 1 1 1 @@ -1627,7 +1627,7 @@ none 5 - wxALL|wxEXPAND + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 1 @@ -1657,7 +1657,7 @@ 0 0 wxID_ANY - Show net colors on: + Net colors: 0 0 @@ -1697,8 +1697,8 @@ none 5 - wxLEFT|wxTOP - 0 + wxRIGHT|wxLEFT + 1 1 1 @@ -1727,7 +1727,7 @@ 0 0 wxID_ANY - Off + All 0 @@ -1735,7 +1735,7 @@ 0 1 - m_rbNetColorOff + m_rbNetColorAll 1 @@ -1745,10 +1745,10 @@ Resizable 1 - wxRB_GROUP + ; ; forward_declare 0 - Net and netclass colors are not shown + Net and netclass colors are shown on all copper items wxFILTER_NONE wxDefaultValidator @@ -1761,8 +1761,8 @@ 5 - wxLEFT|wxTOP - 0 + wxLEFT + 1 1 1 @@ -1825,8 +1825,8 @@ 5 - wxALL - 0 + wxLEFT + 1 1 1 @@ -1855,7 +1855,7 @@ 0 0 wxID_ANY - All Items + None 0 @@ -1863,7 +1863,7 @@ 0 1 - m_rbNetColorAll + m_rbNetColorOff 1 @@ -1873,10 +1873,10 @@ Resizable 1 - + wxRB_GROUP ; ; forward_declare 0 - Net and netclass colors are shown on all copper items + Net and netclass colors are not shown wxFILTER_NONE wxDefaultValidator @@ -1911,7 +1911,7 @@ none 5 - wxALIGN_CENTER_VERTICAL|wxALL + wxALIGN_CENTER_VERTICAL|wxRIGHT 1 1 @@ -1976,7 +1976,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxTOP + wxALIGN_CENTER_VERTICAL 0 1 diff --git a/pcbnew/widgets/appearance_controls_base.h b/pcbnew/widgets/appearance_controls_base.h index 5ab6cae588..4cff818334 100644 --- a/pcbnew/widgets/appearance_controls_base.h +++ b/pcbnew/widgets/appearance_controls_base.h @@ -77,9 +77,9 @@ class APPEARANCE_CONTROLS_BASE : public wxPanel wxBoxSizer* m_netclassOuterSizer; wxCollapsiblePane* m_paneNetDisplay; wxStaticText* m_staticText131; - wxRadioButton* m_rbNetColorOff; - wxRadioButton* m_rbNetColorRatsnest; wxRadioButton* m_rbNetColorAll; + wxRadioButton* m_rbNetColorRatsnest; + wxRadioButton* m_rbNetColorOff; wxChoice* m_cbLayerPresets; wxBitmapButton* m_btnDeletePreset; @@ -94,7 +94,7 @@ class APPEARANCE_CONTROLS_BASE : public wxPanel public: - APPEARANCE_CONTROLS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 275,762 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); + APPEARANCE_CONTROLS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); ~APPEARANCE_CONTROLS_BASE(); void m_netsTabSplitterOnIdle( wxIdleEvent& )