forks
/
dexed
mirror of https://gitlab.com/basile.b/dexed.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

editor options, renamed option hintDelay to ddocDelay

This commit is contained in:
Basile Burg 2015-10-16 15:48:02 +02:00
parent f1b56c7480
commit 20c5164e4a
2 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/ce_editoroptions.pas
View File

@ -37,7 +37,7 @@ type
fBracketMatchColor: TSynSelectedColor; fBracketMatchColor: TSynSelectedColor;
fFont: TFont; fFont: TFont;
// //
fHintDelay: Integer; fDDocDelay: Integer;
fAutoDotDelay: Integer; fAutoDotDelay: Integer;
fTabWidth: Integer; fTabWidth: Integer;
fBlockIdent: Integer; fBlockIdent: Integer;
@ -59,12 +59,13 @@ type
procedure setD2Syn(aValue: TPersistent); procedure setD2Syn(aValue: TPersistent);
procedure setTxtSyn(aValue: TPersistent); procedure setTxtSyn(aValue: TPersistent);
procedure setShortcuts(aValue: TCollection); procedure setShortcuts(aValue: TCollection);
procedure setHintDelay(aValue: Integer); procedure setDDocDelay(aValue: Integer);
procedure setAutoDotDelay(aValue: Integer); procedure setAutoDotDelay(aValue: Integer);
published published
property completionMenuCaseCare: boolean read fCompletionMenuCaseCare write fCompletionMenuCaseCare; property completionMenuCaseCare: boolean read fCompletionMenuCaseCare write fCompletionMenuCaseCare;
property autoDotDelay: integer read fAutoDotDelay write SetautoDotDelay; property autoDotDelay: integer read fAutoDotDelay write SetautoDotDelay;
property hintDelay: Integer read fHintDelay write setHintDelay; property hintDelay: Integer read fDDocDelay write setDDocDelay stored false; deprecated;
property ddocDelay: Integer read fDDocDelay write setDDocDelay;
property bracketMatchColor: TSynSelectedColor read fBracketMatchColor write setBracketMatchColor; property bracketMatchColor: TSynSelectedColor read fBracketMatchColor write setBracketMatchColor;
property mouseLinkColor: TSynSelectedColor read fMouseLinkColor write setMouseLinkColor; property mouseLinkColor: TSynSelectedColor read fMouseLinkColor write setMouseLinkColor;
property selectedColor: TSynSelectedColor read fSelCol write setSelCol; property selectedColor: TSynSelectedColor read fSelCol write setSelCol;
@ -151,7 +152,7 @@ begin
fTxtSyn := TSynTxtSyn.Create(self); fTxtSyn := TSynTxtSyn.Create(self);
fTxtSyn.Assign(TxtSyn); fTxtSyn.Assign(TxtSyn);
// //
fHintDelay:=200; fDDocDelay:=200;
fAutoDotDelay:=200; fAutoDotDelay:=200;
fSelCol := TSynSelectedColor.Create; fSelCol := TSynSelectedColor.Create;
fFoldedColor := TSynSelectedColor.Create; fFoldedColor := TSynSelectedColor.Create;
@ -223,7 +224,7 @@ begin
// //
fCompletionMenuCaseCare:=srcopt.fCompletionMenuCaseCare; fCompletionMenuCaseCare:=srcopt.fCompletionMenuCaseCare;
fAutoDotDelay:=srcopt.fAutoDotDelay; fAutoDotDelay:=srcopt.fAutoDotDelay;
fHintDelay:=srcopt.fHintDelay; fDDocDelay:=srcopt.fDDocDelay;
fFont.Assign(srcopt.fFont); fFont.Assign(srcopt.fFont);
fSelCol.Assign(srcopt.fSelCol); fSelCol.Assign(srcopt.fSelCol);
fFoldedColor.Assign(srcopt.fFoldedColor); fFoldedColor.Assign(srcopt.fFoldedColor);
@ -247,11 +248,11 @@ begin
inherited; inherited;
end; end;
procedure TCEEditorOptionsBase.setHintDelay(aValue: Integer); procedure TCEEditorOptionsBase.setDDocDelay(aValue: Integer);
begin begin
if aValue > 2000 then aValue := 2000 if aValue > 2000 then aValue := 2000
else if aValue < 20 then aValue := 20; else if aValue < 20 then aValue := 20;
fHintDelay:=aValue; fDDocDelay:=aValue;
end; end;
procedure TCEEditorOptionsBase.setAutoDotDelay(aValue: Integer); procedure TCEEditorOptionsBase.setAutoDotDelay(aValue: Integer);
@ -468,7 +469,7 @@ begin
anEditor.completionMenuCaseCare:=fCompletionMenuCaseCare; anEditor.completionMenuCaseCare:=fCompletionMenuCaseCare;
anEditor.autoDotDelay:=fAutoDotDelay; anEditor.autoDotDelay:=fAutoDotDelay;
anEditor.hintDelay:=fHintDelay; anEditor.ddocDelay:=fDDocDelay;
anEditor.defaultFontSize := font.Size; anEditor.defaultFontSize := font.Size;
anEditor.Font.Assign(font); anEditor.Font.Assign(font);
anEditor.SelectedColor.Assign(fSelCol); anEditor.SelectedColor.Assign(fSelCol);

32
src/ce_synmemo.pas
View File

