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

Issue #1659:

Browse Source 
* fix exception on closing customize dialog
* use empty string when converting clNone to and from web color, instead of #ffffff
This commit is contained in:
Ansgar Becker
2022-09-12 07:32:26 +02:00
parent ddca97c07a
commit 2ca233afbf
2 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/apphelpers.pas
View File

@ -395,6 +395,8 @@ type
function DirSep: Char;
function StrHasNumChars(const AStr: String; NumChars: Cardinal): Boolean;
procedure FindComponentInstances(BaseForm: TComponent; ClassType: TClass; var List: TObjectList);
function WebColorStrToColorDef(WebColor: string; Default: TColor): TColor;
var
AppSettings: TAppSettings;
MutexHandle: THandle = 0;
@ -3018,6 +3020,14 @@ begin
end;
end;
function WebColorStrToColorDef(WebColor: string; Default: TColor): TColor;
begin
try
Result := WebColorStrToColor(WebColor);
except
Result := Default;
end;
end;
{ Threading stuff }

33
source/customize_highlighter.pas
View File

@ -63,11 +63,8 @@ procedure TfrmCustomizeHighlighter.Modified(Sender: TObject);
begin
// Apply modification to current attribute
// Silence exception caused by invalid color strings
try
FAttr.Background := WebColorStrToColor(editBackground.Text);
FAttr.Foreground := WebColorStrToColor(editForeground.Text);
except
end;
FAttr.Background := WebColorStrToColorDef(editBackground.Text, clNone);
FAttr.Foreground := WebColorStrToColorDef(editForeground.Text, clNone);
if chkBold.Checked then
FAttr.Style := FAttr.Style + [fsBold]
else
@ -111,10 +108,7 @@ begin
Edit := Sender as TButtonedEdit;
Dialog := TColorDialog.Create(Self);
Dialog.Options := [cdFullOpen, cdAnyColor];
try
Dialog.Color := WebColorStrToColor(Edit.Text);
except
end;
Dialog.Color := WebColorStrToColorDef(Edit.Text, clNone);
if Dialog.Execute then begin
Edit.Text := ColorToWebColorStr(Dialog.Color);
end;
@ -142,8 +136,9 @@ begin
// Form destroyed
if Assigned(FHighlighter) then
FHighlighter.Free;
if Assigned(FAttr) then
FAttr.Free;
// causes an exception when closing:
//if Assigned(FAttr) then
// FAttr.Free;
end;
procedure TfrmCustomizeHighlighter.listboxAttributesClick(Sender: TObject);
@ -166,10 +161,18 @@ begin
chkItalic.Enabled := AttrSelected;
pnlSample.Enabled := AttrSelected;
// Overtake values
editBackground.Text := IfThen(AttrSelected, ColorToWebColorStr(FAttr.Background), '');
editForeground.Text := IfThen(AttrSelected, ColorToWebColorStr(FAttr.Foreground), '');
chkBold.Checked := AttrSelected and (fsBold in FAttr.Style);
chkItalic.Checked := AttrSelected and (fsItalic in FAttr.Style);
if AttrSelected then begin
editBackground.Text := IfThen(FAttr.Background <> clNone, ColorToWebColorStr(FAttr.Background), '');
editForeground.Text := IfThen(FAttr.Foreground <> clNone, ColorToWebColorStr(FAttr.Foreground), '');
chkBold.Checked := fsBold in FAttr.Style;
chkItalic.Checked := fsItalic in FAttr.Style;
end
else begin
editBackground.Text := '';
editForeground.Text := '';
chkBold.Checked := False;
chkItalic.Checked := False;
end;
UpdateSampleBox;
end;