From 2bb905f65db4f0b385e0b136280778d98b25bdb7 Mon Sep 17 00:00:00 2001
From: michl <michl@lazarus-ide.org>
Date: Sat, 15 Jul 2017 18:04:54 +0000
Subject: [PATCH] IDE: High-DPI: ActionsEditor: Fixed image sizes.

git-svn-id: trunk@55510 -
---
 components/ideintf/actionseditor.lfm | 35 -------------------------
 components/ideintf/actionseditor.pas | 38 ++++++++++++++++++++++------
 2 files changed, 30 insertions(+), 43 deletions(-)

diff --git a/components/ideintf/actionseditor.lfm b/components/ideintf/actionseditor.lfm
index ef0d8bb737..2dade48d7a 100644
--- a/components/ideintf/actionseditor.lfm
+++ b/components/ideintf/actionseditor.lfm
@@ -243,40 +243,5 @@ object ActionListEditor: TActionListEditor
     AllocBy = 8
     left = 56
     top = 116
-    Bitmap = {
-      4C69010000001000000010000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF007F7F7FFF7F7F
-      7FFF7F7F7FFF7F7F7FFF7F7F7FFF7F7F7FFF7F7F7FFF7F7F7FFF7F7F7FFF7F7F
-      7FFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF007F7F
-      7FFF7F7F7FFF7F7F7FFF7F7F7FFF7F7F7FFF7F7F7FFF7F7F7FFF7F7F7FFFFFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF007F7F7FFF7F7F7FFF7F7F7FFF7F7F7FFF7F7F7FFF7F7F7FFFFFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF007F7F7FFF7F7F7FFF7F7F7FFF7F7F7FFFFFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF007F7F7FFF7F7F7FFFFFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00
-    }
   end
 end
diff --git a/components/ideintf/actionseditor.pas b/components/ideintf/actionseditor.pas
index 9289ef3430..f8c3eb0a74 100644
--- a/components/ideintf/actionseditor.pas
+++ b/components/ideintf/actionseditor.pas
@@ -27,9 +27,10 @@ uses
   Classes, SysUtils, contnrs,
   // LCL
   LCLIntf, LCLType, LCLProc, Forms, Controls, Dialogs, ExtCtrls, StdCtrls,
-  Graphics, Menus, ComCtrls, DBActns, StdActns, ActnList,
+  Graphics, Menus, ComCtrls, DBActns, StdActns, ActnList, Themes,
   // IDEIntf
-  ObjInspStrConsts, ComponentEditors, PropEdits, PropEditUtils, IDEWindowIntf;
+  ObjInspStrConsts, ComponentEditors, PropEdits, PropEditUtils, IDEWindowIntf,
+  IDEImagesIntf;
 
 type
   TActStdPropItem = class;
@@ -410,14 +411,35 @@ begin
 end;
 
 procedure TActionListEditor.FormCreate(Sender: TObject);
+var
+  ImageSize: Integer;
+  Bitmap: TBitmap;
+  Details: TThemedElementDetails;
 begin
-  //imageindex 0 exists
-  ImageList1.AddResourceName(HInstance, 'laz_add'); //imageindex 1
-  ImageList1.AddResourceName(HInstance, 'laz_delete'); //imageindex 2
-  ImageList1.AddResourceName(HInstance, 'arrow_up'); //imadeindex 3
-  ImageList1.AddResourceName(HInstance, 'arrow_down'); //imageindex 4
+  ImageSize := TIDEImages.ScaledSize;
+  ImageList1.Width := ImageSize;
+  ImageList1.Height := ImageSize;
+  Bitmap := TBitmap.Create;
+  try
+    Bitmap.SetSize(ImageSize, ImageSize);
+    Bitmap.Canvas.Brush.Color := clBtnFace;
+    Bitmap.Canvas.FillRect(0, 0, ImageSize, ImageSize);
+    Details := ThemeServices.GetElementDetails(ttbSplitButtonDropDownNormal);
+    ThemeServices.DrawElement(Bitmap.Canvas.Handle, Details, Rect(0, 0, ImageSize, ImageSize));
+//    TIDEImages.AssignImage(Bitmap, 'btn_downarrow'); //imageindex 0
+    ImageList1.Add(Bitmap, nil);
+    TIDEImages.AssignImage(Bitmap, 'laz_add'); //imageindex 1
+    ImageList1.Add(Bitmap, nil);
+    TIDEImages.AssignImage(Bitmap, 'laz_delete'); //imageindex 2
+    ImageList1.Add(Bitmap, nil);
+    TIDEImages.AssignImage(Bitmap, 'arrow_up'); //imadeindex 3
+    ImageList1.Add(Bitmap, nil);
+    TIDEImages.AssignImage(Bitmap, 'arrow_down'); //imageindex 4
+    ImageList1.Add(Bitmap, nil);
+  finally
+    Bitmap.Free;
+  end;
   btnAddMore.ImageIndex := 0;
-  // These must be set in code because OI does not work with non-existent values.
   btnAdd.ImageIndex := 1;
   btnDelete.ImageIndex := 2;
   btnUp.ImageIndex := 3;