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

Improve copper zone dialog layer list checkbox alignment on hidpi.

This commit is contained in:
Alex Shvartzkop 2024-05-27 01:00:51 +03:00
parent 07470efc0b
commit 284cda1fca
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pcbnew/zone_settings.cpp
View File

@ -259,7 +259,9 @@ void ZONE_SETTINGS::SetupLayersList( wxDataViewListCtrl* aList, PCB_BASE_FRAME*
if( aFpEditorMode ) if( aFpEditorMode )
aLayers.set( In1_Cu ); aLayers.set( In1_Cu );
wxDataViewColumn* checkColumn = aList->AppendToggleColumn( wxEmptyString ); wxDataViewColumn* checkColumn = aList->AppendToggleColumn(
wxEmptyString, wxDATAVIEW_CELL_ACTIVATABLE, wxCOL_WIDTH_DEFAULT, wxALIGN_CENTER );
wxDataViewColumn* layerColumn = aList->AppendIconTextColumn( wxEmptyString ); wxDataViewColumn* layerColumn = aList->AppendIconTextColumn( wxEmptyString );
wxDataViewColumn* layerIDColumn = aList->AppendTextColumn( wxEmptyString ); wxDataViewColumn* layerIDColumn = aList->AppendTextColumn( wxEmptyString );
layerIDColumn->SetHidden( true ); layerIDColumn->SetHidden( true );
@ -293,22 +295,13 @@ void ZONE_SETTINGS::SetupLayersList( wxDataViewListCtrl* aList, PCB_BASE_FRAME*
aList->SetToggleValue( true, (unsigned) aList->GetItemCount() - 1, 0 ); aList->SetToggleValue( true, (unsigned) aList->GetItemCount() - 1, 0 );
} }
int checkColSize = 22; int checkColSize = aList->FromDIP( 22 );
int layerColSize = textWidth + LAYER_BITMAP_SIZE.x + 15; int layerColSize = textWidth + LAYER_BITMAP_SIZE.x + aList->FromDIP( 15 );
#ifdef __WXMAC__
// TODO: something in wxWidgets 3.1.x pads checkbox columns with extra space. (It used to
// also be that the width of the column would get set too wide (to 30), but that's patched in
// our local wxWidgets fork.)
int checkColMargins = 40;
#else
int checkColMargins = 0;
#endif
// You'd think the fact that m_layers is a list would encourage wxWidgets not to save room // You'd think the fact that m_layers is a list would encourage wxWidgets not to save room
// for the tree expanders... but you'd be wrong. Force indent to 0. // for the tree expanders... but you'd be wrong. Force indent to 0.
aList->SetIndent( 0 ); aList->SetIndent( 0 );
aList->SetMinClientSize( wxSize( checkColSize + checkColMargins + layerColSize, aList->SetMinClientSize( wxSize( checkColSize + layerColSize,
aList->GetMinClientSize().y ) ); aList->GetMinClientSize().y ) );
checkColumn->SetWidth( checkColSize ); checkColumn->SetWidth( checkColSize );