From b4d4525496c3cdfa9377c2dbfedc2c51c82cfc76 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Thu, 16 May 2019 19:54:05 +0100
Subject: [PATCH] Fix icon-scaling issue for ACTION_TOOLBAR.

Fixes: lp:1829291
* https://bugs.launchpad.net/kicad/+bug/1829291
---
 common/tool/action_toolbar.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/tool/action_toolbar.cpp b/common/tool/action_toolbar.cpp
index 6ece1cec9a..c79279f537 100644
--- a/common/tool/action_toolbar.cpp
+++ b/common/tool/action_toolbar.cpp
@@ -41,10 +41,11 @@ ACTION_TOOLBAR::ACTION_TOOLBAR( EDA_DRAW_FRAME* parent, wxWindowID id, const wxP
 
 void ACTION_TOOLBAR::Add( const TOOL_ACTION& aAction, bool aIsToggleEntry )
 {
+    EDA_DRAW_FRAME* editFrame = m_toolManager->GetEditFrame();
     int toolId = aAction.GetId() + ACTION_ID;
 
-    AddTool( toolId, wxEmptyString, KiBitmap( aAction.GetIcon() ), aAction.GetDescription(),
-             aIsToggleEntry ? wxITEM_CHECK : wxITEM_NORMAL );
+    AddTool( toolId, wxEmptyString, KiScaledBitmap( aAction.GetIcon(), editFrame ),
+             aAction.GetDescription(), aIsToggleEntry ? wxITEM_CHECK : wxITEM_NORMAL );
 
     m_toolKinds[ toolId ] = aIsToggleEntry;
     m_toolActions[ toolId ] = &aAction;