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

IDE: High-DPI: CodeExplorer: Fixed image sizes.

Browse Source 
git-svn-id: trunk@55511 -
This commit is contained in:
michl 2017-07-15 18:52:57 +00:00
parent 2bb905f65d
commit a6cb66d5aa
2 changed files with 53 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
components/ideintf/ideimagesintf.pas
View File

@ -57,6 +57,8 @@ type
class function CreateImage(ImageName: String; ImageSize: Integer = 16): TCustomBitmap; class function CreateImage(ImageName: String; ImageSize: Integer = 16): TCustomBitmap;
class procedure AssignImage(const ABitmap: TCustomBitmap; ImageName: String; class procedure AssignImage(const ABitmap: TCustomBitmap; ImageName: String;
ImageSize: Integer = 16); ImageSize: Integer = 16);
class function AddImageToImageList(const AImageList: TImageList;
ImageName: String; ImageSize: Integer = 16): Integer;
class function ScaledSize(ImageSize: Integer = 16): Integer; class function ScaledSize(ImageSize: Integer = 16): Integer;
function LoadImage(ImageSize: Integer; ImageName: String): Integer; deprecated 'Use the other overload instead.'; function LoadImage(ImageSize: Integer; ImageName: String): Integer; deprecated 'Use the other overload instead.';
@ -177,6 +179,20 @@ begin
end; end;
end; end;
class function TIDEImages.AddImageToImageList(const AImageList: TImageList;
ImageName: String; ImageSize: Integer): Integer;
var
xBmp: TCustomBitmap;
begin
Result := -1;
xBmp := TIDEImages.CreateImage(ImageName, ImageSize);
try
Result := AImageList.Add(xBmp, nil);
finally
xBmp.Free;
end;
end;
class function TIDEImages.ScaledSize(ImageSize: Integer): Integer; class function TIDEImages.ScaledSize(ImageSize: Integer): Integer;
begin begin
Result := ImageSize * GetScalePercent div 100; Result := ImageSize * GetScalePercent div 100;

64
ide/codeexplorer.pas
View File

