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

LCL: Activate ImageIndexPropertyEditor for grids (Columns[].Title.ImageIndex, ImageIndexSortAsc/Desc)

Browse Source 
git-svn-id: trunk@54762 -
This commit is contained in:
wp 2017-04-27 22:47:29 +00:00
parent fa61032594
commit 093242498d
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/ideintf/graphpropedits.pas
View File

@ -772,7 +772,9 @@ initialization
RegisterPropertyEditor(TypeInfo(TBrushStyle), nil, '', TBrushStylePropertyEditor);
RegisterPropertyEditor(TypeInfo(AnsiString), TFont, 'Name', TFontNamePropertyEditor);
RegisterPropertyEditor(TypeInfo(TFontCharset), nil, 'CharSet', TFontCharsetPropertyEditor);
RegisterPropertyEditor(TypeInfo(TImageIndex), TComponent, 'ImageIndex', TImageIndexPropertyEditor);
RegisterPropertyEditor(TypeInfo(TImageIndex), TPersistent, 'ImageIndex', TImageIndexPropertyEditor);
RegisterPropertyEditor(TypeInfo(TImageIndex), TComponent, 'ImageIndexSortAsc', TImageIndexPropertyEditor);
RegisterPropertyEditor(TypeInfo(TImageIndex), TComponent, 'ImageIndexSortDesc', TImageIndexPropertyEditor);
RegisterPropertyEditor(ClassTypeInfo(TFont), nil,'',TFontPropertyEditor);
RegisterPropertyEditor(ClassTypeInfo(TGraphic), nil,'',TGraphicPropertyEditor);
RegisterPropertyEditor(ClassTypeInfo(TPicture), nil,'',TPicturePropertyEditor);

18
lcl/grids.pas
View File

@ -37,7 +37,7 @@ uses
Classes, SysUtils, Types, TypInfo, Math, FPCanvas,
// LCL
LCLStrConsts, LCLProc, LCLType, LCLIntf, Controls, GraphType, Graphics, Forms,
LMessages, StdCtrls, LResources, MaskEdit, Buttons, Clipbrd, Themes,
LMessages, StdCtrls, LResources, MaskEdit, Buttons, Clipbrd, Themes, imglist,
// LazUtils
LazFileUtils, DynamicArray, Maps, LazUTF8, LazUtf8Classes, Laz2_XMLCfg, LCSVUtils
{$ifdef WINDOWS}
@ -423,7 +423,7 @@ type
FColor: ^TColor;
FAlignment: ^TAlignment;
FFont: TFont;
FImageIndex: Integer;
FImageIndex: TImageIndex;
FOldImageIndex: Integer;
FImageLayout: TButtonLayout;
FIsDefaultTitleFont: boolean;
@ -444,7 +444,7 @@ type
procedure SetAlignment(const AValue: TAlignment);
procedure SetColor(const AValue: TColor);
procedure SetFont(const AValue: TFont);
procedure SetImageIndex(const AValue: Integer);
procedure SetImageIndex(const AValue: TImageIndex);
procedure SetImageLayout(const AValue: TButtonLayout);
procedure SetLayout(const AValue: TTextLayout);
procedure SetMultiLine(const AValue: Boolean);
@ -473,7 +473,7 @@ type
property Caption: TCaption read GetCaption write SetCaption stored IsCaptionStored;
property Color: TColor read GetColor write SetColor stored IsColorStored;
property Font: TFont read GetFont write SetFont stored IsFontStored;
property ImageIndex: Integer read FImageIndex write SetImageIndex default -1;
property ImageIndex: TImageIndex read FImageIndex write SetImageIndex default -1;
property ImageLayout: TButtonLayout read FImageLayout write SetImageLayout default blGlyphRight;
property Layout: TTextLayout read GetLayout write SetLayout stored IsLayoutStored;
property MultiLine: Boolean read FMultiLine write SetMultiLine default false;
@ -720,8 +720,8 @@ type
FTabAdvance: TAutoAdvance;
FTitleImageList: TImageList;
FTitleStyle: TTitleStyle;
FAscImgInd: Integer;
FDescImgInd: Integer;
FAscImgInd: TImageIndex;
FDescImgInd: TImageIndex;
FOnCompareCells: TOnCompareCells;
FGridLineStyle: TPenStyle;
FGridLineWidth: Integer;
@ -1174,8 +1174,8 @@ type
property GridWidth: Integer read FGCache.GridWidth;
property HeaderHotZones: TGridZoneSet read FHeaderHotZones write FHeaderHotZones default [gzFixedCols];
property HeaderPushZones: TGridZoneSet read FHeaderPushZones write FHeaderPushZones default [gzFixedCols];
property ImageIndexSortAsc: Integer read FAscImgInd write FAscImgInd default -1;
property ImageIndexSortDesc: Integer read FDescImgInd write FDescImgInd default -1;
property ImageIndexSortAsc: TImageIndex read FAscImgInd write FAscImgInd default -1;
property ImageIndexSortDesc: TImageIndex read FDescImgInd write FDescImgInd default -1;
property TabAdvance: TAutoAdvance read FTabAdvance write FTabAdvance default aaRightDown;
property TitleImageList: TImageList read FTitleImageList write SetTitleImageList;
property InplaceEditor: TWinControl read FEditor;
@ -11407,7 +11407,7 @@ begin
FFont.Assign(AValue);
end;
procedure TGridColumnTitle.SetImageIndex(const AValue: Integer);
procedure TGridColumnTitle.SetImageIndex(const AValue: TImageIndex);
begin
if FImageIndex = AValue then exit;
FImageIndex := AValue;