From 1fc5ecae6e243082c93601954d1b84be2946e96c Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Sat, 1 Oct 2022 23:53:15 +0100 Subject: [PATCH] Minor dialog layout improvements. Fixes https://gitlab.com/kicad/code/kicad/issues/12497 --- .../dialogs/panel_3D_display_options_base.cpp | 8 +- .../dialogs/panel_3D_display_options_base.fbp | 15 +- .../dialogs/panel_3D_display_options_base.h | 3 +- common/dialogs/panel_common_settings_base.cpp | 35 +- common/dialogs/panel_common_settings_base.fbp | 421 +++++++++--------- pcbnew/dialogs/dialog_board_setup.cpp | 2 +- .../dialogs/panel_setup_constraints_base.cpp | 22 +- .../dialogs/panel_setup_constraints_base.fbp | 22 +- 8 files changed, 262 insertions(+), 266 deletions(-) diff --git a/3d-viewer/dialogs/panel_3D_display_options_base.cpp b/3d-viewer/dialogs/panel_3D_display_options_base.cpp index d21c5d6298..647609d399 100644 --- a/3d-viewer/dialogs/panel_3D_display_options_base.cpp +++ b/3d-viewer/dialogs/panel_3D_display_options_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -65,7 +65,7 @@ PANEL_3D_DISPLAY_OPTIONS_BASE::PANEL_3D_DISPLAY_OPTIONS_BASE( wxWindow* parent, bSizeLeft->Add( sbUserLayers, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - bSizer7->Add( bSizeLeft, 0, wxEXPAND|wxTOP|wxLEFT, 10 ); + bSizer7->Add( bSizeLeft, 1, wxEXPAND|wxRIGHT, 10 ); wxBoxSizer* bSizerRight; bSizerRight = new wxBoxSizer( wxVERTICAL ); @@ -153,10 +153,10 @@ PANEL_3D_DISPLAY_OPTIONS_BASE::PANEL_3D_DISPLAY_OPTIONS_BASE( wxWindow* parent, bSizerRight->Add( sbCameraOptions, 0, wxEXPAND|wxTOP|wxLEFT, 5 ); - bSizer7->Add( bSizerRight, 0, wxEXPAND|wxRIGHT|wxTOP, 10 ); + bSizer7->Add( bSizerRight, 1, wxEXPAND|wxRIGHT, 10 ); - bSizerMain->Add( bSizer7, 0, 0, 5 ); + bSizerMain->Add( bSizer7, 1, 0, 5 ); this->SetSizer( bSizerMain ); diff --git a/3d-viewer/dialogs/panel_3D_display_options_base.fbp b/3d-viewer/dialogs/panel_3D_display_options_base.fbp index 7d9aa3185b..cfd62b9b7d 100644 --- a/3d-viewer/dialogs/panel_3D_display_options_base.fbp +++ b/3d-viewer/dialogs/panel_3D_display_options_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,6 +14,7 @@ panel_3D_display_options_base 1000 none + 1 panel_3D_display_options_base @@ -25,6 +26,7 @@ 1 1 UI + 0 0 0 @@ -46,6 +48,7 @@ -1,-1 RESETTABLE_PANEL; widgets/resettable_panel.h; forward_declare + 0 wxTAB_TRAVERSAL @@ -57,7 +60,7 @@ 5 - 0 + 1 bSizer7 @@ -65,8 +68,8 @@ none 10 - wxEXPAND|wxTOP|wxLEFT - 0 + wxEXPAND|wxRIGHT + 1 bSizeLeft @@ -634,8 +637,8 @@ 10 - wxEXPAND|wxRIGHT|wxTOP - 0 + wxEXPAND|wxRIGHT + 1 bSizerRight diff --git a/3d-viewer/dialogs/panel_3D_display_options_base.h b/3d-viewer/dialogs/panel_3D_display_options_base.h index a2108e3b18..fd9bd4feea 100644 --- a/3d-viewer/dialogs/panel_3D_display_options_base.h +++ b/3d-viewer/dialogs/panel_3D_display_options_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -67,6 +67,7 @@ class PANEL_3D_DISPLAY_OPTIONS_BASE : public RESETTABLE_PANEL public: PANEL_3D_DISPLAY_OPTIONS_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 ); + ~PANEL_3D_DISPLAY_OPTIONS_BASE(); }; diff --git a/common/dialogs/panel_common_settings_base.cpp b/common/dialogs/panel_common_settings_base.cpp index 5dd9c377a9..b9be52b892 100644 --- a/common/dialogs/panel_common_settings_base.cpp +++ b/common/dialogs/panel_common_settings_base.cpp @@ -111,63 +111,60 @@ PANEL_COMMON_SETTINGS_BASE::PANEL_COMMON_SETTINGS_BASE( wxWindow* parent, wxWind m_sbUserInterface = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("User Interface") ), wxVERTICAL ); - m_gbUserInterface = new wxGridBagSizer( 10, 0 ); - m_gbUserInterface->SetFlexibleDirection( wxVERTICAL ); + m_gbUserInterface = new wxGridBagSizer( 3, 0 ); + m_gbUserInterface->SetFlexibleDirection( wxHORIZONTAL ); m_gbUserInterface->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - wxBoxSizer* bSizer81; - bSizer81 = new wxBoxSizer( wxVERTICAL ); - m_checkBoxIconsInMenus = new wxCheckBox( m_sbUserInterface->GetStaticBox(), wxID_ANY, _("Show icons in menus"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer81->Add( m_checkBoxIconsInMenus, 0, wxALIGN_LEFT|wxBOTTOM, 5 ); + m_gbUserInterface->Add( m_checkBoxIconsInMenus, wxGBPosition( 0, 0 ), wxGBSpan( 1, 4 ), 0, 5 ); m_showScrollbars = new wxCheckBox( m_sbUserInterface->GetStaticBox(), wxID_ANY, _("Show scrollbars in editors"), wxDefaultPosition, wxDefaultSize, 0 ); m_showScrollbars->SetValue(true); m_showScrollbars->SetToolTip( _("This change takes effect when relaunching the editor.") ); - bSizer81->Add( m_showScrollbars, 0, wxALIGN_LEFT|wxBOTTOM, 5 ); + m_gbUserInterface->Add( m_showScrollbars, wxGBPosition( 1, 0 ), wxGBSpan( 1, 4 ), 0, 5 ); m_focusFollowSchPcb = new wxCheckBox( m_sbUserInterface->GetStaticBox(), wxID_ANY, _("Focus follows mouse between schematic and PCB editors"), wxDefaultPosition, wxDefaultSize, 0 ); m_focusFollowSchPcb->SetToolTip( _("If the mouse cursor is moved over the canvas of a schematic or PCB editor window, that window is raised.") ); - bSizer81->Add( m_focusFollowSchPcb, 0, wxALIGN_LEFT|wxBOTTOM, 5 ); - - - m_gbUserInterface->Add( bSizer81, wxGBPosition( 0, 0 ), wxGBSpan( 2, 4 ), wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxEXPAND, 5 ); + m_gbUserInterface->Add( m_focusFollowSchPcb, wxGBPosition( 2, 0 ), wxGBSpan( 1, 5 ), 0, 5 ); m_stIconTheme = new wxStaticText( m_sbUserInterface->GetStaticBox(), wxID_ANY, _("Icon theme:"), wxDefaultPosition, wxDefaultSize, 0 ); m_stIconTheme->Wrap( -1 ); - m_gbUserInterface->Add( m_stIconTheme, wxGBPosition( 2, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); + m_gbUserInterface->Add( m_stIconTheme, wxGBPosition( 4, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); m_rbIconThemeLight = new wxRadioButton( m_sbUserInterface->GetStaticBox(), wxID_ANY, _("Light"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); m_rbIconThemeLight->SetToolTip( _("Use icons designed for light window backgrounds") ); + m_rbIconThemeLight->SetMinSize( wxSize( 108,-1 ) ); - m_gbUserInterface->Add( m_rbIconThemeLight, wxGBPosition( 2, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); + m_gbUserInterface->Add( m_rbIconThemeLight, wxGBPosition( 4, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); m_rbIconThemeDark = new wxRadioButton( m_sbUserInterface->GetStaticBox(), wxID_ANY, _("Dark"), wxDefaultPosition, wxDefaultSize, 0 ); m_rbIconThemeDark->SetToolTip( _("Use icons designed for dark window backgrounds") ); + m_rbIconThemeDark->SetMinSize( wxSize( 108,-1 ) ); - m_gbUserInterface->Add( m_rbIconThemeDark, wxGBPosition( 2, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); + m_gbUserInterface->Add( m_rbIconThemeDark, wxGBPosition( 4, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); m_rbIconThemeAuto = new wxRadioButton( m_sbUserInterface->GetStaticBox(), wxID_ANY, _("Automatic"), wxDefaultPosition, wxDefaultSize, 0 ); m_rbIconThemeAuto->SetValue( true ); m_rbIconThemeAuto->SetToolTip( _("Automatically choose light or dark icons based on the system color theme") ); + m_rbIconThemeAuto->SetMinSize( wxSize( 92,-1 ) ); - m_gbUserInterface->Add( m_rbIconThemeAuto, wxGBPosition( 2, 3 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT, 15 ); + m_gbUserInterface->Add( m_rbIconThemeAuto, wxGBPosition( 4, 3 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT, 15 ); m_staticTextCanvasScale = new wxStaticText( m_sbUserInterface->GetStaticBox(), wxID_ANY, _("Canvas scale:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextCanvasScale->Wrap( -1 ); - m_gbUserInterface->Add( m_staticTextCanvasScale, wxGBPosition( 4, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); + m_gbUserInterface->Add( m_staticTextCanvasScale, wxGBPosition( 6, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); m_canvasScaleCtrl = new wxSpinCtrlDouble( m_sbUserInterface->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 100, 0, 1 ); m_canvasScaleCtrl->SetDigits( 0 ); - m_gbUserInterface->Add( m_canvasScaleCtrl, wxGBPosition( 4, 1 ), wxGBSpan( 1, 2 ), wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + m_gbUserInterface->Add( m_canvasScaleCtrl, wxGBPosition( 6, 1 ), wxGBSpan( 1, 2 ), wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); m_canvasScaleAuto = new wxCheckBox( m_sbUserInterface->GetStaticBox(), wxID_ANY, _("Automatic"), wxDefaultPosition, wxDefaultSize, 0 ); - m_gbUserInterface->Add( m_canvasScaleAuto, wxGBPosition( 4, 3 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT, 15 ); + m_gbUserInterface->Add( m_canvasScaleAuto, wxGBPosition( 6, 3 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT, 15 ); - m_sbUserInterface->Add( m_gbUserInterface, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + m_sbUserInterface->Add( m_gbUserInterface, 0, wxEXPAND|wxBOTTOM|wxLEFT, 5 ); m_sbUserInterface->Add( 0, 10, 0, wxEXPAND, 5 ); diff --git a/common/dialogs/panel_common_settings_base.fbp b/common/dialogs/panel_common_settings_base.fbp index c64d33e686..a33b127952 100644 --- a/common/dialogs/panel_common_settings_base.fbp +++ b/common/dialogs/panel_common_settings_base.fbp @@ -897,11 +897,11 @@ protected 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND + wxEXPAND|wxBOTTOM|wxLEFT 0 -1,-1 - wxVERTICAL + wxHORIZONTAL 0 @@ -909,211 +909,206 @@ m_gbUserInterface wxFLEX_GROWMODE_SPECIFIED protected - 10 + 3 5 4 0 - wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxEXPAND + 0 - 2 - + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Show icons in menus + + 0 + + + 0 - bSizer81 - wxVERTICAL - none - - 5 - wxALIGN_LEFT|wxBOTTOM - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Show icons in menus - - 0 - - - 0 - - 1 - m_checkBoxIconsInMenus - 1 - - - protected - 1 - - Resizable - 1 - - - ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxALIGN_LEFT|wxBOTTOM - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Show scrollbars in editors - - 0 - - - 0 - - 1 - m_showScrollbars - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - This change takes effect when relaunching the editor. - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxALIGN_LEFT|wxBOTTOM - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Focus follows mouse between schematic and PCB editors - - 0 - - - 0 - - 1 - m_focusFollowSchPcb - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - If the mouse cursor is moved over the canvas of a schematic or PCB editor window, that window is raised. - - wxFILTER_NONE - wxDefaultValidator - - - - - - + 1 + m_checkBoxIconsInMenus + 1 + + + protected + 1 + + Resizable + 1 + + + ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + 4 + 0 + + 1 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Show scrollbars in editors + + 0 + + + 0 + + 1 + m_showScrollbars + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + This change takes effect when relaunching the editor. + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + 5 + 0 + + 2 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Focus follows mouse between schematic and PCB editors + + 0 + + + 0 + + 1 + m_focusFollowSchPcb + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + If the mouse cursor is moved over the canvas of a schematic or PCB editor window, that window is raised. + + wxFILTER_NONE + wxDefaultValidator + + + + @@ -1121,7 +1116,7 @@ 1 0 wxALIGN_CENTER_VERTICAL - 2 + 4 1 1 @@ -1185,7 +1180,7 @@ 1 1 wxALIGN_CENTER_VERTICAL - 2 + 4 1 1 @@ -1221,7 +1216,7 @@ 0 - -1,-1 + 108,-1 1 m_rbIconThemeLight 1 @@ -1252,7 +1247,7 @@ 1 2 wxALIGN_CENTER_VERTICAL - 2 + 4 1 1 @@ -1288,7 +1283,7 @@ 0 - -1,-1 + 108,-1 1 m_rbIconThemeDark 1 @@ -1319,7 +1314,7 @@ 1 3 wxALIGN_CENTER_VERTICAL|wxLEFT - 2 + 4 1 1 @@ -1355,7 +1350,7 @@ 0 - + 92,-1 1 m_rbIconThemeAuto 1 @@ -1385,8 +1380,8 @@ 5 1 0 - wxALIGN_CENTER_VERTICAL - 4 + wxALIGN_CENTER_VERTICAL|wxRIGHT + 6 1 1 @@ -1450,7 +1445,7 @@ 2 1 wxALIGN_CENTER_VERTICAL|wxEXPAND - 4 + 6 1 1 @@ -1516,8 +1511,8 @@ 15 1 3 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT - 4 + wxALIGN_CENTER_VERTICAL|wxLEFT + 6 1 1 diff --git a/pcbnew/dialogs/dialog_board_setup.cpp b/pcbnew/dialogs/dialog_board_setup.cpp index 6e171506ee..bc308b1d2d 100644 --- a/pcbnew/dialogs/dialog_board_setup.cpp +++ b/pcbnew/dialogs/dialog_board_setup.cpp @@ -115,7 +115,7 @@ DIALOG_BOARD_SETUP::DIALOG_BOARD_SETUP( PCB_EDIT_FRAME* aFrame ) : for( size_t i = 0; i < m_treebook->GetPageCount(); ++i ) m_treebook->ExpandNode( i ); - m_treebook->SetMinSize( wxSize( -1, 480 ) ); + m_treebook->SetMinSize( wxSize( -1, 580 ) ); finishDialogSettings(); diff --git a/pcbnew/dialogs/panel_setup_constraints_base.cpp b/pcbnew/dialogs/panel_setup_constraints_base.cpp index 953bfa32a5..1031ee9eeb 100644 --- a/pcbnew/dialogs/panel_setup_constraints_base.cpp +++ b/pcbnew/dialogs/panel_setup_constraints_base.cpp @@ -298,44 +298,44 @@ PANEL_SETUP_CONSTRAINTS_BASE::PANEL_SETUP_CONSTRAINTS_BASE( wxWindow* parent, wx m_silkClearanceLabel = new wxStaticText( m_scrolledWindow, wxID_ANY, _("Minimum item clearance:"), wxDefaultPosition, wxDefaultSize, 0 ); m_silkClearanceLabel->Wrap( -1 ); - fgFeatureConstraints->Add( m_silkClearanceLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + fgFeatureConstraints->Add( m_silkClearanceLabel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 5 ); m_silkClearanceCtrl = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_silkClearanceCtrl->SetToolTip( _("Minimum clearance between two items on the same silkscreen layer. If set this can improve legibility. (Note: does not apply to multiple shapes within a single footprint.)") ); - fgFeatureConstraints->Add( m_silkClearanceCtrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM, 5 ); + fgFeatureConstraints->Add( m_silkClearanceCtrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP, 5 ); m_silkClearanceUnits = new wxStaticText( m_scrolledWindow, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_silkClearanceUnits->Wrap( -1 ); - fgFeatureConstraints->Add( m_silkClearanceUnits, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + fgFeatureConstraints->Add( m_silkClearanceUnits, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); fgFeatureConstraints->Add( 0, 0, 1, wxEXPAND, 5 ); m_textHeightLabel = new wxStaticText( m_scrolledWindow, wxID_ANY, _("Minimum text height:"), wxDefaultPosition, wxDefaultSize, 0 ); m_textHeightLabel->Wrap( -1 ); - fgFeatureConstraints->Add( m_textHeightLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + fgFeatureConstraints->Add( m_textHeightLabel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 5 ); m_textHeightCtrl = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgFeatureConstraints->Add( m_textHeightCtrl, 0, wxEXPAND|wxTOP|wxBOTTOM|wxALIGN_CENTER_VERTICAL, 5 ); + fgFeatureConstraints->Add( m_textHeightCtrl, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP, 5 ); m_textHeightUnits = new wxStaticText( m_scrolledWindow, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_textHeightUnits->Wrap( -1 ); - fgFeatureConstraints->Add( m_textHeightUnits, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + fgFeatureConstraints->Add( m_textHeightUnits, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); fgFeatureConstraints->Add( 0, 0, 1, wxEXPAND, 5 ); m_textThicknessLabel = new wxStaticText( m_scrolledWindow, wxID_ANY, _("Minimum text thickness:"), wxDefaultPosition, wxDefaultSize, 0 ); m_textThicknessLabel->Wrap( -1 ); - fgFeatureConstraints->Add( m_textThicknessLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + fgFeatureConstraints->Add( m_textThicknessLabel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 5 ); m_textThicknessCtrl = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgFeatureConstraints->Add( m_textThicknessCtrl, 0, wxTOP|wxBOTTOM|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgFeatureConstraints->Add( m_textThicknessCtrl, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP, 5 ); m_textThicknessUnits = new wxStaticText( m_scrolledWindow, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_textThicknessUnits->Wrap( -1 ); - fgFeatureConstraints->Add( m_textThicknessUnits, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + fgFeatureConstraints->Add( m_textThicknessUnits, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); sbFeatureConstraints->Add( fgFeatureConstraints, 1, wxEXPAND|wxLEFT, 5 ); @@ -354,7 +354,7 @@ PANEL_SETUP_CONSTRAINTS_BASE::PANEL_SETUP_CONSTRAINTS_BASE( wxWindow* parent, wx m_stCircleToPolyOpt = new wxStaticText( m_scrolledWindow, wxID_ANY, _("Arc/circle approximated by segments"), wxDefaultPosition, wxDefaultSize, 0 ); m_stCircleToPolyOpt->Wrap( -1 ); - bSizerArcToPoly->Add( m_stCircleToPolyOpt, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + bSizerArcToPoly->Add( m_stCircleToPolyOpt, 0, wxRIGHT|wxLEFT, 5 ); wxFlexGridSizer* fgSizer2; fgSizer2 = new wxFlexGridSizer( 0, 4, 3, 0 ); @@ -388,7 +388,7 @@ PANEL_SETUP_CONSTRAINTS_BASE::PANEL_SETUP_CONSTRAINTS_BASE( wxWindow* parent, wx bSizerArcToPoly->Add( m_stCircleToPolyWarning, 0, wxLEFT|wxRIGHT, 5 ); - sbFeatureRules->Add( bSizerArcToPoly, 0, wxEXPAND|wxTOP, 5 ); + sbFeatureRules->Add( bSizerArcToPoly, 0, wxEXPAND, 5 ); m_bSizerPolygonFillOption = new wxBoxSizer( wxVERTICAL ); diff --git a/pcbnew/dialogs/panel_setup_constraints_base.fbp b/pcbnew/dialogs/panel_setup_constraints_base.fbp index 01212cfc18..76913c697a 100644 --- a/pcbnew/dialogs/panel_setup_constraints_base.fbp +++ b/pcbnew/dialogs/panel_setup_constraints_base.fbp @@ -3900,7 +3900,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT 0 1 @@ -3961,7 +3961,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM + wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP 0 1 @@ -4025,7 +4025,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxLEFT + wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT 0 1 @@ -4096,7 +4096,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT 0 1 @@ -4157,7 +4157,7 @@ 5 - wxEXPAND|wxTOP|wxBOTTOM|wxALIGN_CENTER_VERTICAL + wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP 0 1 @@ -4221,7 +4221,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxLEFT + wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT 0 1 @@ -4292,7 +4292,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT 0 1 @@ -4353,7 +4353,7 @@ 5 - wxTOP|wxBOTTOM|wxEXPAND|wxALIGN_CENTER_VERTICAL + wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP 0 1 @@ -4417,7 +4417,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxLEFT + wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT 0 1 @@ -4501,7 +4501,7 @@ none 5 - wxEXPAND|wxTOP + wxEXPAND 0 @@ -4510,7 +4510,7 @@ none 5 - wxTOP|wxRIGHT|wxLEFT + wxRIGHT|wxLEFT 0 1