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

Merged revision(s) 55492 #3acd41371c, 55494-55496 #6b1b12d66d-#6b1b12d66d, 55498-55500 #6f5300c1e9-#6f5300c1e9, 55507-55516 #76cd4aa108-#76cd4aa108 from trunk:

Browse Source 
IDE: High-DPI: ObjectInspector: Fixed drawing of active row bitmap. Issue #32097
........
grids: Introduce constColRowBorderTolerance for colwidth/rowheight resizing.
........
grids: High-dpi scaling of constCellPadding, constRubberSpace and constColRowBorderTolerance
........
IDE: High-DPI: ObjectInspector: Size of filter edit glyphs. Issue #32097
........
IDE: High-DPI: Fixed image sizes of in IDE used TTreeFilterEdits and TListFilterEdits.
........
IDE: High-DPI: ComponentPagesPopup: Size of close button glyph. Issue #32097
........
IDE: High-DPI: ComponentPalette: Size of component pages speedbutton.
........
IDE: SearchResultWindow: Anchor of TreeFilterEdit to always show its button.
........
IDE: High-DPI: ObjectInspector: ComponentTreeView: Fixed image sizes.
........
IDE: High-DPI: ComponentPages: Fixed tree image sizes.
........
IDE: High-DPI: ActionsEditor: Fixed image sizes.
........
IDE: High-DPI: CodeExplorer: Fixed image sizes.
........
IDE: High-DPI: Better assigning of images to imagelists.
........
IDE: High-DPI: SourceEditor: Fixed source mark image sizes.
........
IDE: High-DPI: CodeBrowser: Fixed image sizes.
........
IDE: EditorDisplayOptions: Fixed wrong anchor of DisableAntialiasingCheckBox.
........
LCL: TTreeView: High-DPI: Make spaces between images DPI-aware.
........

git-svn-id: branches/fixes_1_8@55528 -
This commit is contained in:
maxim 2017-07-17 23:24:02 +00:00
parent e565b7fc97
commit 9596662a12
40 changed files with 224 additions and 270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@ -1891,6 +1891,8 @@ components/ideintf/images/propertygrid/issue_qt.png -text svneol=unset#image/png
components/ideintf/images/propertygrid/issue_win32.png -text svneol=unset#image/png
components/ideintf/images/propertygrid/issue_wince.png -text svneol=unset#image/png
components/ideintf/images/propertygrid/pg_active_row.png -text svneol=unset#image/png
components/ideintf/images/propertygrid/pg_active_row_150.png -text
components/ideintf/images/propertygrid/pg_active_row_200.png -text
components/ideintf/keyvalpropeditdlg.lfm svneol=native#text/plain
components/ideintf/keyvalpropeditdlg.pas svneol=native#text/pascal
components/ideintf/languages/objinspstrconsts.ca.po svneol=native#text/plain

35
components/ideintf/actionseditor.lfm
View File

@ -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

22
components/ideintf/actionseditor.pas
View File

@ -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,19 @@ begin
end;
procedure TActionListEditor.FormCreate(Sender: TObject);
var
ImageSize: Integer;
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;
TIDEImages.AddImageToImageList(ImageList1, 'btn_downarrow'); //imageindex 0
TIDEImages.AddImageToImageList(ImageList1, 'laz_add'); //imageindex 1
TIDEImages.AddImageToImageList(ImageList1, 'laz_delete'); //imageindex 2
TIDEImages.AddImageToImageList(ImageList1, 'arrow_up'); //imadeindex 3
TIDEImages.AddImageToImageList(ImageList1, 'arrow_down'); //imageindex 4
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;

6
components/ideintf/changeparentdlg.pas
View File

@ -17,8 +17,8 @@ unit ChangeParentDlg;
interface
uses
Classes, SysUtils, strutils, FileUtil, ListFilterEdit, PropEditUtils, Forms,
Controls, Graphics, Dialogs, StdCtrls, ButtonPanel;
Classes, SysUtils, strutils, FileUtil, ListFilterEdit, PropEditUtils,
IDEImagesIntf, Forms, Controls, Graphics, Dialogs, StdCtrls, ButtonPanel;
type
@ -103,6 +103,8 @@ begin
Caption := oisChangeParent;
chShowClasses.Caption := oisShowClasses;
TIDEImages.AssignImage(ListFilterEdit.Glyph, 'btnfiltercancel');
end;
{$HINTS OFF}

29
components/ideintf/componenttreeview.pas
View File

