paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-15 23:39:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

ide: use editor font in the path editor

Browse Source 
git-svn-id: trunk@20343 -
This commit is contained in:
paul 2009-06-02 08:35:40 +00:00
parent 41f819d8ed
commit 8ed9eb8aba
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ide/editoroptions.pp
View File

@ -676,7 +676,6 @@ type
FUseCodeFolding: Boolean; FUseCodeFolding: Boolean;
FExpandedClickConf, FExpandedClickConf,
FCollapsedClickConf: TSynGutterFoldClickConfList; FCollapsedClickConf: TSynGutterFoldClickConfList;
public public
constructor Create; constructor Create;
destructor Destroy; override; destructor Destroy; override;
@ -694,6 +693,7 @@ type
procedure SetSynEditSettings(ASynEdit: TSynEdit); // write synedit settings to file procedure SetSynEditSettings(ASynEdit: TSynEdit); // write synedit settings to file
procedure GetSynEditPreviewSettings(APreviewEditor: TObject); procedure GetSynEditPreviewSettings(APreviewEditor: TObject);
procedure AddSpecialHilightAttribsToHighlighter(Syn: TSrcIDEHighlighter); procedure AddSpecialHilightAttribsToHighlighter(Syn: TSrcIDEHighlighter);
procedure ApplyFontSettingsTo(ASynEdit: TSynEdit);
function CreateSyn(LazSynHilighter: TLazSyntaxHighlighter): TSrcIDEHighlighter; function CreateSyn(LazSynHilighter: TLazSyntaxHighlighter): TSrcIDEHighlighter;
function ReadColorScheme(const LanguageName: String): String; function ReadColorScheme(const LanguageName: String): String;
@ -2917,6 +2917,16 @@ begin
aMarkup.StyleMask := DEFAULT_COLOR_SCHEME.Additional[AddHilightAttr].StylesMask; aMarkup.StyleMask := DEFAULT_COLOR_SCHEME.Additional[AddHilightAttr].StylesMask;
end; end;
procedure TEditorOptions.ApplyFontSettingsTo(ASynEdit: TSynEdit);
begin
ASynEdit.Font.Height := fEditorFontHeight;// set height before name for XLFD !
ASynEdit.Font.Name := fEditorFont;
if fDisableAntialiasing then
ASynEdit.Font.Quality := fqNonAntialiased
else
ASynEdit.Font.Quality := fqDefault;
end;
procedure TEditorOptions.GetSynEditSettings(ASynEdit: TSynEdit); procedure TEditorOptions.GetSynEditSettings(ASynEdit: TSynEdit);
// read synedit settings from config file // read synedit settings from config file
var var
@ -2961,12 +2971,8 @@ begin
else else
ASynEdit.RightEdge := 0; ASynEdit.RightEdge := 0;
ASynEdit.RightEdgeColor := fRightMarginColor; ASynEdit.RightEdgeColor := fRightMarginColor;
ASynEdit.Font.Height := fEditorFontHeight;// set height before name for XLFD !
ASynEdit.Font.Name := fEditorFont; ApplyFontSettingsTo(ASynEdit);
if fDisableAntialiasing then
ASynEdit.Font.Quality := fqNonAntialiased
else
ASynEdit.Font.Quality := fqDefault;
//debugln(['TEditorOptions.GetSynEditSettings ',ASynEdit.font.height]); //debugln(['TEditorOptions.GetSynEditSettings ',ASynEdit.font.height]);
ASynEdit.ExtraCharSpacing := fExtraCharSpacing; ASynEdit.ExtraCharSpacing := fExtraCharSpacing;

9
ide/patheditordlg.pas
View File

@ -29,7 +29,7 @@ interface
uses uses
Classes, SysUtils, Forms, Controls, SynEdit, Buttons, StdCtrls, Dialogs, Classes, SysUtils, Forms, Controls, SynEdit, Buttons, StdCtrls, Dialogs,
LResources, FileUtil, ButtonPanel, LazarusIDEStrConsts; LResources, FileUtil, ButtonPanel, LazarusIDEStrConsts, EditorOptions;
type type
@ -157,10 +157,11 @@ begin
DeleteButton.LoadGlyphFromLazarusResource('laz_delete'); DeleteButton.LoadGlyphFromLazarusResource('laz_delete');
PathEdit.Font.BeginUpdate; PathEdit.Font.BeginUpdate;
PathEdit.Font.Name:=SynDefaultFontName; PathEdit.Font.Pitch := SynDefaultFontPitch;
PathEdit.Font.Height:=SynDefaultFontHeight; EditorOpts.ApplyFontSettingsTo(PathEdit);
PathEdit.Font.Pitch:=SynDefaultFontPitch;
PathEdit.Font.EndUpdate; PathEdit.Font.EndUpdate;
PathEdit.ExtraCharSpacing := EditorOpts.ExtraCharSpacing;
PathEdit.ExtraLineSpacing := EditorOpts.ExtraLineSpacing;
end; end;
procedure TPathEditorDialog.FormResize(Sender: TObject); procedure TPathEditorDialog.FormResize(Sender: TObject);