@ -199,6 +199,7 @@ type
ImgIDUnit: Integer; ImgIDUnit: Integer;
ImgIDVariable: Integer; ImgIDVariable: Integer;
ImgIDHint: Integer; ImgIDHint: Integer;
procedure AssignAllImages;
procedure ClearCodeTreeView; procedure ClearCodeTreeView;
procedure ClearDirectivesTreeView; procedure ClearDirectivesTreeView;
function GetCodeFilter: string; function GetCodeFilter: string;
@ -484,33 +485,7 @@ begin
CodeFilterEdit.TextHint:=lisCEFilter; CodeFilterEdit.TextHint:=lisCEFilter;
DirectivesFilterEdit.TextHint:=lisCEFilter; DirectivesFilterEdit.TextHint:=lisCEFilter;
TIDEImages.AssignImage(CodeRefreshSpeedButton.Glyph, 'laz_refresh'); AssignAllImages;
TIDEImages.AssignImage(CodeOptionsSpeedButton.Glyph, 'menu_environment_options');
TIDEImages.AssignImage(DirRefreshSpeedButton.Glyph, 'laz_refresh');
TIDEImages.AssignImage(DirOptionsSpeedButton.Glyph, 'menu_environment_options');
ImgIDDefault := Imagelist1.AddResourceName(HInstance, 'ce_default');
ImgIDProgram := Imagelist1.AddResourceName(HInstance, 'ce_program');
ImgIDUnit := Imagelist1.AddResourceName(HInstance, 'ce_unit');
ImgIDInterface := Imagelist1.AddResourceName(HInstance, 'ce_interface');
ImgIDImplementation := Imagelist1.AddResourceName(HInstance, 'ce_implementation');
ImgIDInitialization := Imagelist1.AddResourceName(HInstance, 'ce_initialization');
ImgIDFinalization := Imagelist1.AddResourceName(HInstance, 'ce_finalization');
ImgIDType := Imagelist1.AddResourceName(HInstance, 'ce_type');
ImgIDVariable := Imagelist1.AddResourceName(HInstance, 'ce_variable');
ImgIDConst := Imagelist1.AddResourceName(HInstance, 'ce_const');
ImgIDClass := Imagelist1.AddResourceName(HInstance, 'ce_class');
ImgIDClassInterface := Imagelist1.AddResourceName(HInstance, 'ce_classinterface');
ImgIDHelper := Imagelist1.AddResourceName(HInstance, 'ce_helper');
ImgIDRecord := Imagelist1.AddResourceName(HInstance, 'ce_record');
ImgIDProcedure := Imagelist1.AddResourceName(HInstance, 'ce_procedure');
ImgIDFunction := Imagelist1.AddResourceName(HInstance, 'ce_function');
ImgIDProperty := Imagelist1.AddResourceName(HInstance, 'ce_property');
ImgIDPropertyReadOnly := Imagelist1.AddResourceName(HInstance, 'ce_property_readonly');
// sections
ImgIDSection := Imagelist1.AddResourceName(HInstance, 'ce_section');
ImgIDHint := Imagelist1.AddResourceName(HInstance, 'state_hint');
// assign the root TMenuItem to the registered menu root. // assign the root TMenuItem to the registered menu root.
// This will automatically create all registered items // This will automatically create all registered items
CodeExplorerMenuRoot.MenuItem:=TreePopupMenu.Items; CodeExplorerMenuRoot.MenuItem:=TreePopupMenu.Items;
@ -738,6 +713,41 @@ begin
CheckOnIdle; CheckOnIdle;
end; end;
procedure TCodeExplorerView.AssignAllImages;
var
ImageSize: Integer;
begin
TIDEImages.AssignImage(CodeRefreshSpeedButton.Glyph, 'laz_refresh');
TIDEImages.AssignImage(CodeOptionsSpeedButton.Glyph, 'menu_environment_options');
TIDEImages.AssignImage(DirRefreshSpeedButton.Glyph, 'laz_refresh');
TIDEImages.AssignImage(DirOptionsSpeedButton.Glyph, 'menu_environment_options');
ImageSize := TIDEImages.ScaledSize;
Imagelist1.Width := ImageSize;
Imagelist1.Height := ImageSize;
ImgIDDefault := TIDEImages.AddImageToImageList(Imagelist1, 'ce_default');
ImgIDProgram := TIDEImages.AddImageToImageList(Imagelist1, 'ce_program');
ImgIDUnit := TIDEImages.AddImageToImageList(Imagelist1, 'ce_unit');
ImgIDInterface := TIDEImages.AddImageToImageList(Imagelist1, 'ce_interface');
ImgIDImplementation := TIDEImages.AddImageToImageList(Imagelist1, 'ce_implementation');
ImgIDInitialization := TIDEImages.AddImageToImageList(Imagelist1, 'ce_initialization');
ImgIDFinalization := TIDEImages.AddImageToImageList(Imagelist1, 'ce_finalization');
ImgIDType := TIDEImages.AddImageToImageList(Imagelist1, 'ce_type');
ImgIDVariable := TIDEImages.AddImageToImageList(Imagelist1, 'ce_variable');
ImgIDConst := TIDEImages.AddImageToImageList(Imagelist1, 'ce_const');
ImgIDClass := TIDEImages.AddImageToImageList(Imagelist1, 'ce_class');
ImgIDClassInterface := TIDEImages.AddImageToImageList(Imagelist1, 'ce_classinterface');
ImgIDHelper := TIDEImages.AddImageToImageList(Imagelist1, 'ce_helper');
ImgIDRecord := TIDEImages.AddImageToImageList(Imagelist1, 'ce_record');
ImgIDProcedure := TIDEImages.AddImageToImageList(Imagelist1, 'ce_procedure');
ImgIDFunction := TIDEImages.AddImageToImageList(Imagelist1, 'ce_function');
ImgIDProperty := TIDEImages.AddImageToImageList(Imagelist1, 'ce_property');
ImgIDPropertyReadOnly := TIDEImages.AddImageToImageList(Imagelist1, 'ce_property_readonly');
// sections
ImgIDSection := TIDEImages.AddImageToImageList(Imagelist1, 'ce_section');
ImgIDHint := TIDEImages.AddImageToImageList(Imagelist1, 'state_hint');
end;
function TCodeExplorerView.GetCodeNodeDescription(ACodeTool: TCodeTool; function TCodeExplorerView.GetCodeNodeDescription(ACodeTool: TCodeTool;
CodeNode: TCodeTreeNode): string; CodeNode: TCodeTreeNode): string;
var var