From 91b503f875dcb618a8a848e0ee5c9fa7ab6470be Mon Sep 17 00:00:00 2001 From: Wayne Stambaugh Date: Thu, 2 Nov 2023 09:37:44 -0400 Subject: [PATCH] Minor dialog layout fixes. --- common/dialogs/panel_hotkeys_editor.cpp | 9 ++++++- .../dialogs/dialog_plot_schematic_base.cpp | 6 ++--- .../dialogs/dialog_plot_schematic_base.fbp | 6 ++--- .../dialog_symbol_fields_table_base.cpp | 20 ++++++++-------- .../dialog_symbol_fields_table_base.fbp | 24 +++++++++---------- pcbnew/dialogs/dialog_export_svg_base.cpp | 4 ++-- pcbnew/dialogs/dialog_export_svg_base.fbp | 2 +- pcbnew/dialogs/dialog_export_svg_base.h | 2 +- ...log_global_edit_text_and_graphics_base.cpp | 6 ++--- ...log_global_edit_text_and_graphics_base.fbp | 10 ++++---- ...ialog_global_edit_tracks_and_vias_base.cpp | 2 +- ...ialog_global_edit_tracks_and_vias_base.fbp | 4 ++-- 12 files changed, 51 insertions(+), 44 deletions(-) diff --git a/common/dialogs/panel_hotkeys_editor.cpp b/common/dialogs/panel_hotkeys_editor.cpp index 3191774028..9236dd6fef 100644 --- a/common/dialogs/panel_hotkeys_editor.cpp +++ b/common/dialogs/panel_hotkeys_editor.cpp @@ -79,7 +79,7 @@ PANEL_HOTKEYS_EDITOR::PANEL_HOTKEYS_EDITOR( EDA_BASE_FRAME* aFrame, wxWindow* aW bMargins->Add( m_filterSearch, 0, wxEXPAND, 0 ); m_hotkeyListCtrl = new WIDGET_HOTKEY_LIST( this, m_hotkeyStore, m_readOnly ); - bMargins->Add( m_hotkeyListCtrl, 1, wxEXPAND, 0 ); + bMargins->Add( m_hotkeyListCtrl, 1, wxEXPAND | wxTOP, 5 ); if( !m_readOnly ) installButtons( bMargins ); @@ -87,13 +87,20 @@ PANEL_HOTKEYS_EDITOR::PANEL_HOTKEYS_EDITOR( EDA_BASE_FRAME* aFrame, wxWindow* aW mainSizer->Add( bMargins, 1, wxEXPAND, 0 ); #ifdef __WXGTK__ + + // It appears that this may have been fixed in wxWidgets 3.2.3. +#if wxVERSION_NUMBER < 3203 + // Work around a bug that clips the text vertically in the wxSearchCtrl on GTK m_filterSearch->SetMinSize( wxSize( m_filterSearch->GetSize().x, int( m_filterSearch->GetSize().y * 1.6 ) ) ); +#endif + #endif SetSizer( mainSizer ); Layout(); + mainSizer->Fit( this ); // Connect Events m_filterSearch->Bind( wxEVT_COMMAND_TEXT_UPDATED, &PANEL_HOTKEYS_EDITOR::OnFilterSearch, this ); diff --git a/eeschema/dialogs/dialog_plot_schematic_base.cpp b/eeschema/dialogs/dialog_plot_schematic_base.cpp index f3d9e8123b..96ea2dba15 100644 --- a/eeschema/dialogs/dialog_plot_schematic_base.cpp +++ b/eeschema/dialogs/dialog_plot_schematic_base.cpp @@ -32,7 +32,7 @@ DIALOG_PLOT_SCHEMATIC_BASE::DIALOG_PLOT_SCHEMATIC_BASE( wxWindow* parent, wxWind bSizerDir->Add( m_outputDirectoryName, 1, wxALIGN_CENTER_VERTICAL|wxLEFT, 4 ); m_browseButton = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - bSizerDir->Add( m_browseButton, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 ); + bSizerDir->Add( m_browseButton, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); bMainSizer->Add( bSizerDir, 0, wxALL|wxEXPAND, 7 ); @@ -113,7 +113,7 @@ DIALOG_PLOT_SCHEMATIC_BASE::DIALOG_PLOT_SCHEMATIC_BASE( wxWindow* parent, wxWind gbSizer1->AddGrowableCol( 1 ); - sbOptions->Add( gbSizer1, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + sbOptions->Add( gbSizer1, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); m_optionsSizer->Add( sbOptions, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); @@ -152,7 +152,7 @@ DIALOG_PLOT_SCHEMATIC_BASE::DIALOG_PLOT_SCHEMATIC_BASE( wxWindow* parent, wxWind gbSizer2->AddGrowableCol( 1 ); - m_HPGLOptionsSizer->Add( gbSizer2, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + m_HPGLOptionsSizer->Add( gbSizer2, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); bOptionsRight->Add( m_HPGLOptionsSizer, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); diff --git a/eeschema/dialogs/dialog_plot_schematic_base.fbp b/eeschema/dialogs/dialog_plot_schematic_base.fbp index 0db33e5e80..48efd5dda4 100644 --- a/eeschema/dialogs/dialog_plot_schematic_base.fbp +++ b/eeschema/dialogs/dialog_plot_schematic_base.fbp @@ -199,7 +199,7 @@ 5 - wxRIGHT|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 1 @@ -363,7 +363,7 @@ none 5 - wxEXPAND|wxRIGHT|wxLEFT + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 1 -1,10 @@ -1126,7 +1126,7 @@ protected 5 - wxEXPAND|wxRIGHT|wxLEFT + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 1 diff --git a/eeschema/dialogs/dialog_symbol_fields_table_base.cpp b/eeschema/dialogs/dialog_symbol_fields_table_base.cpp index ae1b716f9e..ab28ee8781 100644 --- a/eeschema/dialogs/dialog_symbol_fields_table_base.cpp +++ b/eeschema/dialogs/dialog_symbol_fields_table_base.cpp @@ -35,7 +35,7 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::DIALOG_SYMBOL_FIELDS_TABLE_BASE( wxWindow* pare m_fieldsCtrl = new wxDataViewListCtrl( m_leftPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); m_fieldsCtrl->SetMinSize( wxSize( -1,320 ) ); - bLeftSizer->Add( m_fieldsCtrl, 1, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 ); + bLeftSizer->Add( m_fieldsCtrl, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); wxBoxSizer* bFieldsButtons; bFieldsButtons = new wxBoxSizer( wxHORIZONTAL ); @@ -59,7 +59,7 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::DIALOG_SYMBOL_FIELDS_TABLE_BASE( wxWindow* pare bPresets = new wxBoxSizer( wxVERTICAL ); m_staticline1 = new wxStaticLine( m_leftPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bPresets->Add( m_staticline1, 0, wxEXPAND|wxBOTTOM, 5 ); + bPresets->Add( m_staticline1, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); m_bomPresetsLabel = new wxStaticText( m_leftPanel, wxID_ANY, _("View presets:"), wxDefaultPosition, wxDefaultSize, 0 ); m_bomPresetsLabel->Wrap( -1 ); @@ -68,8 +68,8 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::DIALOG_SYMBOL_FIELDS_TABLE_BASE( wxWindow* pare wxString m_cbBomPresetsChoices[] = { _("Default"), _("(unsaved)") }; int m_cbBomPresetsNChoices = sizeof( m_cbBomPresetsChoices ) / sizeof( wxString ); m_cbBomPresets = new wxChoice( m_leftPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_cbBomPresetsNChoices, m_cbBomPresetsChoices, 0 ); - m_cbBomPresets->SetSelection( 1 ); - bPresets->Add( m_cbBomPresets, 0, wxEXPAND|wxTOP|wxLEFT, 4 ); + m_cbBomPresets->SetSelection( 0 ); + bPresets->Add( m_cbBomPresets, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 4 ); bLeftSizer->Add( bPresets, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); @@ -92,7 +92,7 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::DIALOG_SYMBOL_FIELDS_TABLE_BASE( wxWindow* pare m_filter->ShowCancelButton( true ); m_filter->SetMinSize( wxSize( 140,-1 ) ); - bControls->Add( m_filter, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + bControls->Add( m_filter, 1, wxEXPAND|wxRIGHT, 5 ); m_separator1 = new BITMAP_BUTTON( m_rightPanel, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE ); m_separator1->Enable( false ); @@ -124,7 +124,7 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::DIALOG_SYMBOL_FIELDS_TABLE_BASE( wxWindow* pare bControls->Add( m_bRefresh, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - bRightSizer->Add( bControls, 0, wxEXPAND, 5 ); + bRightSizer->Add( bControls, 0, wxEXPAND|wxLEFT|wxTOP, 5 ); m_grid = new WX_GRID( m_rightPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); @@ -152,7 +152,7 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::DIALOG_SYMBOL_FIELDS_TABLE_BASE( wxWindow* pare m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER ); m_grid->SetMinSize( wxSize( 600,240 ) ); - bRightSizer->Add( m_grid, 1, wxEXPAND|wxRIGHT, 5 ); + bRightSizer->Add( m_grid, 1, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); bRightSizer->Add( 0, 4, 0, wxEXPAND, 5 ); @@ -162,7 +162,7 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::DIALOG_SYMBOL_FIELDS_TABLE_BASE( wxWindow* pare m_scopeLabel = new wxStaticText( m_rightPanel, wxID_ANY, _("Scope:"), wxDefaultPosition, wxDefaultSize, 0 ); m_scopeLabel->Wrap( -1 ); - bSizer12->Add( m_scopeLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 10 ); + bSizer12->Add( m_scopeLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 10 ); m_radioProject = new wxRadioButton( m_rightPanel, wxID_ANY, _("Entire project"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); bSizer12->Add( m_radioProject, 0, wxALIGN_CENTER_VERTICAL, 6 ); @@ -205,7 +205,7 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::DIALOG_SYMBOL_FIELDS_TABLE_BASE( wxWindow* pare m_panelEdit->SetSizer( bEditSizer ); m_panelEdit->Layout(); bEditSizer->Fit( m_panelEdit ); - m_nbPages->AddPage( m_panelEdit, _("Edit"), false ); + m_nbPages->AddPage( m_panelEdit, _("Edit"), true ); m_panelExport = new wxPanel( m_nbPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxGridBagSizer* gbExport; gbExport = new wxGridBagSizer( 0, 5 ); @@ -324,7 +324,7 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::DIALOG_SYMBOL_FIELDS_TABLE_BASE( wxWindow* pare m_panelExport->SetSizer( gbExport ); m_panelExport->Layout(); gbExport->Fit( m_panelExport ); - m_nbPages->AddPage( m_panelExport, _("Export"), true ); + m_nbPages->AddPage( m_panelExport, _("Export"), false ); bMainSizer->Add( m_nbPages, 1, wxEXPAND | wxALL, 5 ); diff --git a/eeschema/dialogs/dialog_symbol_fields_table_base.fbp b/eeschema/dialogs/dialog_symbol_fields_table_base.fbp index 21026a4670..29d0efce3e 100644 --- a/eeschema/dialogs/dialog_symbol_fields_table_base.fbp +++ b/eeschema/dialogs/dialog_symbol_fields_table_base.fbp @@ -123,7 +123,7 @@ Edit - 0 + 1 1 1 @@ -300,7 +300,7 @@ none 5 - wxEXPAND|wxTOP|wxBOTTOM|wxLEFT + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP 1 @@ -582,7 +582,7 @@ none 5 - wxEXPAND|wxBOTTOM + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -701,7 +701,7 @@ 4 - wxEXPAND|wxTOP|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 0 1 @@ -747,7 +747,7 @@ 1 Resizable - 1 + 0 1 @@ -827,7 +827,7 @@ none 5 - wxEXPAND + wxEXPAND|wxLEFT|wxTOP 0 @@ -836,7 +836,7 @@ none 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT + wxEXPAND|wxRIGHT 1 1 @@ -1328,7 +1328,7 @@ 5 - wxEXPAND|wxRIGHT + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 1 1 @@ -1440,7 +1440,7 @@ none 10 - wxALIGN_CENTER_VERTICAL|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 0 1 @@ -2033,7 +2033,7 @@ Export - 1 + 0 1 1 @@ -3185,14 +3185,14 @@ - + 3 1 1 wxEXPAND|wxTOP|wxBOTTOM 1 1 - + bPreview wxHORIZONTAL diff --git a/pcbnew/dialogs/dialog_export_svg_base.cpp b/pcbnew/dialogs/dialog_export_svg_base.cpp index 92c5595b4a..5e177d802b 100644 --- a/pcbnew/dialogs/dialog_export_svg_base.cpp +++ b/pcbnew/dialogs/dialog_export_svg_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.0-39-g3487c3cb) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -100,7 +100,7 @@ DIALOG_EXPORT_SVG_BASE::DIALOG_EXPORT_SVG_BASE( wxWindow* parent, wxWindowID id, wxArrayString m_colorThemeChoices; m_colorTheme = new wxChoice( sbOptionsSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_colorThemeChoices, 0 ); m_colorTheme->SetSelection( 0 ); - bSizerTheme->Add( m_colorTheme, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + bSizerTheme->Add( m_colorTheme, 0, wxALL|wxEXPAND, 5 ); sbOptionsSizer->Add( bSizerTheme, 0, wxEXPAND, 5 ); diff --git a/pcbnew/dialogs/dialog_export_svg_base.fbp b/pcbnew/dialogs/dialog_export_svg_base.fbp index 5deb5fe80f..44b182ffc0 100644 --- a/pcbnew/dialogs/dialog_export_svg_base.fbp +++ b/pcbnew/dialogs/dialog_export_svg_base.fbp @@ -778,7 +778,7 @@ 5 - wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND + wxALL|wxEXPAND 0 1 diff --git a/pcbnew/dialogs/dialog_export_svg_base.h b/pcbnew/dialogs/dialog_export_svg_base.h index af6fc4bb87..275af1f03f 100644 --- a/pcbnew/dialogs/dialog_export_svg_base.h +++ b/pcbnew/dialogs/dialog_export_svg_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.0-39-g3487c3cb) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp b/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp index 1a82670129..ba3b3819fc 100644 --- a/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp +++ b/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp @@ -241,7 +241,7 @@ DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE::DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_ fgSizer1->Add( m_ThicknessUnit, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - bSizer2->Add( fgSizer1, 1, wxEXPAND|wxTOP, 2 ); + bSizer2->Add( fgSizer1, 1, wxBOTTOM|wxEXPAND|wxTOP, 5 ); m_specifiedValues->SetSizer( bSizer2 ); @@ -285,13 +285,13 @@ DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE::DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_ m_grid->SetDefaultCellBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) ); m_grid->SetDefaultCellFont( wxFont( 11, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER ); - sbAction->Add( m_grid, 0, wxEXPAND|wxLEFT, 22 ); + sbAction->Add( m_grid, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); sbAction->Add( 0, 0, 0, wxEXPAND|wxBOTTOM, 5 ); - bMainSizer->Add( sbAction, 0, wxEXPAND|wxRIGHT|wxLEFT, 10 ); + bMainSizer->Add( sbAction, 0, wxEXPAND|wxLEFT|wxRIGHT, 10 ); m_sdbSizerButtons = new wxStdDialogButtonSizer(); m_sdbSizerButtonsOK = new wxButton( this, wxID_OK ); diff --git a/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.fbp b/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.fbp index 104fc60fda..aaa7fd7784 100644 --- a/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.fbp +++ b/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.fbp @@ -1136,7 +1136,7 @@ 10 - wxEXPAND|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT 0 wxID_ANY @@ -1272,8 +1272,8 @@ wxVERTICAL none - 2 - wxEXPAND|wxTOP + 5 + wxBOTTOM|wxEXPAND|wxTOP 1 5 @@ -2746,8 +2746,8 @@ - 22 - wxEXPAND|wxLEFT + 5 + wxEXPAND|wxLEFT|wxRIGHT 0 1 diff --git a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp index 32253fa56f..1ed533b8c9 100644 --- a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp +++ b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp @@ -167,7 +167,7 @@ DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE fgSizerTrackViaPopups->Add( m_viaSizesCtrl, 5, wxEXPAND|wxLEFT|wxRIGHT, 5 ); m_layerCtrl = new PCB_LAYER_BOX_SELECTOR( sbAction->GetStaticBox(), wxID_ANY, _("Combo!"), wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); - fgSizerTrackViaPopups->Add( m_layerCtrl, 0, wxRIGHT|wxLEFT, 3 ); + fgSizerTrackViaPopups->Add( m_layerCtrl, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); sbAction->Add( fgSizerTrackViaPopups, 0, wxBOTTOM|wxEXPAND|wxLEFT, 25 ); diff --git a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.fbp b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.fbp index f9030a1427..b27f6e025f 100644 --- a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.fbp +++ b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.fbp @@ -1552,8 +1552,8 @@ - 3 - wxRIGHT|wxLEFT + 5 + wxEXPAND|wxLEFT|wxRIGHT 0 1