paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-06-27 12:28:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: completion box: fixed colors

Browse Source 
git-svn-id: trunk@58141 -
This commit is contained in:
mattias 2018-06-05 16:56:25 +00:00
parent a282a46751
commit c371a56c4f
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ide/compileroptions.pp
View File

@ -325,7 +325,8 @@ type
ccloAddVerboseAll, // add -va ccloAddVerboseAll, // add -va
ccloDoNotAppendOutFileOption, // do not add -o option ccloDoNotAppendOutFileOption, // do not add -o option
ccloAbsolutePaths, ccloAbsolutePaths,
ccloNoMacroParams // no search paths, no linker options, no custom options ccloNoMacroParams, // no search paths, no linker options, no custom options
ccloAddCompilerPath
); );
TCompilerCmdLineOptions = set of TCompilerCmdLineOption; TCompilerCmdLineOptions = set of TCompilerCmdLineOption;
@ -2892,6 +2893,9 @@ begin
Kind:=pcFPC; Kind:=pcFPC;
end; end;
if ccloAddCompilerPath in Flags then
switches:=ConvertOptionsToCmdLine('',RealCompilerFilename);
CurTargetOS:=''; CurTargetOS:='';
CurTargetCPU:=''; CurTargetCPU:='';
if not (ccloNoMacroParams in Flags) then if not (ccloNoMacroParams in Flags) then

2
ide/main.pp
View File

@ -6937,7 +6937,7 @@ begin
debugln(['Error: (lazarus) [TMainIDE.DoBuildProject] Compile failed']); debugln(['Error: (lazarus) [TMainIDE.DoBuildProject] Compile failed']);
exit; exit;
end; end;
// compilation succeded -> write state file // compilation succeeded -> write state file
IsComplete:=[pbfSkipLinking,pbfSkipAssembler,pbfSkipTools]*Flags=[]; IsComplete:=[pbfSkipLinking,pbfSkipAssembler,pbfSkipTools]*Flags=[];
Result:=Project1.SaveStateFile(CompilerFilename,CompilerParams,IsComplete); Result:=Project1.SaveStateFile(CompilerFilename,CompilerParams,IsComplete);
if Result<>mrOk then begin if Result<>mrOk then begin

3
ide/showcompileropts.pas
View File

@ -224,7 +224,8 @@ var
ParamList: TStrings; ParamList: TStrings;
begin begin
if CompilerOpts=nil then exit; if CompilerOpts=nil then exit;
Flags:=CompilerOpts.DefaultMakeOptionsFlags;
Flags:=CompilerOpts.DefaultMakeOptionsFlags+[ccloAddCompilerPath];
if not RelativePathsCheckBox.Checked then if not RelativePathsCheckBox.Checked then
Include(Flags,ccloAbsolutePaths); Include(Flags,ccloAbsolutePaths);
CurOptions := CompilerOpts.MakeOptionsString(Flags); CurOptions := CompilerOpts.MakeOptionsString(Flags);

7
ide/sourceeditprocs.pas
View File

@ -293,10 +293,11 @@ begin
begin begin
if ItemSelected then if ItemSelected then
begin begin
AllowFontColor := Colors^.TextSelectedColor=clNone;
if AllowFontColor then
ForegroundColor := ColorToRGB(Colors^.TextColor)
else
ForegroundColor := ColorToRGB(Colors^.TextSelectedColor); ForegroundColor := ColorToRGB(Colors^.TextSelectedColor);
AllowFontColor := ForegroundColor=clNone;
if ForegroundColor=clNone then
ForegroundColor := Colors^.TextColor;
BackgroundColor:=ColorToRGB(Colors^.BackgroundSelectedColor); BackgroundColor:=ColorToRGB(Colors^.BackgroundSelectedColor);
end else end else
begin begin