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

Fix project tree icons on GTK with 2x scaling.

This commit is contained in:
Alex Shvartzkop 2024-05-26 09:15:54 +03:00
parent e55da55e04
commit 72bd0c583f
1 changed files with 51 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
kicad/project_tree.cpp
View File

@ -119,53 +119,65 @@ void PROJECT_TREE::LoadIcons()
delete m_imageList;
// Make an image list containing small icons
int size = 24;
double scale = GetContentScaleFactor() * GetDPIScaleFactor();
int logicSize = 24 * GetDPIScaleFactor() / GetContentScaleFactor(); // Cross-platform way
int physSize = ToPhys( logicSize ); // aka *GetContentScaleFactor()
if( scale >= 2.5 )
size = 64;
else if( scale >= 2.0 )
size = 48;
else if( scale >= 1.5 )
size = 32;
if( physSize >= 64 )
physSize = 64;
else if( physSize >= 48 )
physSize = 48;
else if( physSize >= 32 )
physSize = 32;
else
physSize = 24;
m_imageList = new wxImageList( size, size, true,
double bmpsf = physSize / logicSize;
auto toBitmap = [&]( BITMAPS aBmps )
{
wxBitmap bmp = KiBitmap( aBmps, physSize );
bmp.SetScaleFactor( bmpsf );
wxASSERT(bmp.IsOk());
return bmp;
};
m_imageList = new wxImageList( logicSize, logicSize, true,
static_cast<int>( TREE_FILE_TYPE::MAX ) );
m_imageList->Add( KiBitmap( BITMAPS::project, size ) ); // TREE_LEGACY_PROJECT
m_imageList->Add( KiBitmap( BITMAPS::project_kicad, size ) ); // TREE_JSON_PROJECT
m_imageList->Add( KiBitmap( BITMAPS::icon_eeschema_24, size ) ); // TREE_LEGACY_SCHEMATIC
m_imageList->Add( KiBitmap( BITMAPS::icon_eeschema_24, size ) ); // TREE_SEXPR_SCHEMATIC
m_imageList->Add( KiBitmap( BITMAPS::icon_pcbnew_24, size ) ); // TREE_LEGACY_PCB
m_imageList->Add( KiBitmap( BITMAPS::icon_pcbnew_24, size ) ); // TREE_SEXPR_PCB
m_imageList->Add( KiBitmap( BITMAPS::icon_gerbview_24, size ) ); // TREE_GERBER
m_imageList->Add( KiBitmap( BITMAPS::file_gerber_job, size ) ); // TREE_GERBER_JOB_FILE (.gbrjob)
m_imageList->Add( KiBitmap( BITMAPS::file_html, size ) ); // TREE_HTML
m_imageList->Add( KiBitmap( BITMAPS::file_pdf, size ) ); // TREE_PDF
m_imageList->Add( KiBitmap( BITMAPS::editor, size ) ); // TREE_TXT
m_imageList->Add( KiBitmap( BITMAPS::editor, size ) ); // TREE_MD
m_imageList->Add( KiBitmap( BITMAPS::netlist, size ) ); // TREE_NET
m_imageList->Add( KiBitmap( BITMAPS::file_cir, size ) ); // TREE_NET_SPICE
m_imageList->Add( KiBitmap( BITMAPS::unknown, size ) ); // TREE_UNKNOWN
m_imageList->Add( KiBitmap( BITMAPS::directory, size ) ); // TREE_DIRECTORY
m_imageList->Add( KiBitmap( BITMAPS::icon_cvpcb_24, size ) ); // TREE_CMP_LINK
m_imageList->Add( KiBitmap( BITMAPS::tools, size ) ); // TREE_REPORT
m_imageList->Add( KiBitmap( BITMAPS::file_pos, size ) ); // TREE_POS
m_imageList->Add( KiBitmap( BITMAPS::file_drl, size ) ); // TREE_DRILL
m_imageList->Add( KiBitmap( BITMAPS::file_drl, size ) ); // TREE_DRILL_NC (similar TREE_DRILL)
m_imageList->Add( KiBitmap( BITMAPS::file_drl, size ) ); // TREE_DRILL_XNC (similar TREE_DRILL)
m_imageList->Add( KiBitmap( BITMAPS::file_svg, size ) ); // TREE_SVG
m_imageList->Add( KiBitmap( BITMAPS::icon_pagelayout_editor_24, size ) ); // TREE_PAGE_LAYOUT_DESCR
m_imageList->Add( KiBitmap( BITMAPS::module, size ) ); // TREE_FOOTPRINT_FILE
m_imageList->Add( KiBitmap( BITMAPS::library, size ) ); // TREE_SCHEMATIC_LIBFILE
m_imageList->Add( KiBitmap( BITMAPS::library, size ) ); // TREE_SEXPR_SYMBOL_LIB_FILE
m_imageList->Add( KiBitmap( BITMAPS::editor, size ) ); // DESIGN_RULES
m_imageList->Add( KiBitmap( BITMAPS::zip, size ) ); // ZIP_ARCHIVE
m_imageList->Add( toBitmap( BITMAPS::project ) ); // TREE_LEGACY_PROJECT
m_imageList->Add( toBitmap( BITMAPS::project_kicad ) ); // TREE_JSON_PROJECT
m_imageList->Add( toBitmap( BITMAPS::icon_eeschema_24 ) ); // TREE_LEGACY_SCHEMATIC
m_imageList->Add( toBitmap( BITMAPS::icon_eeschema_24 ) ); // TREE_SEXPR_SCHEMATIC
m_imageList->Add( toBitmap( BITMAPS::icon_pcbnew_24 ) ); // TREE_LEGACY_PCB
m_imageList->Add( toBitmap( BITMAPS::icon_pcbnew_24 ) ); // TREE_SEXPR_PCB
m_imageList->Add( toBitmap( BITMAPS::icon_gerbview_24 ) ); // TREE_GERBER
m_imageList->Add( toBitmap( BITMAPS::file_gerber_job ) ); // TREE_GERBER_JOB_FILE (.gbrjob)
m_imageList->Add( toBitmap( BITMAPS::file_html ) ); // TREE_HTML
m_imageList->Add( toBitmap( BITMAPS::file_pdf ) ); // TREE_PDF
m_imageList->Add( toBitmap( BITMAPS::editor ) ); // TREE_TXT
m_imageList->Add( toBitmap( BITMAPS::editor ) ); // TREE_MD
m_imageList->Add( toBitmap( BITMAPS::netlist ) ); // TREE_NET
m_imageList->Add( toBitmap( BITMAPS::file_cir ) ); // TREE_NET_SPICE
m_imageList->Add( toBitmap( BITMAPS::unknown ) ); // TREE_UNKNOWN
m_imageList->Add( toBitmap( BITMAPS::directory ) ); // TREE_DIRECTORY
m_imageList->Add( toBitmap( BITMAPS::icon_cvpcb_24 ) ); // TREE_CMP_LINK
m_imageList->Add( toBitmap( BITMAPS::tools ) ); // TREE_REPORT
m_imageList->Add( toBitmap( BITMAPS::file_pos ) ); // TREE_POS
m_imageList->Add( toBitmap( BITMAPS::file_drl ) ); // TREE_DRILL
m_imageList->Add( toBitmap( BITMAPS::file_drl ) ); // TREE_DRILL_NC (similar TREE_DRILL)
m_imageList->Add( toBitmap( BITMAPS::file_drl ) ); // TREE_DRILL_XNC (similar TREE_DRILL)
m_imageList->Add( toBitmap( BITMAPS::file_svg ) ); // TREE_SVG
m_imageList->Add( toBitmap( BITMAPS::icon_pagelayout_editor_24 ) ); // TREE_PAGE_LAYOUT_DESCR
m_imageList->Add( toBitmap( BITMAPS::module ) ); // TREE_FOOTPRINT_FILE
m_imageList->Add( toBitmap( BITMAPS::library ) ); // TREE_SCHEMATIC_LIBFILE
m_imageList->Add( toBitmap( BITMAPS::library ) ); // TREE_SEXPR_SYMBOL_LIB_FILE
m_imageList->Add( toBitmap( BITMAPS::editor ) ); // DESIGN_RULES
m_imageList->Add( toBitmap( BITMAPS::zip ) ); // ZIP_ARCHIVE
SetImageList( m_imageList );
// Make an image list containing small icons
size = 16;
int size = 16;
wxBitmap blank_bitmap( size, size );