From 20c5164e4a2cc66b48a421aa985527cecc9a31f4 Mon Sep 17 00:00:00 2001 From: Basile Burg Date: Fri, 16 Oct 2015 15:48:02 +0200 Subject: [PATCH] editor options, renamed option hintDelay to ddocDelay --- src/ce_editoroptions.pas | 17 +++++++++-------- src/ce_synmemo.pas | 32 +++++++++++++++----------------- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/src/ce_editoroptions.pas b/src/ce_editoroptions.pas index 53b06df0..ea593e5a 100644 --- a/src/ce_editoroptions.pas +++ b/src/ce_editoroptions.pas @@ -37,7 +37,7 @@ type fBracketMatchColor: TSynSelectedColor; fFont: TFont; // - fHintDelay: Integer; + fDDocDelay: Integer; fAutoDotDelay: Integer; fTabWidth: Integer; fBlockIdent: Integer; @@ -59,12 +59,13 @@ type procedure setD2Syn(aValue: TPersistent); procedure setTxtSyn(aValue: TPersistent); procedure setShortcuts(aValue: TCollection); - procedure setHintDelay(aValue: Integer); + procedure setDDocDelay(aValue: Integer); procedure setAutoDotDelay(aValue: Integer); published property completionMenuCaseCare: boolean read fCompletionMenuCaseCare write fCompletionMenuCaseCare; 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 mouseLinkColor: TSynSelectedColor read fMouseLinkColor write setMouseLinkColor; property selectedColor: TSynSelectedColor read fSelCol write setSelCol; @@ -151,7 +152,7 @@ begin fTxtSyn := TSynTxtSyn.Create(self); fTxtSyn.Assign(TxtSyn); // - fHintDelay:=200; + fDDocDelay:=200; fAutoDotDelay:=200; fSelCol := TSynSelectedColor.Create; fFoldedColor := TSynSelectedColor.Create; @@ -223,7 +224,7 @@ begin // fCompletionMenuCaseCare:=srcopt.fCompletionMenuCaseCare; fAutoDotDelay:=srcopt.fAutoDotDelay; - fHintDelay:=srcopt.fHintDelay; + fDDocDelay:=srcopt.fDDocDelay; fFont.Assign(srcopt.fFont); fSelCol.Assign(srcopt.fSelCol); fFoldedColor.Assign(srcopt.fFoldedColor); @@ -247,11 +248,11 @@ begin inherited; end; -procedure TCEEditorOptionsBase.setHintDelay(aValue: Integer); +procedure TCEEditorOptionsBase.setDDocDelay(aValue: Integer); begin if aValue > 2000 then aValue := 2000 else if aValue < 20 then aValue := 20; - fHintDelay:=aValue; + fDDocDelay:=aValue; end; procedure TCEEditorOptionsBase.setAutoDotDelay(aValue: Integer); @@ -468,7 +469,7 @@ begin anEditor.completionMenuCaseCare:=fCompletionMenuCaseCare; anEditor.autoDotDelay:=fAutoDotDelay; - anEditor.hintDelay:=fHintDelay; + anEditor.ddocDelay:=fDDocDelay; anEditor.defaultFontSize := font.Size; anEditor.Font.Assign(font); anEditor.SelectedColor.Assign(fSelCol); diff --git a/src/ce_synmemo.pas b/src/ce_synmemo.pas index 90e2f05f..1ab816f9 100644 --- a/src/ce_synmemo.pas +++ b/src/ce_synmemo.pas @@ -97,9 +97,9 @@ type fMousePos: TPoint; fCallTipWin: TCEEditorHintWindow; fDDocWin: TCEEditorHintWindow; - fHintDelay: Integer; + fDDocDelay: Integer; fAutoDotDelay: Integer; - fHintTimer: TIdleTimer; + fDDocTimer: TIdleTimer; fAutoDotTimer: TIdleTimer; fCanShowHint: boolean; fCanAutoDot: boolean; @@ -120,12 +120,12 @@ type class procedure cleanCache; static; procedure setDefaultFontSize(aValue: Integer); procedure getCallTips; - procedure HintTimerEvent(sender: TObject); + procedure DDocTimerEvent(sender: TObject); procedure AutoDotTimerEvent(sender: TObject); procedure InitHintWins; function getIfTemp: boolean; procedure SetcompletionMenuCaseCare(aValue: boolean); - procedure setHintDelay(aValue: Integer); + procedure setDDocDelay(aValue: Integer); procedure setAutoDotDelay(aValue: Integer); procedure completionExecute(sender: TObject); procedure getCompletionList; @@ -150,7 +150,7 @@ type function DoMouseWheel(Shift: TShiftState; WheelDelta: Integer; MousePos: TPoint): Boolean; override; published 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 completionMenuCaseCare: boolean read fCompletionCaseSens write SetcompletionMenuCaseCare; public @@ -389,11 +389,11 @@ begin // ShowHint := false; InitHintWins; - fHintDelay := 200; - fHintTimer := TIdleTimer.Create(self); - fHintTimer.AutoEnabled:=true; - fHintTimer.Interval := fHintDelay; - fHintTimer.OnTimer := @HintTimerEvent; + fDDocDelay := 200; + fDDocTimer := TIdleTimer.Create(self); + fDDocTimer.AutoEnabled:=true; + fDDocTimer.Interval := fDDocDelay; + fDDocTimer.OnTimer := @DDocTimerEvent; // fAutoDotDelay := 200; fAutoDotTimer := TIdleTimer.Create(self); @@ -568,10 +568,10 @@ begin showCallTips; end; -procedure TCESynMemo.setHintDelay(aValue: Integer); +procedure TCESynMemo.setDDocDelay(aValue: Integer); begin - fHintDelay:=aValue; - fHintTimer.Interval:=fHintDelay; + fDDocDelay:=aValue; + fDDocTimer.Interval:=fDDocDelay; end; procedure TCESynMemo.SetcompletionMenuCaseCare(aValue: boolean); @@ -580,7 +580,7 @@ begin fCompletion.CaseSensitive:=aValue; end; -procedure TCESynMemo.HintTimerEvent(sender: TObject); +procedure TCESynMemo.DDocTimerEvent(sender: TObject); begin if not Visible then exit; if not isDSource then exit; @@ -1034,7 +1034,7 @@ function TCESynMemo.DoMouseWheel(Shift: TShiftState; WheelDelta: Integer; MouseP begin result := inherited DoMouseWheel(Shift, WheelDelta, MousePos); fCanShowHint:=false; - fHintTimer.Enabled:=false; + fDDocTimer.Enabled:=false; end; {$ENDREGION --------------------------------------------------------------------} @@ -1093,8 +1093,6 @@ begin end; procedure TCESynMemo.gutterClick(Sender: TObject; X, Y, Line: integer; mark: TSynEditMark); -var - m: TSynEditMark; begin if findBreakPoint(line) then removeBreakPoint(line)