From 1daa2224d01a9b253a5ea58a1e79abffae575ead Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Mon, 27 Apr 2020 11:55:21 +0100 Subject: [PATCH] Tidy up the layout of the Colors Editor. --- common/dialogs/panel_color_settings.cpp | 8 +- common/dialogs/panel_color_settings_base.cpp | 20 ++- common/dialogs/panel_color_settings_base.fbp | 155 ++++++++++-------- common/dialogs/panel_color_settings_base.h | 2 +- .../dialogs/panel_eeschema_color_settings.cpp | 1 + 5 files changed, 104 insertions(+), 82 deletions(-) diff --git a/common/dialogs/panel_color_settings.cpp b/common/dialogs/panel_color_settings.cpp index 3e27ed329a..7c4c1abd08 100644 --- a/common/dialogs/panel_color_settings.cpp +++ b/common/dialogs/panel_color_settings.cpp @@ -49,6 +49,9 @@ PANEL_COLOR_SETTINGS::PANEL_COLOR_SETTINGS( wxWindow* aParent ) : { #ifdef __APPLE__ m_btnOpenFolder->SetLabel( _( "Reveal Themes in Finder" ) ); + + // Simple border is too dark on OSX + m_colorsListWindow->SetWindowStyle( wxBORDER_SUNKEN|wxVSCROLL ); #endif m_buttonSizePx = ConvertDialogToPixels( BUTTON_SIZE ); @@ -178,7 +181,6 @@ void PANEL_COLOR_SETTINGS::createThemeList( const wxString& aCurrent ) void PANEL_COLOR_SETTINGS::createButton( int aLayer, const KIGFX::COLOR4D& aColor, const wxString& aName ) { - const int flags = wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT | wxRIGHT; const wxSize border = ConvertDialogToPixels( BUTTON_BORDER ); wxStaticText* label = new wxStaticText( m_colorsListWindow, wxID_ANY, aName ); @@ -201,8 +203,8 @@ void PANEL_COLOR_SETTINGS::createButton( int aLayer, const KIGFX::COLOR4D& aColo m_buttonSizePx + border + wxSize( 1, 1 ) ); button->SetToolTip( _( "Edit color (right click for options)" ) ); - m_colorsGridSizer->Add( label, 0, flags, 5 ); - m_colorsGridSizer->Add( button, 0, flags, 5 ); + m_colorsGridSizer->Add( label, 0, wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT | wxLEFT, 5 ); + m_colorsGridSizer->Add( button, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 5 ); m_labels[aLayer] = label; m_buttons[aLayer] = button; diff --git a/common/dialogs/panel_color_settings_base.cpp b/common/dialogs/panel_color_settings_base.cpp index 91f10d11b3..d3edef7b2b 100644 --- a/common/dialogs/panel_color_settings_base.cpp +++ b/common/dialogs/panel_color_settings_base.cpp @@ -50,15 +50,19 @@ PANEL_COLOR_SETTINGS_BASE::PANEL_COLOR_SETTINGS_BASE( wxWindow* parent, wxWindow bControlSizer->Add( m_btnOpenFolder, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - m_mainSizer->Add( bControlSizer, 0, wxEXPAND|wxLEFT|wxRIGHT, 10 ); + m_mainSizer->Add( bControlSizer, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - m_mainSizer->Add( m_staticline1, 0, wxEXPAND|wxALL, 5 ); + m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); + m_mainSizer->Add( m_staticline2, 0, wxEXPAND | wxALL, 5 ); m_colorsMainSizer = new wxBoxSizer( wxHORIZONTAL ); - m_colorsListWindow = new wxScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxVSCROLL ); + wxBoxSizer* bottomMargin; + bottomMargin = new wxBoxSizer( wxVERTICAL ); + + m_colorsListWindow = new wxScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SIMPLE|wxVSCROLL ); m_colorsListWindow->SetScrollRate( 5, 5 ); + m_colorsListWindow->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); m_colorsListWindow->SetMinSize( wxSize( 240,-1 ) ); m_colorsGridSizer = new wxFlexGridSizer( 0, 2, 0, 0 ); @@ -66,14 +70,18 @@ PANEL_COLOR_SETTINGS_BASE::PANEL_COLOR_SETTINGS_BASE( wxWindow* parent, wxWindow m_colorsGridSizer->SetFlexibleDirection( wxHORIZONTAL ); m_colorsGridSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_NONE ); + m_colorsGridSizer->SetMinSize( wxSize( 100,-1 ) ); m_colorsListWindow->SetSizer( m_colorsGridSizer ); m_colorsListWindow->Layout(); m_colorsGridSizer->Fit( m_colorsListWindow ); - m_colorsMainSizer->Add( m_colorsListWindow, 0, wxEXPAND | wxALL, 5 ); + bottomMargin->Add( m_colorsListWindow, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - m_mainSizer->Add( m_colorsMainSizer, 1, wxEXPAND, 5 ); + m_colorsMainSizer->Add( bottomMargin, 0, wxEXPAND|wxBOTTOM, 3 ); + + + m_mainSizer->Add( m_colorsMainSizer, 1, wxEXPAND|wxLEFT, 5 ); this->SetSizer( m_mainSizer ); diff --git a/common/dialogs/panel_color_settings_base.fbp b/common/dialogs/panel_color_settings_base.fbp index 6060055a42..c204ee1e47 100644 --- a/common/dialogs/panel_color_settings_base.fbp +++ b/common/dialogs/panel_color_settings_base.fbp @@ -56,8 +56,8 @@ wxVERTICAL protected - 10 - wxEXPAND|wxLEFT|wxRIGHT + 5 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 0 @@ -425,7 +425,7 @@ 5 - wxEXPAND|wxALL + wxEXPAND | wxALL 0 1 @@ -462,7 +462,7 @@ 0 1 - m_staticline1 + m_staticline2 1 @@ -483,7 +483,7 @@ 5 - wxEXPAND + wxEXPAND|wxLEFT 1 @@ -491,74 +491,85 @@ wxHORIZONTAL protected - 5 - wxEXPAND | wxALL + 3 + wxEXPAND|wxBOTTOM 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - 240,-1 - 1 - m_colorsListWindow - 1 - - - protected - 1 - - Resizable - 5 - 5 - 1 - - ; ; forward_declare - 0 - - - - wxVSCROLL - - 2 - wxHORIZONTAL - 0 - - 0 - - m_colorsGridSizer - wxFLEX_GROWMODE_NONE - protected - 0 - 0 + + + bottomMargin + wxVERTICAL + none + + 5 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT + 1 + + 1 + 1 + 1 + 1 + + + + + + wxSYS_COLOUR_WINDOW + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + 240,-1 + 1 + m_colorsListWindow + 1 + + + protected + 1 + + Resizable + 5 + 5 + 1 + + ; ; forward_declare + 0 + + + + wxBORDER_SIMPLE|wxVSCROLL + + 2 + wxHORIZONTAL + 0 + + 0 + 100,-1 + m_colorsGridSizer + wxFLEX_GROWMODE_NONE + protected + 0 + 0 + + diff --git a/common/dialogs/panel_color_settings_base.h b/common/dialogs/panel_color_settings_base.h index 3fdf8b1c0e..f4fd4d5313 100644 --- a/common/dialogs/panel_color_settings_base.h +++ b/common/dialogs/panel_color_settings_base.h @@ -42,7 +42,7 @@ class PANEL_COLOR_SETTINGS_BASE : public wxPanel wxChoice* m_cbTheme; wxButton* m_btnReset; wxButton* m_btnOpenFolder; - wxStaticLine* m_staticline1; + wxStaticLine* m_staticline2; wxBoxSizer* m_colorsMainSizer; wxScrolledWindow* m_colorsListWindow; wxFlexGridSizer* m_colorsGridSizer; diff --git a/eeschema/dialogs/panel_eeschema_color_settings.cpp b/eeschema/dialogs/panel_eeschema_color_settings.cpp index fa38f1a20c..b918fa900b 100644 --- a/eeschema/dialogs/panel_eeschema_color_settings.cpp +++ b/eeschema/dialogs/panel_eeschema_color_settings.cpp @@ -96,6 +96,7 @@ PANEL_EESCHEMA_COLOR_SETTINGS::PANEL_EESCHEMA_COLOR_SETTINGS( SCH_BASE_FRAME* aF options, type ); m_preview->SetStealsFocus( false ); m_preview->ShowScrollbars( wxSHOW_SB_NEVER, wxSHOW_SB_NEVER ); + m_preview->GetGAL()->SetAxesEnabled( false ); m_colorsMainSizer->Add( 10, 0, 0, wxEXPAND, 5 ); m_colorsMainSizer->Add( m_preview, 1, wxALL | wxEXPAND, 5 );