@ -97,9 +97,9 @@ type
fMousePos: TPoint; fMousePos: TPoint;
fCallTipWin: TCEEditorHintWindow; fCallTipWin: TCEEditorHintWindow;
fDDocWin: TCEEditorHintWindow; fDDocWin: TCEEditorHintWindow;
fHintDelay: Integer; fDDocDelay: Integer;
fAutoDotDelay: Integer; fAutoDotDelay: Integer;
fHintTimer: TIdleTimer; fDDocTimer: TIdleTimer;
fAutoDotTimer: TIdleTimer; fAutoDotTimer: TIdleTimer;
fCanShowHint: boolean; fCanShowHint: boolean;
fCanAutoDot: boolean; fCanAutoDot: boolean;
@ -120,12 +120,12 @@ type
class procedure cleanCache; static; class procedure cleanCache; static;
procedure setDefaultFontSize(aValue: Integer); procedure setDefaultFontSize(aValue: Integer);
procedure getCallTips; procedure getCallTips;
procedure HintTimerEvent(sender: TObject); procedure DDocTimerEvent(sender: TObject);
procedure AutoDotTimerEvent(sender: TObject); procedure AutoDotTimerEvent(sender: TObject);
procedure InitHintWins; procedure InitHintWins;
function getIfTemp: boolean; function getIfTemp: boolean;
procedure SetcompletionMenuCaseCare(aValue: boolean); procedure SetcompletionMenuCaseCare(aValue: boolean);
procedure setHintDelay(aValue: Integer); procedure setDDocDelay(aValue: Integer);
procedure setAutoDotDelay(aValue: Integer); procedure setAutoDotDelay(aValue: Integer);
procedure completionExecute(sender: TObject); procedure completionExecute(sender: TObject);
procedure getCompletionList; procedure getCompletionList;
@ -150,7 +150,7 @@ type
function DoMouseWheel(Shift: TShiftState; WheelDelta: Integer; MousePos: TPoint): Boolean; override; function DoMouseWheel(Shift: TShiftState; WheelDelta: Integer; MousePos: TPoint): Boolean; override;
published published
property defaultFontSize: Integer read fDefaultFontSize write setDefaultFontSize; property defaultFontSize: Integer read fDefaultFontSize write setDefaultFontSize;
property hintDelay: Integer read fHintDelay write setHintDelay; property ddocDelay: Integer read fDDocDelay write setDDocDelay;
property autoDotDelay: Integer read fAutoDotDelay write setAutoDotDelay; property autoDotDelay: Integer read fAutoDotDelay write setAutoDotDelay;
property completionMenuCaseCare: boolean read fCompletionCaseSens write SetcompletionMenuCaseCare; property completionMenuCaseCare: boolean read fCompletionCaseSens write SetcompletionMenuCaseCare;
public public
@ -389,11 +389,11 @@ begin
// //
ShowHint := false; ShowHint := false;
InitHintWins; InitHintWins;
fHintDelay := 200; fDDocDelay := 200;
fHintTimer := TIdleTimer.Create(self); fDDocTimer := TIdleTimer.Create(self);
fHintTimer.AutoEnabled:=true; fDDocTimer.AutoEnabled:=true;
fHintTimer.Interval := fHintDelay; fDDocTimer.Interval := fDDocDelay;
fHintTimer.OnTimer := @HintTimerEvent; fDDocTimer.OnTimer := @DDocTimerEvent;
// //
fAutoDotDelay := 200; fAutoDotDelay := 200;
fAutoDotTimer := TIdleTimer.Create(self); fAutoDotTimer := TIdleTimer.Create(self);
@ -568,10 +568,10 @@ begin
showCallTips; showCallTips;
end; end;
procedure TCESynMemo.setHintDelay(aValue: Integer); procedure TCESynMemo.setDDocDelay(aValue: Integer);
begin begin
fHintDelay:=aValue; fDDocDelay:=aValue;
fHintTimer.Interval:=fHintDelay; fDDocTimer.Interval:=fDDocDelay;
end; end;
procedure TCESynMemo.SetcompletionMenuCaseCare(aValue: boolean); procedure TCESynMemo.SetcompletionMenuCaseCare(aValue: boolean);
@ -580,7 +580,7 @@ begin
fCompletion.CaseSensitive:=aValue; fCompletion.CaseSensitive:=aValue;
end; end;
procedure TCESynMemo.HintTimerEvent(sender: TObject); procedure TCESynMemo.DDocTimerEvent(sender: TObject);
begin begin
if not Visible then exit; if not Visible then exit;
if not isDSource then exit; if not isDSource then exit;
@ -1034,7 +1034,7 @@ function TCESynMemo.DoMouseWheel(Shift: TShiftState; WheelDelta: Integer; MouseP
begin begin
result := inherited DoMouseWheel(Shift, WheelDelta, MousePos); result := inherited DoMouseWheel(Shift, WheelDelta, MousePos);
fCanShowHint:=false; fCanShowHint:=false;
fHintTimer.Enabled:=false; fDDocTimer.Enabled:=false;
end; end;
{$ENDREGION --------------------------------------------------------------------} {$ENDREGION --------------------------------------------------------------------}
@ -1093,8 +1093,6 @@ begin
end; end;
procedure TCESynMemo.gutterClick(Sender: TObject; X, Y, Line: integer; mark: TSynEditMark); procedure TCESynMemo.gutterClick(Sender: TObject; X, Y, Line: integer; mark: TSynEditMark);
var
m: TSynEditMark;
begin begin
if findBreakPoint(line) then if findBreakPoint(line) then
removeBreakPoint(line) removeBreakPoint(line)