From f03c36e46501c3bb15d52fa0fca2f2642b579f1f Mon Sep 17 00:00:00 2001
From: wp <wp.no-reply@lazarus-ide-org>
Date: Sat, 13 Jun 2020 21:40:11 +0000
Subject: [PATCH] IDE: Fix forgotten scaling of images in BuildModesManager.
 Issue #37211

git-svn-id: trunk@63352 -
---
 ide/buildmodesmanager.lfm | 31 +++++++++++++------------------
 ide/buildmodesmanager.pas | 19 +++++++------------
 2 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/ide/buildmodesmanager.lfm b/ide/buildmodesmanager.lfm
index a5122dc267..268b99c7fc 100644
--- a/ide/buildmodesmanager.lfm
+++ b/ide/buildmodesmanager.lfm
@@ -12,11 +12,11 @@ object BuildModesForm: TBuildModesForm
   OnDestroy = FormDestroy
   OnShow = FormShow
   Position = poScreenCenter
-  LCLVersion = '1.9.0.0'
+  LCLVersion = '2.1.0.0'
   object ButtonPanel1: TButtonPanel
     Left = 6
-    Height = 32
-    Top = 316
+    Height = 26
+    Top = 322
     Width = 600
     OKButton.Name = 'OKButton'
     OKButton.DefaultCaption = True
@@ -36,7 +36,7 @@ object BuildModesForm: TBuildModesForm
     AnchorSideTop.Side = asrBottom
     Left = 6
     Height = 28
-    Top = 39
+    Top = 37
     Width = 154
     Align = alNone
     BorderSpacing.Top = 6
@@ -46,7 +46,6 @@ object BuildModesForm: TBuildModesForm
     EdgeBorders = []
     EdgeInner = esNone
     EdgeOuter = esNone
-    Images = ImageList1
     ParentShowHint = False
     ShowHint = True
     TabOrder = 1
@@ -101,9 +100,9 @@ object BuildModesForm: TBuildModesForm
     AnchorSideTop.Control = ToolBar1
     AnchorSideTop.Side = asrCenter
     Left = 166
-    Height = 17
-    Top = 45
-    Width = 66
+    Height = 15
+    Top = 44
+    Width = 55
     BorderSpacing.Left = 6
     Caption = 'NoteLabel'
     Font.Color = clMaroon
@@ -116,8 +115,8 @@ object BuildModesForm: TBuildModesForm
     AnchorSideTop.Control = ToolBar1
     AnchorSideTop.Side = asrBottom
     Left = 6
-    Height = 242
-    Top = 73
+    Height = 244
+    Top = 71
     Width = 602
     Anchors = [akTop, akLeft, akRight, akBottom]
     AutoFillColumns = True
@@ -160,9 +159,9 @@ object BuildModesForm: TBuildModesForm
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = Owner
     Left = 6
-    Height = 27
+    Height = 25
     Top = 6
-    Width = 183
+    Width = 166
     AutoSize = True
     BorderSpacing.Left = 6
     BorderSpacing.Top = 6
@@ -176,10 +175,10 @@ object BuildModesForm: TBuildModesForm
     AnchorSideTop.Control = btnCreateDefaultModes
     AnchorSideRight.Control = BuildModesStringGrid
     AnchorSideRight.Side = asrBottom
-    Left = 536
+    Left = 539
     Height = 25
     Top = 6
-    Width = 72
+    Width = 69
     Anchors = [akTop, akRight]
     AutoSize = True
     Caption = '&Rename'
@@ -190,8 +189,4 @@ object BuildModesForm: TBuildModesForm
     left = 168
     top = 260
   end
-  object ImageList1: TImageList
-    left = 240
-    top = 280
-  end
 end
diff --git a/ide/buildmodesmanager.pas b/ide/buildmodesmanager.pas
index 378bba4e33..2ec35b60eb 100644
--- a/ide/buildmodesmanager.pas
+++ b/ide/buildmodesmanager.pas
@@ -37,7 +37,7 @@ uses
   // LazUtils
   LazFileUtils, LazLoggerBase, UITypes,
   // IdeIntf
-  IDEDialogs, CompOptsIntf, IDEOptionsIntf, LazIDEIntf,
+  IDEDialogs, CompOptsIntf, IDEOptionsIntf, LazIDEIntf, IDEImagesIntf,
   // IDE
   MainBase, BasePkgManager, PackageDefs, Project, CompilerOptions, EnvironmentOpts,
   TransferMacros, BaseBuildManager, Compiler_ModeMatrix, BuildModeDiffDlg,
@@ -51,7 +51,6 @@ type
     btnCreateDefaultModes: TButton;
     BuildModesStringGrid: TStringGrid;
     RenameButton: TButton;
-    ImageList1: TImageList;
     BuildModesPopupMenu: TPopupMenu;
     ButtonPanel1: TButtonPanel;
     NoteLabel: TLabel;
@@ -429,16 +428,12 @@ begin
   FillBuildModesGrid;
   UpdateBuildModeButtons;
 
-  ImageList1.AddResourceName(HInstance, 'laz_add');
-  ImageList1.AddResourceName(HInstance, 'laz_delete');
-  ImageList1.AddResourceName(HInstance, 'arrow_up');
-  ImageList1.AddResourceName(HInstance, 'arrow_down');
-  ImageList1.AddResourceName(HInstance, 'menu_tool_diff');
-  ToolButtonAdd.ImageIndex:=0;
-  ToolButtonDelete.ImageIndex:=1;
-  ToolButtonMoveUp.ImageIndex:=2;
-  ToolButtonMoveDown.ImageIndex:=3;
-  ToolButtonDiff.ImageIndex:=4;
+  Toolbar1.Images := IDEImages.Images_16;
+  ToolButtonAdd.ImageIndex := IDEImages.LoadImage('laz_add', 16);
+  ToolButtonDelete.ImageIndex := IDEImages.LoadImage('laz_delete', 16);
+  ToolButtonMoveUp.ImageIndex := IDEImages.LoadImage('arrow_up', 16);
+  ToolButtonMoveDown.ImageIndex := IDEImages.LoadImage('arrow_down', 16);
+  ToolButtonDiff.ImageIndex := IDEImages.LoadImage('menu_tool_diff', 16);
   RenameButton.Caption:=lisBtnRename;
 end;