From 5c2960c7625b436b40fd54cbf3a847b4f85799a4 Mon Sep 17 00:00:00 2001 From: maxim Date: Wed, 27 May 2015 20:37:55 +0000 Subject: [PATCH] Merged revision(s) 49192 #fee02222c7 from trunk: SynEdit: Fixed Option for MouseLink (when not using MouseActions) ........ git-svn-id: branches/fixes_1_4@49196 - --- components/synedit/syneditmarkupctrlmouselink.pp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/components/synedit/syneditmarkupctrlmouselink.pp b/components/synedit/syneditmarkupctrlmouselink.pp index 8b83127dc0..cbb5107383 100644 --- a/components/synedit/syneditmarkupctrlmouselink.pp +++ b/components/synedit/syneditmarkupctrlmouselink.pp @@ -172,6 +172,13 @@ var i: Integer; begin Result := False; + + if not (emUseMouseActions in TCustomSynEdit(SynEdit).MouseOptions) then begin + Result := (emShowCtrlMouseLinks in TCustomSynEdit(SynEdit).MouseOptions) and + (AShift * [ssShift, ssCtrl, ssAlt] = [ssCtrl]); + exit; + end; + // todo: check FMouseSelActions if over selection? for i := 0 to TCustomSynEdit(SynEdit).MouseActions.Count - 1 do begin act := TCustomSynEdit(SynEdit).MouseActions.Items[i];