paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-22 14:10:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ide ColorOptions: Improved "reset one" button (fix updating comboboxes / reset according to global/local)

Browse Source 
git-svn-id: trunk@61099 -
This commit is contained in:
martin 2019-05-01 15:42:19 +00:00
parent ff9c822553
commit 90ecaf08c2
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ide/frames/editor_color_options.pas
View File

@ -1213,14 +1213,21 @@ begin
DefaultSchemeGrp := ColorSchemeFactory.ColorSchemeGroup[ColorSchemeButton.Caption]; DefaultSchemeGrp := ColorSchemeFactory.ColorSchemeGroup[ColorSchemeButton.Caption];
if DefaultSchemeGrp = nil then if DefaultSchemeGrp = nil then
exit; exit;
if FIsEditingDefaults then if FIsEditingDefaults or FCurHighlightElement.IsUsingSchemeGlobals then
DefaultColorScheme := DefaultSchemeGrp.DefaultColors DefaultColorScheme := DefaultSchemeGrp.DefaultColors
else else
DefaultColorScheme := DefaultSchemeGrp.ColorScheme[FCurrentColorScheme.Language]; DefaultColorScheme := DefaultSchemeGrp.ColorScheme[FCurrentColorScheme.Language];
if OnlySelected then begin if OnlySelected then begin
DefAttri := DefaultColorScheme.Attribute[FCurHighlightElement.StoredName]; DefAttri := DefaultColorScheme.Attribute[FCurHighlightElement.StoredName];
if FCurHighlightElement.IsUsingSchemeGlobals then begin
// reset the globol settings for the element
FCurHighlightElement.GetSchemeGlobal.Assign(DefAttri);
end
else begin
FCurHighlightElement.Assign(DefAttri); FCurHighlightElement.Assign(DefAttri);
FCurHighlightElement.UseSchemeGlobals := False; // keep editing locals, for single elem reset, this should not change.
end;
end else begin end else begin
FCurrentColorScheme.Assign(DefaultColorScheme); FCurrentColorScheme.Assign(DefaultColorScheme);
end; end;
@ -1240,6 +1247,7 @@ begin
FindCurHighlightElement; FindCurHighlightElement;
UpdateCurrentScheme; UpdateCurrentScheme;
ShowCurAttribute; ShowCurAttribute;
SynColorAttrEditor1.UpdateAll; // force update
end; end;
function TEditorColorOptionsFrame.GetColorSchemeForLang(const LanguageName: String): String; function TEditorColorOptionsFrame.GetColorSchemeForLang(const LanguageName: String): String;