paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-22 00:20:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: Fix forgotten scaling of images in BuildModesManager. Issue #37211

Browse Source 
git-svn-id: trunk@63352 -
This commit is contained in:
wp 2020-06-13 21:40:11 +00:00
parent 42b490a925
commit f03c36e465
2 changed files with 20 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ide/buildmodesmanager.lfm
View File

@ -12,11 +12,11 @@ object BuildModesForm: TBuildModesForm
OnDestroy = FormDestroy OnDestroy = FormDestroy
OnShow = FormShow OnShow = FormShow
Position = poScreenCenter Position = poScreenCenter
LCLVersion = '1.9.0.0' LCLVersion = '2.1.0.0'
object ButtonPanel1: TButtonPanel object ButtonPanel1: TButtonPanel
Left = 6 Left = 6
Height = 32 Height = 26
Top = 316 Top = 322
Width = 600 Width = 600
OKButton.Name = 'OKButton' OKButton.Name = 'OKButton'
OKButton.DefaultCaption = True OKButton.DefaultCaption = True
@ -36,7 +36,7 @@ object BuildModesForm: TBuildModesForm
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 6 Left = 6
Height = 28 Height = 28
Top = 39 Top = 37
Width = 154 Width = 154
Align = alNone Align = alNone
BorderSpacing.Top = 6 BorderSpacing.Top = 6
@ -46,7 +46,6 @@ object BuildModesForm: TBuildModesForm
EdgeBorders = [] EdgeBorders = []
EdgeInner = esNone EdgeInner = esNone
EdgeOuter = esNone EdgeOuter = esNone
Images = ImageList1
ParentShowHint = False ParentShowHint = False
ShowHint = True ShowHint = True
TabOrder = 1 TabOrder = 1
@ -101,9 +100,9 @@ object BuildModesForm: TBuildModesForm
AnchorSideTop.Control = ToolBar1 AnchorSideTop.Control = ToolBar1
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
Left = 166 Left = 166
Height = 17 Height = 15
Top = 45 Top = 44
Width = 66 Width = 55
BorderSpacing.Left = 6 BorderSpacing.Left = 6
Caption = 'NoteLabel' Caption = 'NoteLabel'
Font.Color = clMaroon Font.Color = clMaroon
@ -116,8 +115,8 @@ object BuildModesForm: TBuildModesForm
AnchorSideTop.Control = ToolBar1 AnchorSideTop.Control = ToolBar1
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 6 Left = 6
Height = 242 Height = 244
Top = 73 Top = 71
Width = 602 Width = 602
Anchors = [akTop, akLeft, akRight, akBottom] Anchors = [akTop, akLeft, akRight, akBottom]
AutoFillColumns = True AutoFillColumns = True
@ -160,9 +159,9 @@ object BuildModesForm: TBuildModesForm
AnchorSideLeft.Control = Owner AnchorSideLeft.Control = Owner
AnchorSideTop.Control = Owner AnchorSideTop.Control = Owner
Left = 6 Left = 6
Height = 27 Height = 25
Top = 6 Top = 6
Width = 183 Width = 166
AutoSize = True AutoSize = True
BorderSpacing.Left = 6 BorderSpacing.Left = 6
BorderSpacing.Top = 6 BorderSpacing.Top = 6
@ -176,10 +175,10 @@ object BuildModesForm: TBuildModesForm
AnchorSideTop.Control = btnCreateDefaultModes AnchorSideTop.Control = btnCreateDefaultModes
AnchorSideRight.Control = BuildModesStringGrid AnchorSideRight.Control = BuildModesStringGrid
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 536 Left = 539
Height = 25 Height = 25
Top = 6 Top = 6
Width = 72 Width = 69
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
AutoSize = True AutoSize = True
Caption = '&Rename' Caption = '&Rename'
@ -190,8 +189,4 @@ object BuildModesForm: TBuildModesForm
left = 168 left = 168
top = 260 top = 260
end end
object ImageList1: TImageList
left = 240
top = 280
end
end end

19
ide/buildmodesmanager.pas
View File

@ -37,7 +37,7 @@ uses
// LazUtils // LazUtils
LazFileUtils, LazLoggerBase, UITypes, LazFileUtils, LazLoggerBase, UITypes,
// IdeIntf // IdeIntf
IDEDialogs, CompOptsIntf, IDEOptionsIntf, LazIDEIntf, IDEDialogs, CompOptsIntf, IDEOptionsIntf, LazIDEIntf, IDEImagesIntf,
// IDE // IDE
MainBase, BasePkgManager, PackageDefs, Project, CompilerOptions, EnvironmentOpts, MainBase, BasePkgManager, PackageDefs, Project, CompilerOptions, EnvironmentOpts,
TransferMacros, BaseBuildManager, Compiler_ModeMatrix, BuildModeDiffDlg, TransferMacros, BaseBuildManager, Compiler_ModeMatrix, BuildModeDiffDlg,
@ -51,7 +51,6 @@ type
btnCreateDefaultModes: TButton; btnCreateDefaultModes: TButton;
BuildModesStringGrid: TStringGrid; BuildModesStringGrid: TStringGrid;
RenameButton: TButton; RenameButton: TButton;
ImageList1: TImageList;
BuildModesPopupMenu: TPopupMenu; BuildModesPopupMenu: TPopupMenu;
ButtonPanel1: TButtonPanel; ButtonPanel1: TButtonPanel;
NoteLabel: TLabel; NoteLabel: TLabel;
@ -429,16 +428,12 @@ begin
FillBuildModesGrid; FillBuildModesGrid;
UpdateBuildModeButtons; UpdateBuildModeButtons;
ImageList1.AddResourceName(HInstance, 'laz_add'); Toolbar1.Images := IDEImages.Images_16;
ImageList1.AddResourceName(HInstance, 'laz_delete'); ToolButtonAdd.ImageIndex := IDEImages.LoadImage('laz_add', 16);
ImageList1.AddResourceName(HInstance, 'arrow_up'); ToolButtonDelete.ImageIndex := IDEImages.LoadImage('laz_delete', 16);
ImageList1.AddResourceName(HInstance, 'arrow_down'); ToolButtonMoveUp.ImageIndex := IDEImages.LoadImage('arrow_up', 16);
ImageList1.AddResourceName(HInstance, 'menu_tool_diff'); ToolButtonMoveDown.ImageIndex := IDEImages.LoadImage('arrow_down', 16);
ToolButtonAdd.ImageIndex:=0; ToolButtonDiff.ImageIndex := IDEImages.LoadImage('menu_tool_diff', 16);
ToolButtonDelete.ImageIndex:=1;
ToolButtonMoveUp.ImageIndex:=2;
ToolButtonMoveDown.ImageIndex:=3;
ToolButtonDiff.ImageIndex:=4;
RenameButton.Caption:=lisBtnRename; RenameButton.Caption:=lisBtnRename;
end; end;