@ -28,7 +28,7 @@ uses
// LCL
LCLProc, Dialogs, Controls, ComCtrls, Graphics,
// IdeIntf
ObjInspStrConsts, PropEdits, PropEditUtils;
ObjInspStrConsts, PropEdits, PropEditUtils, IDEImagesIntf;
type
TCTVGetImageIndexEvent = procedure(APersistent: TPersistent;
@ -582,31 +582,20 @@ begin
end;
constructor TComponentTreeView.Create(TheOwner: TComponent);
var
Bitmap: TPortableNetworkGraphic;
begin
inherited Create(TheOwner);
DragMode := dmAutomatic;
FComponentList:=TBackupComponentList.Create;
Options := Options + [tvoAllowMultiselect, tvoAutoItemHeight, tvoKeepCollapsedNodes, tvoReadOnly];
FImageList := TImageList.Create(nil);
Bitmap := TPortableNetworkGraphic.Create;
try
Bitmap.LoadFromResourceName(HInstance, 'oi_form');
ImgIndexForm:=FImageList.Add(Bitmap, nil);
Bitmap.LoadFromResourceName(HInstance, 'oi_comp');
ImgIndexComponent:=FImageList.Add(Bitmap, nil);
Bitmap.LoadFromResourceName(HInstance, 'oi_control');
ImgIndexControl:=FImageList.Add(Bitmap, nil);
Bitmap.LoadFromResourceName(HInstance, 'oi_box');
ImgIndexBox:=FImageList.Add(Bitmap, nil);
Bitmap.LoadFromResourceName(HInstance, 'oi_collection');
ImgIndexCollection:=FImageList.Add(Bitmap, nil);
Bitmap.LoadFromResourceName(HInstance, 'oi_item');
ImgIndexItem:=FImageList.Add(Bitmap, nil);
finally
Bitmap.Free;
end;
FImageList.Width := TIDEImages.ScaledSize;
FImageList.Height := TIDEImages.ScaledSize;
ImgIndexForm := TIDEImages.AddImageToImageList(FImageList, 'oi_form');
ImgIndexComponent := TIDEImages.AddImageToImageList(FImageList, 'oi_comp');
ImgIndexControl := TIDEImages.AddImageToImageList(FImageList, 'oi_control');
ImgIndexBox := TIDEImages.AddImageToImageList(FImageList, 'oi_box');
ImgIndexCollection := TIDEImages.AddImageToImageList(FImageList, 'oi_collection');
ImgIndexItem := TIDEImages.AddImageToImageList(FImageList, 'oi_item');
Images := FImageList;
end;

22
components/ideintf/ideimagesintf.pas
View File

@ -57,6 +57,9 @@ type
class function CreateImage(ImageName: String; ImageSize: Integer = 16): TCustomBitmap;
class procedure AssignImage(const ABitmap: TCustomBitmap; ImageName: String;
ImageSize: Integer = 16);
class function AddImageToImageList(const AImageList: TImageList;
ImageName: String; 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(ImageName: String; ImageSize: Integer = 16): Integer;
@ -176,6 +179,25 @@ begin
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;
begin
Result := ImageSize * GetScalePercent div 100;
end;
constructor TIDEImages.Create;
begin
FImageNames_12 := TStringList.Create;

BIN
components/ideintf/images/ideintf_images.res
View File

Binary file not shown.

4
components/ideintf/images/ideintf_images_list.txt
View File

@ -11,4 +11,6 @@ propertygrid/issue_nogui.png
propertygrid/issue_qt.png
propertygrid/issue_win32.png
propertygrid/issue_wince.png
propertygrid/pg_active_row.png
propertygrid/pg_active_row.png
propertygrid/pg_active_row_150.png
propertygrid/pg_active_row_200.png

BIN
components/ideintf/images/propertygrid/pg_active_row.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 166 B

BIN
components/ideintf/images/propertygrid/pg_active_row_150.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 198 B

BIN
components/ideintf/images/propertygrid/pg_active_row_200.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 203 B

4
components/ideintf/objectinspector.pp
View File

@ -1123,7 +1123,7 @@ begin
end;
FHintManager := THintWindowManager.Create;
FActiveRowBmp := CreateBitmapFromResourceName(HInstance, 'pg_active_row');
FActiveRowBmp := TIDEImages.CreateImage('pg_active_row', 9);
FDefaultItemHeight:=DefItemHeight;
@ -4311,6 +4311,7 @@ begin
ComponentPanel.Constraints.MinHeight := 8;
ComponentPanel.Visible := FShowComponentTree;
CompFilterEdit.FilteredTreeview := ComponentTree;
TIDEImages.AssignImage(CompFilterEdit.Glyph, 'btnfiltercancel');
InfoPanel := TPanel.Create(Self);
with InfoPanel do
@ -4373,6 +4374,7 @@ begin
OnAfterFilter := @PropFilterEditAfterFilter;
OnResize := @PropFilterEditResize;
end;
TIDEImages.AssignImage(PropFilterEdit.Glyph, 'btnfiltercancel');
CreateNoteBook;
end;

42
ide/codebrowser.pas
View File

@ -58,6 +58,7 @@ uses
// IDEIntf
IDEWindowIntf, SrcEditorIntf, IDEMsgIntf, IDEDialogs, LazConfigStorage,
IDEHelpIntf, PackageIntf, IDECommands, LazIDEIntf, IDEExternToolIntf,
IDEImagesIntf,
// IDE
Project, DialogProcs, PackageSystem, PackageDefs, LazarusIDEStrConsts,
IDEOptionDefs, etFPCMsgParser, BasePkgManager, EnvironmentOpts;
@ -813,25 +814,30 @@ begin
end;
procedure TCodeBrowserView.InitImageList;
var
ImageSize: Integer;
begin
ImgIDDefault := Imagelist1.AddResourceName(HInstance, 'ce_default');
ImgIDProgramCode := Imagelist1.AddResourceName(HInstance, 'ce_program');
ImgIDUnitCode := Imagelist1.AddResourceName(HInstance, 'ce_unit');
ImgIDInterfaceSection := Imagelist1.AddResourceName(HInstance, 'ce_interface');
ImgIDImplementation := Imagelist1.AddResourceName(HInstance, 'ce_implementation');
ImgIDInitialization := Imagelist1.AddResourceName(HInstance, 'ce_initialization');
ImgIDFinalization := Imagelist1.AddResourceName(HInstance, 'ce_finalization');
ImgIDTypeSection := Imagelist1.AddResourceName(HInstance, 'ce_type');
ImgIDType := Imagelist1.AddResourceName(HInstance, 'ce_type');
ImgIDVarSection := Imagelist1.AddResourceName(HInstance, 'ce_variable');
ImgIDVariable := Imagelist1.AddResourceName(HInstance, 'ce_variable');
ImgIDConstSection := Imagelist1.AddResourceName(HInstance, 'ce_const');
ImgIDConst := Imagelist1.AddResourceName(HInstance, 'ce_const');
ImgIDClass := Imagelist1.AddResourceName(HInstance, 'ce_class');
ImgIDProc := Imagelist1.AddResourceName(HInstance, 'ce_procedure');
ImgIDProperty := Imagelist1.AddResourceName(HInstance, 'ce_property');
ImgIDPackage := Imagelist1.AddResourceName(HInstance, 'item_package');
ImgIDProject := Imagelist1.AddResourceName(HInstance, 'item_project');
ImageSize := TIDEImages.ScaledSize;
ImageList1.Width := ImageSize;
ImageList1.Height := ImageSize;
ImgIDDefault := TIDEImages.AddImageToImageList(Imagelist1, 'ce_default');
ImgIDProgramCode := TIDEImages.AddImageToImageList(Imagelist1, 'ce_program');
ImgIDUnitCode := TIDEImages.AddImageToImageList(Imagelist1, 'ce_unit');
ImgIDInterfaceSection := TIDEImages.AddImageToImageList(Imagelist1, 'ce_interface');
ImgIDImplementation := TIDEImages.AddImageToImageList(Imagelist1, 'ce_implementation');
ImgIDInitialization := TIDEImages.AddImageToImageList(Imagelist1, 'ce_initialization');
ImgIDFinalization := TIDEImages.AddImageToImageList(Imagelist1, 'ce_finalization');
ImgIDTypeSection := TIDEImages.AddImageToImageList(Imagelist1, 'ce_type');
ImgIDType := TIDEImages.AddImageToImageList(Imagelist1, 'ce_type');
ImgIDVarSection := TIDEImages.AddImageToImageList(Imagelist1, 'ce_variable');
ImgIDVariable := TIDEImages.AddImageToImageList(Imagelist1, 'ce_variable');
ImgIDConstSection := TIDEImages.AddImageToImageList(Imagelist1, 'ce_const');
ImgIDConst := TIDEImages.AddImageToImageList(Imagelist1, 'ce_const');
ImgIDClass := TIDEImages.AddImageToImageList(Imagelist1, 'ce_class');
ImgIDProc := TIDEImages.AddImageToImageList(Imagelist1, 'ce_procedure');
ImgIDProperty := TIDEImages.AddImageToImageList(Imagelist1, 'ce_property');
ImgIDPackage := TIDEImages.AddImageToImageList(Imagelist1, 'item_package');
ImgIDProject := TIDEImages.AddImageToImageList(Imagelist1, 'item_project');
end;
procedure TCodeBrowserView.SetScannedBytes(const AValue: PtrInt);

64
ide/codeexplorer.pas
View File

@ -199,6 +199,7 @@ type
ImgIDUnit: Integer;
ImgIDVariable: Integer;
ImgIDHint: Integer;
procedure AssignAllImages;
procedure ClearCodeTreeView;
procedure ClearDirectivesTreeView;
function GetCodeFilter: string;
@ -484,33 +485,7 @@ begin
CodeFilterEdit.TextHint:=lisCEFilter;
DirectivesFilterEdit.TextHint:=lisCEFilter;
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');
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');
AssignAllImages;
// assign the root TMenuItem to the registered menu root.
// This will automatically create all registered items
CodeExplorerMenuRoot.MenuItem:=TreePopupMenu.Items;
@ -738,6 +713,41 @@ begin
CheckOnIdle;
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;
CodeNode: TCodeTreeNode): string;
var

1
ide/componentlist.lfm
View File

@ -9,6 +9,7 @@ object ComponentListForm: TComponentListForm
KeyPreview = True
OnActivate = FormActivate
OnClose = FormClose
OnCreate = FormCreate
OnKeyDown = FormKeyDown
OnShow = FormShow
LCLVersion = '1.7'

6
ide/componentlist.pas
View File

@ -68,6 +68,7 @@ type
TreeFilterEd: TTreeFilterEdit;
procedure chbKeepOpenChange(Sender: TObject);
procedure FormActivate(Sender: TObject);
procedure FormCreate(Sender: TObject);
procedure FormShow(Sender: TObject);
procedure ListTreeSelectionChanged(Sender: TObject);
procedure miCollapseAllClick(Sender: TObject);
@ -235,6 +236,11 @@ begin
UpdateComponents;
end;
procedure TComponentListForm.FormCreate(Sender: TObject);
begin
TIDEImages.AssignImage(TreeFilterEd.Glyph, 'btnfiltercancel');
end;
procedure TComponentListForm.ClearSelection;
begin
ListTree.Selected := Nil;

4
ide/componentpalette.pas
View File

@ -347,9 +347,9 @@ begin
Align := alRight;
Caption := '';
BevelOuter := bvNone;
Width := OVERVIEW_PANEL_WIDTH;
Visible := True; // EnvironmentOptions.IDESpeedButtonsVisible;
Parent := PageComponent;
Width := Scale96ToForm(OVERVIEW_PANEL_WIDTH);
OnMouseWheel := @Pal.OnPageMouseWheel;
end;
BtnRight:=TSpeedButton.Create(PageComponent);
@ -357,13 +357,13 @@ begin
begin
TIDEImages.AssignImage(Glyph, 'SelCompPage');
Flat := True;
SetBounds(2,1,16,16);
Hint := lisClickToSelectPalettePage;
ShowHint := True;
OnMouseDown := @MainIDE.SelComponentPageButtonMouseDown;
OnClick := @MainIDE.SelComponentPageButtonClick;
OnMouseWheel := @Pal.OnPageMouseWheel;
Parent := PanelRight;
SetBounds(Scale96ToForm(2), Scale96ToForm(1), Scale96ToForm(16), Scale96ToForm(16));
end;
end
else begin

104
ide/comppagespopup.lfm
View File

@ -7,6 +7,7 @@ object DlgCompPagesPopup: TDlgCompPagesPopup
Caption = 'DlgCompPagesPopup'
ClientHeight = 536
ClientWidth = 293
OnCreate = FormCreate
OnDeactivate = FormDeactivate
OnShow = FormShow
LCLVersion = '1.5'
@ -60,42 +61,6 @@ object DlgCompPagesPopup: TDlgCompPagesPopup
Align = alRight
AutoSize = True
Flat = True
Glyph.Data = {
36040000424D3604000000000000360000002800000010000000100000000100
2000000000000004000064000000640000000000000000000000FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF000010DEFF0010DEFFFFFFFF00FFFFFF00FFFFFF000010
DEFF0010DEFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF000010DEFF0010DEFF0010DEFFFFFFFF000010DEFF0010
DEFF0010DEFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF000010DEFF0010DEFF0010DEFF0010DEFF0010
DEFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000010DEFF0010DEFF0010DEFFFFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF000010DEFF0010DEFF0010DEFF0010DEFF0010
DEFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF000010DEFF0010DEFF0010DEFFFFFFFF000010DEFF0010
DEFF0010DEFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF000010DEFF0010DEFFFFFFFF00FFFFFF00FFFFFF000010
DEFF0010DEFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00
}
OnClick = cBtnCloseClick
end
end
@ -103,72 +68,5 @@ object DlgCompPagesPopup: TDlgCompPagesPopup
object ImageList1: TImageList
left = 240
top = 40
Bitmap = {
4C69020000001000000010000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000
0000000000000000000000000000FFFFFF00999999FF999999FF999999FF9999
99FF999999FF999999FF999999FFFFFFFF00FFFFFF00FFFFFF00FFFFFF000000
0000000000000000000000000000FFFFFF00999999FFCEFFE7FFCEFFE7FFCEFF
E7FFCEFFE7FFCEFFE7FF999999FF202020FFFFFFFF00FFFFFF00FFFFFF000000
0000000000000000000000000000FFFFFF00999999FFCEFFE7FFCEFFE7FFCEFF
E7FFCEFFE7FFCEFFE7FF999999FFCEFFE7FF202020FFFFFFFF00FFFFFF000000
0000000000000000000000000000FFFFFF00999999FFCEFFE7FFCEFFE7FFCEFF
E7FFCEFFE7FFCEFFE7FF222827FF222827FF000000FF202020FFFFFFFF000000
0000000000000000000000000000FFFFFF00999999FFCEFFE7FFCEFFE7FFCEFF
E7FFCEFFE7FFCEFFE7FFCEFFE7FFCEFFE7FFCEFFE7FF000000FFFFFFFF000000
0000000000000000000000000000FFFFFF00999999FFCEFFE7FFCEFFE7FFCEFF
E7FFCEFFE7FFCEFFE7FFCEFFE7FFCEFFE7FFCEFFE7FF000000FFFFFFFF000000
0000000000000000000000000000FFFFFF00999999FFCEFFE7FFCEFFE7FFCEFF
E7FFCEFFE7FFCEFFE7FFCEFFE7FFCEFFE7FFCEFFE7FF000000FFFFFFFF000000
0000000000000000000000000000FFFFFF00999999FFCEFFE7FFCEFFE7FFCEFF
E7FFCEFFE7FFCEFFE7FFCEFFE7FFCEFFE7FFCEFFE7FF000000FFFFFFFF000000
0000000000000000000000000000FFFFFF00999999FFCEFFE7FFCEFFE7FFCEFF
E7FFCEFFE7FFCEFFE7FFCEFFE7FFCEFFE7FFCEFFE7FF000000FFFFFFFF000000
0000000000000000000000000000FFFFFF00999999FFCEFFE7FFCEFFE7FFCEFF
E7FFCEFFE7FFCEFFE7FFCEFFE7FFCEFFE7FFCEFFE7FF000000FFFFFFFF000000
0000000000000000000000000000FFFFFF00999999FFCEFFE7FFCEFFE7FFCEFF
E7FFCEFFE7FFCEFFE7FFCEFFE7FFCEFFE7FFCEFFE7FF000000FFFFFFFF000000
0000000000000000000000000000FFFFFF00999999FF000000FF000000FF0000
00FF000000FF000000FF000000FF000000FF000000FF000000FFFFFFFF000000
0000000000000000000000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00D6D6D6FF929292FF6F7070FF6F70
70FF6F7070FF7F7F7FFFBBBBBBFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF007F7F7FFFBDEEF3FFDCFFFFFFDCFF
FFFFDCFFFFFFDCFFFFFF6F888BFF6F7070FF6F7070FF6F7070FF6F7070FF6F70
70FF929292FFE3E3E3FFFFFFFF00FFFFFF005F5F5FFFB9FBFFFF6DE0EBFF6DE0
EBFF6DE0EBFF8AE6F0FFBEFFFFFFBEFFFFFFBEFFFFFFBEFFFFFFBEFFFFFFBEFF
FFFF88C9D0FF7F7F7FFFFFFFFF00FFFFFF00555555FF8DE0E9FF6DDBE6FF6DDB
E6FF49A3ADFF34858BFF34858BFF34858BFF34858BFF34858BFF34858BFF3485
8BFF34858BFF5F5F5FFFFFFFFF00FFFFFF004C4C4CFF31747DFF276D75FF276D
75FF31747DFF6CB9C1FFBEFFFFFFBEFFFFFFBEFFFFFFBEFFFFFFBEFFFFFFBEFF
FFFFA3EEF4FF4C4C4CFFFFFFFF00FFFFFF00414141FFB6F3F9FFAAFCFFFFAAFC
FFFFAAFCFFFF8BF0F8FF6DE0EBFF6DE0EBFF6DE0EBFF6DE0EBFF6DE0EBFF6DE0
EBFF6DE0EBFF414141FFFFFFFF00FFFFFF00313131FF8AE6F0FF72E4EEFF72E4
EEFF72E4EEFF72E4EEFF72E4EEFF72E4EEFF72E4EEFF72E4EEFF72E4EEFF72E4
EEFF6DDBE6FF313131FFFFFFFF00FFFFFF00222222FF6DDBE6FF7AE8F1FF7AE8
F1FF7AE8F1FF7AE8F1FF7AE8F1FF7AE8F1FF7AE8F1FF7AE8F1FF7AE8F1FF7AE8
F1FF6DDBE6FF222222FFFFFFFF00FFFFFF00000000FF8AE6F0FF95F4FBFF95F4
FBFF95F4FBFF95F4FBFF95F4FBFF95F4FBFF95F4FBFF95F4FBFF95F4FBFF95F4
FBFF8AE6F0FF000000FFFFFFFF00FFFFFF000B0B0BFF67ABABFF95F4FBFF97F1
F3FF97F1F3FF97F1F3FF97F1F3FF97F1F3FF97F1F3FF97F1F3FF97F1F3FF97F1
F3FF67ABABFF0B0B0BFFFFFFFF00FFFFFF00555555FF000000FF000000FF0000
00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
00FF000000FF555555FFFFFFFF00FFFFFF00D6D6D6FF888888FF5F5F5FFF5555
55FF555555FF555555FF555555FF555555FF555555FF555555FF555555FF5F5F
5FFF888888FFD6D6D6FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00F1F1F1FFF1F1
F1FFF1F1F1FFF1F1F1FFF1F1F1FFF1F1F1FFF1F1F1FFF1F1F1FFF1F1F1FFF1F1
F1FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00
}
end
end

16
ide/comppagespopup.pas
View File

@ -34,8 +34,9 @@ unit CompPagesPopup;
interface
uses
Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
ExtCtrls, Buttons, MainBar, LazarusIDEStrConsts, LCLIntf, LMessages;
Classes, SysUtils, FileUtil, IDEImagesIntf, Forms, Controls, Graphics,
Dialogs, ComCtrls, ExtCtrls, Buttons, MainBar, LazarusIDEStrConsts, LCLIntf,
LMessages;
type
@ -48,6 +49,7 @@ type
Panel2: TPanel;
TreeView1: TTreeView;
procedure cBtnCloseClick(Sender: TObject);
procedure FormCreate(Sender: TObject);
procedure FormDeactivate(Sender: TObject);
procedure FormShow(Sender: TObject);
procedure TreeView1Click(Sender: TObject);
@ -105,6 +107,16 @@ begin
Close;
end;
procedure TDlgCompPagesPopup.FormCreate(Sender: TObject);
begin
TIDEImages.AssignImage(cBtnClose.Glyph, 'menu_close');
ImageList1.Width := TIDEImages.ScaledSize;
ImageList1.Height := TIDEImages.ScaledSize;
TIDEImages.AddImageToImageList(ImageList1, 'item_package');
TIDEImages.AddImageToImageList(ImageList1, 'pkg_open');
end;
procedure TDlgCompPagesPopup.DoClose(var CloseAction: TCloseAction);
begin
inherited DoClose(CloseAction);

1
ide/editorfilemanager.pas
View File

@ -118,6 +118,7 @@ begin
OpenButton.Hint:=lisActivateSelected;
SortAlphabeticallyButton.Hint:=lisPESortFilesAlphabetically;
TIDEImages.AssignImage(SortAlphabeticallyButton.Glyph, 'pkg_sortalphabetically');
TIDEImages.AssignImage(FilterEdit.Glyph, 'btnfiltercancel');
end;
procedure TEditorFileManagerForm.CheckListBox1Click(Sender: TObject);

3
ide/frames/compiler_messages_options.pas
View File

@ -7,7 +7,7 @@ interface
uses
Classes, SysUtils, FileUtil, LazFileCache, LazLoggerBase, ListFilterEdit,
StdCtrls, CheckLst, Dialogs, IDEOptionsIntf, IDEExternToolIntf,
IDEDialogs, CompOptsIntf, CodeToolsFPCMsgs, CompilerOptions,
IDEDialogs, CompOptsIntf, IDEImagesIntf, CodeToolsFPCMsgs, CompilerOptions,
LazarusIDEStrConsts, etFPCMsgParser;
type
@ -102,6 +102,7 @@ begin
UseMsgFileCheckBox.Visible:=false;
MsgFileEdit.Visible:=false;
MsgFileBrowseButton.Visible:=false;
TIDEImages.AssignImage(editMsgFilter.Glyph, 'btnfiltercancel');
end;
destructor TCompilerMessagesOptionsFrame.Destroy;

1
ide/frames/editor_display_options.lfm
View File

@ -340,7 +340,6 @@ object EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
Height = 36
Top = 72
Width = 195
Anchors = [akTop, akLeft, akBottom]
BorderSpacing.Around = 6
Caption = 'DisableAntialiasingCheckBox'
OnChange = GeneralCheckBoxOnChange

1
ide/frames/editor_keymapping_options.pas
View File

@ -188,6 +188,7 @@ begin
EditButton.Enabled:=false;
ClearButton.Enabled:=false;
fModified:=False;
TIDEImages.AssignImage(FilterEdit.Glyph, 'btnfiltercancel');
end;
destructor TEditorKeymappingOptionsFrame.Destroy;

1
ide/ideoptionsdlg.lfm
View File

@ -9,6 +9,7 @@ object IDEOptionsDialog: TIDEOptionsDialog
ClientWidth = 800
Constraints.MinHeight = 350
Constraints.MinWidth = 500
OnCreate = FormCreate
OnShow = FormShow
Position = poScreenCenter
LCLVersion = '1.9.0.0'

7
ide/ideoptionsdlg.pas
View File

@ -35,6 +35,7 @@ uses
Dialogs, TreeFilterEdit,
// IdeIntf
IDEWindowIntf, IDEOptionsIntf, IDECommands, IDEHelpIntf, ProjectIntf,
IDEImagesIntf,
// IDE
EnvironmentOpts, EditorOptions, BuildModesManager, Compiler_ModeMatrix,
Project, LazarusIDEStrConsts,
@ -64,6 +65,7 @@ type
EditorsPanel: TScrollBox;
FilterEdit: TTreeFilterEdit;
SettingsPanel: TPanel;
procedure FormCreate(Sender: TObject);
procedure UseBuildModeCheckBoxChange(Sender: TObject);
procedure BuildModeComboBoxSelect(Sender: TObject);
procedure BuildModeManageButtonClick(Sender: TObject);
@ -233,6 +235,11 @@ begin
UpdateBuildModeButtons;
end;
procedure TIDEOptionsDialog.FormCreate(Sender: TObject);
begin
TIDEImages.AssignImage(FilterEdit.Glyph, 'btnfiltercancel');
end;
procedure TIDEOptionsDialog.BuildModeComboBoxSelect(Sender: TObject);
begin
if AllBuildModes then begin

1
ide/projectinspector.lfm
View File

@ -8,6 +8,7 @@ object ProjectInspectorForm: TProjectInspectorForm
Caption = 'ProjectInspectorForm'
ClientHeight = 456
ClientWidth = 299
OnCreate = FormCreate
OnDropFiles = FormDropFiles
LCLVersion = '1.7'
object ItemsTreeView: TTreeView

6
ide/projectinspector.pas
View File

@ -111,6 +111,7 @@ type
procedure CopyMoveToDirMenuItemClick(Sender: TObject);
procedure DirectoryHierarchyButtonClick(Sender: TObject);
procedure FilterEditKeyDown(Sender: TObject; var Key: Word; {%H-}Shift: TShiftState);
procedure FormCreate(Sender: TObject);
procedure FormDropFiles(Sender: TObject; const FileNames: array of String);
procedure ItemsPopupMenuPopup(Sender: TObject);
procedure ItemsTreeViewAdvancedCustomDrawItem(Sender: TCustomTreeView;
@ -542,6 +543,11 @@ begin
end;
end;
procedure TProjectInspectorForm.FormCreate(Sender: TObject);
begin
TIDEImages.AssignImage(FilterEdit.Glyph, 'btnfiltercancel');
end;
procedure TProjectInspectorForm.FormDropFiles(Sender: TObject;
const FileNames: array of String);
var

1
ide/restrictionbrowser.pas
View File

@ -112,6 +112,7 @@ begin
end;
end;
FilterEdit.OnAfterFilter := @SelectFirstVisible;
TIDEImages.AssignImage(FilterEdit.Glyph, 'btnfiltercancel');
UpdateIssueList;
end;

3
ide/searchresultview.lfm
View File

@ -62,6 +62,8 @@ object SearchResultsView: TSearchResultsView
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = ToolBar
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 63
Height = 23
Top = 1
@ -70,6 +72,7 @@ object SearchResultsView: TSearchResultsView
ButtonWidth = 23
NumGlyphs = 1
BorderSpacing.Left = 6
Anchors = [akTop, akLeft, akRight]
MaxLength = 0
TabOrder = 0
OnChange = SearchInListChange

14
ide/searchresultview.pp
View File

@ -283,8 +283,6 @@ end;
procedure TSearchResultsView.Form1Create(Sender: TObject);
var
CloseCommand: TIDECommand;
ScaledIcon: TGraphic;
NewScaledIcon: Boolean;
begin
FMaxItems:=50000;
ResultsNoteBook.Options:= ResultsNoteBook.Options+[nboShowCloseButtons];
@ -320,17 +318,7 @@ begin
ClosePageButton.ImageIndex := IDEImages.LoadImage('menu_close');
ActionList.Images := IDEImages.Images_16;
actClosePage.ImageIndex := IDEImages.LoadImage('menu_close');
ScaledIcon := TIDEImages.ScaleImage(SearchInListEdit.Glyph, NewScaledIcon,
MulDiv(SearchInListEdit.Glyph.Width, TIDEImages.GetScalePercent, 100),
MulDiv(SearchInListEdit.Glyph.Height, TIDEImages.GetScalePercent, 100),
TIDEImages.GetScalePercent / 100);
try
SearchInListEdit.Glyph.Assign(ScaledIcon);
finally
if NewScaledIcon then
ScaledIcon.Free;
end;
TIDEImages.AssignImage(SearchInListEdit.Glyph, 'btnfiltercancel');
end;
procedure TSearchResultsView.FormClose(Sender: TObject; var CloseAction: TCloseAction);

10
ide/sourcemarks.pas
View File

@ -44,7 +44,7 @@ uses
// SynEdit
SynEdit, SynEditMarks, SynEditMarkupGutterMark,
// IdeIntf
MenuIntf, SrcEditorIntf, IDEExternToolIntf,
MenuIntf, SrcEditorIntf, IDEExternToolIntf, IDEImagesIntf,
// IDE
etSrcEditMarks;
@ -543,11 +543,13 @@ var
ImgIDWarning: Integer;
ImgIDNote: Integer;
ImgIDHint: Integer;
ImgListSize: Integer;
begin
// create default mark icons
ImgList:=TImageList.Create(Self);
ImgList.Width:=11;
ImgList.Height:=11;
ImgListSize := TIDEImages.ScaledSize(11);
ImgList.Width := ImgListSize;
ImgList.Height := ImgListSize;
// synedit expects the first 10 icons for the bookmarks
for i := 0 to 9 do
@ -808,7 +810,7 @@ end;
function TSourceMarks.AddImage(const ResName: string): integer;
begin
Result := ImgList.AddResourceName(HInstance, Resname);
Result := TIDEImages.AddImageToImageList(ImgList, Resname, 11);
end;
initialization

1
ide/toolbarconfig.pas
View File

@ -194,6 +194,7 @@ begin
TIDEImages.AssignImage(btnMoveUp.Glyph, 'arrow__darkgreen_up');
TIDEImages.AssignImage(btnMoveDown.Glyph, 'arrow__darkgreen_down');
TIDEImages.AssignImage(btnAddDivider.Glyph, 'menu_divider16');
TIDEImages.AssignImage(FilterEdit.Glyph, 'btnfiltercancel');
btnAddDivider.Caption := '---';

1
ide/useunitdlg.pas
View File

@ -194,6 +194,7 @@ begin
ButtonPanel1.OKButton.Caption:=lisMenuOk;
ButtonPanel1.CancelButton.Caption:=lisCancel;
UnitImgInd := IDEImages.LoadImage('item_unit');
TIDEImages.AssignImage(FilterEdit.Glyph, 'btnfiltercancel');
FProjUnits:=TStringList.Create;
end;

1
ide/viewunit_dlg.pp
View File

@ -323,6 +323,7 @@ begin
ButtonPanel.CancelButton.Caption:=lisCancel;
SortAlphabeticallySpeedButton.Hint:=lisPESortFilesAlphabetically;
TIDEImages.AssignImage(SortAlphabeticallySpeedButton.Glyph, 'pkg_sortalphabetically');
TIDEImages.AssignImage(FilterEdit.Glyph, 'btnfiltercancel');
end;
procedure TViewUnitDialog.FormDestroy(Sender: TObject);

1
lcl/comctrls.pp
View File

@ -3254,6 +3254,7 @@ type
FExpandSignSize: integer;
FThemeExpandSignSize: integer;
FDefItemHeight: integer;
FDefItemSpace: Integer;
FDragImage: TDragImageList;
FDragNode: TTreeNode;
FIndent: integer;

45
lcl/grids.pas
View File

@ -180,13 +180,20 @@ type
const
soAll: TSaveOptions = [soDesign, soAttributes, soContent, soPosition];
constRubberSpace: byte = 2;
constCellPadding: byte = 3;
DefaultGridOptions = [goFixedVertLine, goFixedHorzLine,
goVertLine, goHorzLine, goRangeSelect, goSmoothScroll ];
DefaultGridOptions2 = [];
constRubberSpace: byte = 2;
constCellPadding: byte = 3;
constColRowBorderTolerance: byte = 3;
var
// Values to be used after HighDPI scaling
varRubberSpace: byte;
varCellpadding: byte;
varColRowBorderTolerance: byte;
type
@ -2021,12 +2028,12 @@ procedure DrawRubberRect(Canvas: TCanvas; aRect: TRect; Color: TColor;
if Y2<Y1 then
while Y2<Y1 do begin
Canvas.Pixels[X1, Y1] := Color;
dec(Y1, constRubberSpace);
dec(Y1, varRubberSpace);
end
else
while Y1<Y2 do begin
Canvas.Pixels[X1, Y1] := Color;
inc(Y1, constRubberSpace);
inc(Y1, varRubberSpace);
end;
end;
procedure DrawHorzLine(X1,Y1,X2: integer);
@ -2034,12 +2041,12 @@ procedure DrawRubberRect(Canvas: TCanvas; aRect: TRect; Color: TColor;
if X2<X1 then
while X2<X1 do begin
Canvas.Pixels[X1, Y1] := Color;
dec(X1, constRubberSpace);
dec(X1, varRubberSpace);
end
else
while X1<X2 do begin
Canvas.Pixels[X1, Y1] := Color;
inc(X1, constRubberSpace);
inc(X1, varRubberSpace);
end;
end;
begin
@ -3926,7 +3933,7 @@ begin
txt2 := GetTruncCellHintText(cell.x, cell.y);
gds := GetGridDrawState(cell.x, cell.y);
PrepareCanvas(cell.x, cell.y, gds);
w := Canvas.TextWidth(txt2) + constCellPadding*2;
w := Canvas.TextWidth(txt2) + varCellPadding*2;
if w < ColWidths[cell.x] then
txt2 := '';
end;
@ -4418,14 +4425,14 @@ end;
procedure TCustomGrid.DrawCellText(aCol, aRow: Integer; aRect: TRect;
aState: TGridDrawState; aText: String);
begin
dec(ARect.Right, constCellPadding);
dec(ARect.Right, varCellPadding);
case Canvas.TextStyle.Alignment of
Classes.taLeftJustify: Inc(ARect.Left, constCellPadding);
Classes.taLeftJustify: Inc(ARect.Left, varCellPadding);
Classes.taRightJustify: Dec(ARect.Right, 1);
end;
case Canvas.TextStyle.Layout of
tlTop: Inc(ARect.Top, constCellPadding);
tlBottom: Dec(ARect.Bottom, constCellPadding);
tlTop: Inc(ARect.Top, varCellPadding);
tlBottom: Dec(ARect.Bottom, varCellPadding);
end;
if ARect.Right<ARect.Left then
@ -4467,8 +4474,8 @@ begin
CSize.cy := MulDiv(CSize.cy, Font.PixelsPerInch, Screen.PixelsPerInch);
case bmpAlign of
taCenter: PaintRect.Left := Trunc((aRect.Left + aRect.Right - CSize.cx)/2);
taLeftJustify: PaintRect.Left := ARect.Left + constCellPadding;
taRightJustify: PaintRect.Left := ARect.Right - CSize.Cx - constCellPadding - 1;
taLeftJustify: PaintRect.Left := ARect.Left + varCellPadding;
taRightJustify: PaintRect.Left := ARect.Right - CSize.Cx - varCellPadding - 1;
end;
PaintRect.Top := Trunc((aRect.Top + aRect.Bottom - CSize.cy)/2);
PaintRect := Bounds(PaintRect.Left, PaintRect.Top, CSize.cx, CSize.cy);
@ -4478,8 +4485,8 @@ begin
if ChkBitmap<>nil then begin
case bmpAlign of
taCenter: XPos := Trunc((aRect.Left+aRect.Right-ChkBitmap.Width)/2);
taLeftJustify: XPos := ARect.Left + constCellPadding;
taRightJustify: XPos := ARect.Right - ChkBitmap.Width - constCellPadding - 1;
taLeftJustify: XPos := ARect.Left + varCellPadding;
taRightJustify: XPos := ARect.Right - ChkBitmap.Width - varCellPadding - 1;
end;
YPos := Trunc((aRect.Top+aRect.Bottom-ChkBitmap.Height)/2);
Canvas.Draw(XPos, YPos, ChkBitmap);
@ -5675,7 +5682,7 @@ begin
end;
// check if cursor is near boundary and it's a valid column
if (Abs(Offset-x)<=2) then begin
if (Abs(Offset-x)<=varColRowBorderTolerance) then begin
if goFixedColSizing in Options then
Offset := 0
else
@ -5747,7 +5754,7 @@ begin
// check if it's not fixed row and if cursor is close enough to
// selected boundary
if (Index>=FFixedRows)and(Abs(Offset-Y)<=2) then begin
if (Index>=FFixedRows)and(Abs(Offset-Y)<=varColRowBorderTolerance) then begin
// start resizing
if Cursor<>crVSplit then begin
ChangeCursor(crVSplit);
@ -9397,6 +9404,10 @@ begin
FUnCheckedBitmap := LoadResBitmapImage('dbgriduncheckedcb');
FCheckedBitmap := LoadResBitmapImage('dbgridcheckedcb');
FGrayedBitmap := LoadResBitmapImage('dbgridgrayedcb');
varRubberSpace := MulDiv(constRubberSpace, Screen.PixelsPerInch, 96);
varCellPadding := MulDiv(constCellPadding, Screen.PixelsPerInch, 96);
varColRowBorderTolerance := MulDiv(constColRowBorderTolerance, Screen.PixelsPerInch, 96);
end;
destructor TCustomGrid.Destroy;

29
lcl/include/treeview.inc
View File

@ -1712,7 +1712,7 @@ begin
TV := TreeView;
if (TV = nil) or (TV.StateImages = nil) then Exit;
if (StateIndex < 0) or (StateIndex >= TV.StateImages.Count) then Exit;
Inc(Result, TV.StateImages.Width + 2);
Inc(Result, TV.StateImages.Width + TV.FDefItemSpace);
end;
function TTreeNode.DisplayStateIconLeft: integer;
@ -1733,7 +1733,7 @@ begin
else
ImgIndex:=ImageIndex;
if (ImgIndex<0) or (ImgIndex>=TV.Images.Count) then Exit;
Inc(Result, TV.Images.Width + 2);
Inc(Result, TV.Images.Width + TV.FDefItemSpace);
end;
function TTreeNode.DisplayTextRight: integer;
@ -3209,6 +3209,7 @@ begin
ParentColor := False;
// FBackgroundColor := clWindow;
FDefItemHeight := DefaultTreeNodeHeight;
FDefItemSpace := ScaleY(2, 96);
FExpandSignType := tvestTheme;
FExpandSignSize := -1;
Details := ThemeServices.GetElementDetails(ttGlyphOpened);
@ -3574,12 +3575,12 @@ var
begin
if (tvoAutoItemHeight in FOptions)
and HandleAllocated and Canvas.HandleAllocated then begin
NewDefItemHeight:=Canvas.TextHeight(TVAutoHeightString)+2; // +2 for spacing
if NewDefItemHeight<2 then NewDefItemHeight:=2;
if (Images<>nil) and (Images.Height>NewDefItemHeight) then
NewDefItemHeight:=Images.Height;
if (StateImages<>nil) and (StateImages.Height>NewDefItemHeight) then
NewDefItemHeight:=StateImages.Height;
NewDefItemHeight:=Canvas.TextHeight(TVAutoHeightString)+FDefItemSpace;
if NewDefItemHeight<FDefItemSpace then NewDefItemHeight:=FDefItemSpace;
if (Images<>nil) and (Images.Height+FDefItemSpace>NewDefItemHeight) then
NewDefItemHeight:=Images.Height+FDefItemSpace;
if (StateImages<>nil) and (StateImages.Height+FDefItemSpace>NewDefItemHeight) then
NewDefItemHeight:=StateImages.Height+FDefItemSpace;
if Odd(NewDefItemHeight) then Inc(NewDefItemHeight);
if NewDefItemHeight<>FDefItemHeight then begin
FDefItemHeight:=NewDefItemHeight;
@ -5215,7 +5216,7 @@ begin
if PaintImages then
StateImages.Draw(Canvas, x + 1, (NodeRect.Top + NodeRect.Bottom - StateImages.Height) div 2,
Node.StateIndex, True);
Inc(x, StateImages.Width + 2);
Inc(x, StateImages.Width + FDefItemSpace);
end;
end;
@ -5257,7 +5258,7 @@ begin
ImgIndex, Node.FNodeEffect);
end;
end;
Inc(x, Images.Width + 2);
Inc(x, Images.Width + FDefItemSpace);
end;
end;
@ -5699,8 +5700,8 @@ begin
if Images <> nil then begin
Images.RegisterChanges(FImageChangeLink);
Images.FreeNotification(Self);
if DefaultItemHeight<Images.Height+2 then
DefaultItemHeight:=Images.Height+2;
if DefaultItemHeight<Images.Height+FDefItemSpace then
DefaultItemHeight:=Images.Height+FDefItemSpace;
end;
Invalidate;
end;
@ -5737,8 +5738,8 @@ begin
if StateImages <> nil then begin
StateImages.RegisterChanges(FStateChangeLink);
StateImages.FreeNotification(Self);
if DefaultItemHeight<StateImages.Height+2 then
DefaultItemHeight:=StateImages.Height+2;
if DefaultItemHeight<StateImages.Height+FDefItemSpace then
DefaultItemHeight:=StateImages.Height+FDefItemSpace;
end;
Invalidate;
end;

3
packager/addpkgdependencydlg.pas
View File

@ -11,7 +11,7 @@ uses
// LazControls
ListFilterEdit,
// IDEIntf
IDEWindowIntf, PackageDependencyIntf, PackageIntf, IDEDialogs,
IDEWindowIntf, PackageDependencyIntf, PackageIntf, IDEDialogs, IDEImagesIntf,
// IDE
LazarusIDEStrConsts, PackageDefs, PackageSystem, ProjPackCommon, ProjPackChecks;
@ -80,6 +80,7 @@ begin
Caption:=lisProjAddNewRequirement;
fPackages:=TAVLTree.Create(@CompareLazPackageIDNames);
IDEDialogLayoutList.ApplyLayout(Self,400,360);
TIDEImages.AssignImage(DependPkgNameFilter.Glyph, 'btnfiltercancel');
DependPkgNameLabel.Caption:=lisProjAddPackageName;
DependMinVersionLabel.Caption:=lisProjAddMinimumVersionOptional;

2
packager/installpkgsetdlg.pas
View File

@ -227,6 +227,8 @@ begin
SaveAndExitButton.Caption:=lisSaveAndExitDialog;
HelpButton.Caption:=lisMenuHelp;
CancelButton.Caption:=lisCancel;
TIDEImages.AssignImage(AvailableFilterEdit.Glyph, 'btnfiltercancel');
TIDEImages.AssignImage(InstalledFilterEdit.Glyph, 'btnfiltercancel');
FNewInstalledPackages:=TObjectList.Create(true);
PkgInfoMemo.Clear;

1
packager/packageeditor.pas
View File

@ -1443,6 +1443,7 @@ begin
SetupComponents;
SortAlphabetically := EnvironmentOptions.PackageEditorSortAlphabetically;
ShowDirectoryHierarchy := EnvironmentOptions.PackageEditorShowDirHierarchy;
TIDEImages.AssignImage(FilterEdit.Glyph, 'btnfiltercancel');
end;
procedure TPackageEditorForm.FormDestroy(Sender: TObject);