electron-rare/kicad-source-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Push tool framework base down into TOOL_HOLDER.

Browse Source 
This allows us to use it outside of EDA_BASE_FRAMEs (in this case, in
PANEL_PREVIEW_3D.)
This commit is contained in:
Jeff Young
2020-03-24 19:00:25 +00:00
parent 14788eec94
commit d69ebfae49
54 changed files with 1069 additions and 973 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/bitmap.cpp
+4 -4
View File
@@ -102,7 +102,7 @@ int KiIconScale( wxWindow* aWindow )
}
static int get_scale_factor( EDA_BASE_FRAME* aWindow )
static int get_scale_factor( wxWindow* aWindow )
{
int requested_scale = Pgm().GetCommonSettings()->m_Appearance.icon_scale;
@@ -113,7 +113,7 @@ static int get_scale_factor( EDA_BASE_FRAME* aWindow )
}
wxBitmap KiScaledBitmap( BITMAP_DEF aBitmap, EDA_BASE_FRAME* aWindow )
wxBitmap KiScaledBitmap( BITMAP_DEF aBitmap, wxWindow* aWindow )
{
// Bitmap conversions are cached because they can be slow.
static std::unordered_map<SCALED_BITMAP_ID, wxBitmap> bitmap_cache;
@@ -145,7 +145,7 @@ wxBitmap KiScaledBitmap( BITMAP_DEF aBitmap, EDA_BASE_FRAME* aWindow )
}
wxBitmap KiScaledBitmap( const wxBitmap& aBitmap, EDA_BASE_FRAME* aWindow )
wxBitmap KiScaledBitmap( const wxBitmap& aBitmap, wxWindow* aWindow )
{
const int scale = get_scale_factor( aWindow );
@@ -164,7 +164,7 @@ wxBitmap KiScaledBitmap( const wxBitmap& aBitmap, EDA_BASE_FRAME* aWindow )
}
void KiScaledSeparator( wxAuiToolBar* aToolbar, EDA_BASE_FRAME* aWindow )
void KiScaledSeparator( wxAuiToolBar* aToolbar, wxWindow* aWindow )
{
const int scale = get_scale_factor( aWindow );