pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

* Fix Loading/saving stream of header font name

Browse Source 
* Remove check for old versions

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1061 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
blikblum
2009-12-15 22:30:20 +00:00
parent 72cc0048a0
commit 82dce35e12
1 changed files with 25 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
components/virtualtreeview-new/trunk/VirtualTrees.pas
View File

@ -11262,30 +11262,22 @@ begin
ReadBuffer(Dummy, SizeOf(Dummy)); ReadBuffer(Dummy, SizeOf(Dummy));
SetLength(S, Dummy); SetLength(S, Dummy);
ReadBuffer(PAnsiChar(S)^, Dummy); ReadBuffer(PAnsiChar(S)^, Dummy);
if VTHeaderStreamVersion >= 4 then
Name := UTF8Decode(S)
else
Name := S; Name := S;
ReadBuffer(Dummy, SizeOf(Dummy)); ReadBuffer(Dummy, SizeOf(Dummy));
Pitch := TFontPitch(Dummy); Pitch := TFontPitch(Dummy);
ReadBuffer(Dummy, SizeOf(Dummy)); ReadBuffer(Dummy, SizeOf(Dummy));
Style := TFontStyles(LongWord(Dummy)); Style := TFontStyles(LongWord(Dummy));
end; end;
// LCL port started with stream version 6 so no need to do the check here
// Read data introduced by stream version 1+. // Read data introduced by stream version 1+.
if Version > 0 then
begin
ReadBuffer(Dummy, SizeOf(Dummy)); ReadBuffer(Dummy, SizeOf(Dummy));
MainColumn := Dummy; MainColumn := Dummy;
ReadBuffer(Dummy, SizeOf(Dummy)); ReadBuffer(Dummy, SizeOf(Dummy));
SortColumn := Dummy; SortColumn := Dummy;
ReadBuffer(Dummy, SizeOf(Dummy)); ReadBuffer(Dummy, SizeOf(Dummy));
SortDirection := TSortDirection(Byte(Dummy)); SortDirection := TSortDirection(Byte(Dummy));
end;
// Read data introduced by stream version 5+. // Read data introduced by stream version 5+.
if Version > 4 then
begin
ReadBuffer(Dummy, SizeOf(Dummy)); ReadBuffer(Dummy, SizeOf(Dummy));
ParentFont := Boolean(Dummy); ParentFont := Boolean(Dummy);
ReadBuffer(Dummy, SizeOf(Dummy)); ReadBuffer(Dummy, SizeOf(Dummy));
@ -11305,7 +11297,6 @@ begin
ReadBuffer(Dummy, Sizeof(Dummy)); ReadBuffer(Dummy, Sizeof(Dummy));
FMinWidthPercent := TVTConstraintPercent(Dummy); FMinWidthPercent := TVTConstraintPercent(Dummy);
end end
end;
finally finally
Exclude(FStates, hsLoading); Exclude(FStates, hsLoading);
Treeview.DoColumnResize(NoColumn); Treeview.DoColumnResize(NoColumn);
@ -11542,7 +11533,7 @@ begin
// Need only to write one: size or height, I decided to write height. // Need only to write one: size or height, I decided to write height.
Dummy := Height; Dummy := Height;
WriteBuffer(Dummy, SizeOf(Dummy)); WriteBuffer(Dummy, SizeOf(Dummy));
Tmp := UTF8Encode(Name); Tmp := Name;
Dummy := Length(Tmp); Dummy := Length(Tmp);
WriteBuffer(Dummy, SizeOf(Dummy)); WriteBuffer(Dummy, SizeOf(Dummy));
WriteBuffer(PAnsiChar(Tmp)^, Dummy); WriteBuffer(PAnsiChar(Tmp)^, Dummy);