AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-20 21:31:42 +00:00
Files Issues Releases Activity

Start all toolbar bitmapbundles at the selected size

Browse Source
This commit is contained in:
Marek Roszko 2025-02-06 20:44:39 -05:00
parent 79d48c94f9
commit 1ecf1d97ae
1 changed files with 14 additions and 5 deletions

19
common/tool/action_toolbar.cpp
View File

@ -245,7 +245,9 @@ void ACTION_TOOLBAR::Add( const TOOL_ACTION& aAction, bool aIsToggleEntry, bool
int toolId = aAction.GetUIId();
AddTool( toolId, wxEmptyString, KiBitmapBundle( aAction.GetIcon() ),
AddTool( toolId, wxEmptyString,
KiBitmapBundle( aAction.GetIcon(),
Pgm().GetCommonSettings()->m_Appearance.toolbar_icon_size ),
KiDisabledBitmapBundle( aAction.GetIcon() ),
aIsToggleEntry ? wxITEM_CHECK : wxITEM_NORMAL,
aAction.GetButtonTooltip(), wxEmptyString, nullptr );
@ -260,7 +262,9 @@ void ACTION_TOOLBAR::AddButton( const TOOL_ACTION& aAction )
{
int toolId = aAction.GetUIId();
AddTool( toolId, wxEmptyString, KiBitmapBundle( aAction.GetIcon() ),
AddTool( toolId, wxEmptyString,
KiBitmapBundle( aAction.GetIcon(),
Pgm().GetCommonSettings()->m_Appearance.toolbar_icon_size ),
KiDisabledBitmapBundle( aAction.GetIcon() ), wxITEM_NORMAL,
aAction.GetButtonTooltip(), wxEmptyString, nullptr );
@ -305,7 +309,9 @@ void ACTION_TOOLBAR::AddGroup( ACTION_GROUP* aGroup, bool aIsToggleEntry )
m_actionGroups[ groupId ] = aGroup;
// Add the main toolbar item representing the group
AddTool( groupId, wxEmptyString, KiBitmapBundle( defaultAction->GetIcon() ),
AddTool( groupId, wxEmptyString,
KiBitmapBundle( defaultAction->GetIcon(),
Pgm().GetCommonSettings()->m_Appearance.toolbar_icon_size ),
KiDisabledBitmapBundle( defaultAction->GetIcon() ),
aIsToggleEntry ? wxITEM_CHECK : wxITEM_NORMAL,
wxEmptyString, wxEmptyString, nullptr );
@ -342,7 +348,8 @@ void ACTION_TOOLBAR::doSelectAction( ACTION_GROUP* aGroup, const TOOL_ACTION& aA
// Update the item information
item->SetShortHelp( aAction.GetButtonTooltip() );
item->SetBitmap( KiBitmapBundle( aAction.GetIcon() ) );
item->SetBitmap( KiBitmapBundle( aAction.GetIcon(),
Pgm().GetCommonSettings()->m_Appearance.toolbar_icon_size ) );
item->SetDisabledBitmap( KiDisabledBitmapBundle( aAction.GetIcon() ) );
// Register a new handler with the new UI conditions
@ -859,7 +866,9 @@ void ACTION_TOOLBAR::RefreshBitmaps()
{
wxAuiToolBarItem* tool = FindTool( pair.first );
tool->SetBitmap( KiBitmapBundle( pair.second->GetIcon() ) );
tool->SetBitmap(
KiBitmapBundle( pair.second->GetIcon(),
Pgm().GetCommonSettings()->m_Appearance.toolbar_icon_size ) );
tool->SetDisabledBitmap( KiDisabledBitmapBundle( pair.second->GetIcon() ) );
}