opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-26 11:17:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

GetParentForm() returns the parent form of a frame. So, list layouts were saved with potential naming conflicts in registry since table editor and friends are TFrame, not TForm. Solve that by implementing GetParentFormOrFrame() and add that control's name to all relevant registry names in SaveListSetup() and RestoreListSetup(). This resets everyone's favorite list layout once, using this new build, but that should not be a problem.

Browse Source
This commit is contained in:
Ansgar Becker
2010-02-17 09:20:26 +00:00
parent aadb5c42d1
commit 4e5468f709
2 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/helpers.pas
View File

@ -245,6 +245,7 @@ type
function ParamBlobToStr(lpData: Pointer): TStringlist;
function ParamStrToBlob(out cbData: DWORD): Pointer;
function CheckForSecondInstance: Boolean;
function GetParentFormOrFrame(Comp: TWinControl): TWinControl;
var
MainReg: TRegistry;
@ -3391,6 +3392,20 @@ begin
end;
function GetParentFormOrFrame(Comp: TWinControl): TWinControl;
begin
Result := Comp;
while True do begin
Result := Result.Parent;
// On a windows shutdown, GetParentForm() seems sporadically unable to find the owner form
// In that case we would cause an exception when accessing it. Emergency break in that case.
// See issue #1462
if (not Assigned(Result)) or (Result is TCustomForm) or (Result is TFrame) then
break;
end;
end;
end.

31
source/main.pas
View File

@ -5563,7 +5563,7 @@ procedure TMainForm.SaveListSetup( List: TVirtualStringTree );
var
i : Byte;
ColWidths, ColsVisible, ColPos, Regname: String;
OwnerForm: TCustomForm;
OwnerForm: TWinControl;
begin
ColWidths := '';
ColsVisible := '';
@ -5589,17 +5589,18 @@ begin
ColPos := ColPos + IntToStr(List.Header.Columns[i].Position);
end;
// Lists can have the same name over different forms or frames. Find parent form or frame,
// so we can prepend its name into the registry value name.
OwnerForm := GetParentFormOrFrame(List);
// On a windows shutdown, GetParentForm() seems sporadically unable to find the owner form
// In that case we would cause an exception when accessing it. Emergency break in that case.
// See issue #1462
// TODO: Test this, probably fixed by implementing GetParentFormOrFrame, and then again, probably not.
if not Assigned(OwnerForm) then
Exit;
Regname := OwnerForm.Name + '.' + List.Name;
OpenRegistry;
Regname := List.Name;
OwnerForm := GetParentForm(List);
if OwnerForm <> Self then begin
// On a windows shutdown, GetParentForm() seems sporadically unable to find the owner form
// In that case we would cause an exception when accessing it. Emergency break in that case.
// See issue #1462
if not Assigned(OwnerForm) then
Exit;
Regname := OwnerForm.Name + '.' + Regname;
end;
MainReg.WriteString( REGPREFIX_COLWIDTHS + Regname, ColWidths );
MainReg.WriteString( REGPREFIX_COLSVISIBLE + Regname, ColsVisible );
MainReg.WriteString( REGPREFIX_COLPOS + Regname, ColPos );
@ -5616,15 +5617,13 @@ var
Value : String;
ValueList : TStringList;
Regname: String;
frm: TCustomForm;
OwnerForm: TWinControl;
begin
ValueList := TStringList.Create;
// Column widths
Regname := List.Name;
frm := GetParentForm(List);
if (frm <> Self) and (Assigned(frm)) then
Regname := frm.Name + '.' + Regname;
OwnerForm := GetParentFormOrFrame(List);
Regname := OwnerForm.Name + '.' + List.Name;
Value := GetRegValue(REGPREFIX_COLWIDTHS + Regname, '');
if Value <> '' then begin
ValueList := Explode( ',', Value );