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

VirtualTreeView: LCL scaling of column widths

Browse Source 
git-svn-id: trunk@59403 -
This commit is contained in:
wp 2018-10-31 17:28:54 +00:00
parent 8c8f4b60c2
commit 1ed37fa154
1 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
components/virtualtreeview/VirtualTrees.pas
View File

@ -235,6 +235,7 @@ const
{$endif} {$endif}
DEFAULT_CHECK_WIDTH = 16; DEFAULT_CHECK_WIDTH = 16;
DEFAULT_COLUMN_WIDTH = 50;
DEFAULT_HEADER_HEIGHT = 19; DEFAULT_HEADER_HEIGHT = 19;
DEFAULT_NODE_HEIGHT = 18; DEFAULT_NODE_HEIGHT = 18;
@ -987,6 +988,7 @@ type
function IsBiDiModeStored: Boolean; function IsBiDiModeStored: Boolean;
function IsCaptionAlignmentStored: Boolean; function IsCaptionAlignmentStored: Boolean;
function IsColorStored: Boolean; function IsColorStored: Boolean;
function IsWidthStored: Boolean;
procedure SetAlignment(const Value: TAlignment); procedure SetAlignment(const Value: TAlignment);
procedure SetBiDiMode(Value: TBiDiMode); procedure SetBiDiMode(Value: TBiDiMode);
procedure SetCaptionAlignment(const Value: TAlignment); procedure SetCaptionAlignment(const Value: TAlignment);
@ -1054,7 +1056,7 @@ type
property Style: TVirtualTreeColumnStyle read FStyle write SetStyle default vsText; property Style: TVirtualTreeColumnStyle read FStyle write SetStyle default vsText;
property Tag: NativeInt read FTag write FTag default 0; property Tag: NativeInt read FTag write FTag default 0;
property Text: TTranslateString read GetText write SetText; property Text: TTranslateString read GetText write SetText;
property Width: Integer read FWidth write SetWidth default 50; property Width: Integer read FWidth write SetWidth stored IsWidthStored;
end; end;
TVirtualTreeColumnClass = class of TVirtualTreeColumn; TVirtualTreeColumnClass = class of TVirtualTreeColumn;
@ -1079,6 +1081,7 @@ type
function GetItem(Index: TColumnIndex): TVirtualTreeColumn; function GetItem(Index: TColumnIndex): TVirtualTreeColumn;
function GetNewIndex(P: TPoint; var OldIndex: TColumnIndex): Boolean; function GetNewIndex(P: TPoint; var OldIndex: TColumnIndex): Boolean;
function IsDefaultWidthStored: Boolean;
procedure SetDefaultWidth(Value: Integer); procedure SetDefaultWidth(Value: Integer);
procedure SetItem(Index: TColumnIndex; Value: TVirtualTreeColumn); procedure SetItem(Index: TColumnIndex; Value: TVirtualTreeColumn);
protected protected
@ -1143,7 +1146,7 @@ type
function TotalWidth: Integer; function TotalWidth: Integer;
property ClickIndex: TColumnIndex read FClickIndex; property ClickIndex: TColumnIndex read FClickIndex;
property DefaultWidth: Integer read FDefaultWidth write SetDefaultWidth default 50; property DefaultWidth: Integer read FDefaultWidth write SetDefaultWidth stored IsDefaultWidthStored;
property Items[Index: TColumnIndex]: TVirtualTreeColumn read GetItem write SetItem; default; property Items[Index: TColumnIndex]: TVirtualTreeColumn read GetItem write SetItem; default;
property Header: TVTHeader read FHeader; property Header: TVTHeader read FHeader;
property TrackIndex: TColumnIndex read FTrackIndex; property TrackIndex: TColumnIndex read FTrackIndex;
@ -6803,6 +6806,7 @@ begin
FWidth := Owner.FDefaultWidth; FWidth := Owner.FDefaultWidth;
FLastWidth := Owner.FDefaultWidth; FLastWidth := Owner.FDefaultWidth;
//lcl: setting FPosition here will override the Design time value //lcl: setting FPosition here will override the Design time value
//FPosition := Owner.Count - 1; //FPosition := Owner.Count - 1;
// Read parent bidi mode and color values as default values. // Read parent bidi mode and color values as default values.
@ -6916,6 +6920,13 @@ end;
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
function TVirtualTreeColumn.IsWidthStored: Boolean;
begin
Result := FWidth <> Owner.DefaultWidth;
end;
//----------------------------------------------------------------------------------------------------------------------
procedure TVirtualTreeColumn.SetAlignment(const Value: TAlignment); procedure TVirtualTreeColumn.SetAlignment(const Value: TAlignment);
begin begin
@ -7932,7 +7943,11 @@ begin
FClickIndex := NoColumn; FClickIndex := NoColumn;
FDropTarget := NoColumn; FDropTarget := NoColumn;
FTrackIndex := NoColumn; FTrackIndex := NoColumn;
FDefaultWidth := 50; {$IF LCL_FullVersion >= 1080000}
FDefaultWidth := Header.TreeView.Scale96ToFont(DEFAULT_COLUMN_WIDTH);
{$ELSE}
FDefaultWidth := DEFAULT_COLUMN_WIDTH;
{$IFEND}
end; end;
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
@ -7977,6 +7992,17 @@ end;
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
function TVirtualTreeColumns.IsDefaultWidthStored: Boolean;
begin
{$IF LCL_FullVersion >= 1080000}
Result := FDefaultWidth <> Header.TreeView.Scale96ToFont(DEFAULT_COLUMN_WIDTH);
{$ELSE}
Result := FDefaultWidth <> DEFAULT_COLUMN_WIDTH;
{$IFEND}
end;
//----------------------------------------------------------------------------------------------------------------------
procedure TVirtualTreeColumns.SetDefaultWidth(Value: Integer); procedure TVirtualTreeColumns.SetDefaultWidth(Value: Integer);
begin begin
@ -11259,12 +11285,24 @@ end;
{$IF LCL_FullVersion >= 1080000} {$IF LCL_FullVersion >= 1080000}
procedure TVTHeader.AutoAdjustLayout(const AXProportion, AYProportion: Double); procedure TVTHeader.AutoAdjustLayout(const AXProportion, AYProportion: Double);
var
i: Integer;
col: TVirtualTreeColumn;
begin begin
if IsDefaultHeightStored then if IsDefaultHeightStored then
FDefaultHeight := Round(FDefaultHeight * AYProportion); FDefaultHeight := Round(FDefaultHeight * AYProportion);
if IsHeightStored then if IsHeightStored then
FHeight := Round(FHeight * AYProportion); FHeight := Round(FHeight * AYProportion);
if Columns.IsDefaultWidthStored then
Columns.DefaultWidth := Round(Columns.DefaultWidth * AXProportion);
for i := 0 to Columns.Count-1 do begin
col := Columns[i];
if col.IsWidthStored then
col.Width := Round(col.Width * AXProportion);
end;
end; end;
{$IFEND} {$IFEND}