paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-07 01:57:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged revision(s) 49210 #649ab6c422, 49222 #475b08884c, 49283 #922e30ce7c from trunk:

Browse Source 
SynEdit: Fixed Option for MouseLink (when not using MouseActions) / ssMeta on MAc
........
SynEdit: Fixed Option for MouseLink (when not using MouseActions) / ssMeta on MAc
........
SynEdit: Fixed overflow error
........

git-svn-id: branches/fixes_1_4@49296 -
This commit is contained in:
maxim 2015-06-08 23:47:17 +00:00
parent ebb4c661c5
commit 7904f51dc7
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/synedit/synedit.pp
View File

@ -1532,7 +1532,7 @@ begin
AddCommand(emcStartColumnSelections, True, mbXLeft, ccSingle, cdDown, [ssShift, ssAlt], [ssShift, ssAlt], emcoSelectionContinue);
end;
if (emShowCtrlMouseLinks in AnOptions) then
AddCommand(emcMouseLink, False, mbXLeft, ccSingle, cdUp, [SYNEDIT_LINK_MODIFIER], [ssShift, ssAlt, ssCtrl]);
AddCommand(emcMouseLink, False, mbXLeft, ccSingle, cdUp, [SYNEDIT_LINK_MODIFIER], [ssShift, ssAlt, ssCtrl] + [SYNEDIT_LINK_MODIFIER]);
if (emDoubleClickSelectsLine in AnOptions) then begin
AddCommand(emcSelectLine, True, mbXLeft, ccDouble, cdDown, [], []);

2
components/synedit/syneditmarkupctrlmouselink.pp
View File

@ -175,7 +175,7 @@ begin
if not (emUseMouseActions in TCustomSynEdit(SynEdit).MouseOptions) then begin
Result := (emShowCtrlMouseLinks in TCustomSynEdit(SynEdit).MouseOptions) and
(AShift * [ssShift, ssCtrl, ssAlt] = [ssCtrl]);
(AShift * ([ssShift, ssCtrl, ssAlt] + [SYNEDIT_LINK_MODIFIER]) = [SYNEDIT_LINK_MODIFIER]);
exit;
end;

18
components/synedit/syngutterlineoverview.pp
View File

@ -850,7 +850,7 @@ begin
if c = 0 then
Result := -1
else
Result := ((ALine - 1) * Height) div c;
Result := (Int64(ALine - 1) * Int64(Height)) div c;
end;
function TSynGutterLineOverviewProvider.TextLineToPixelEnd(ALine: Integer): Integer;
@ -862,8 +862,8 @@ begin
if c = 0 then
Result := -1
else begin
Result := ((ALine - 1) * Height) div c;
n := ( ALine * Height) div c - 1; // next line - 1 pix
Result := (Int64(ALine - 1) * Int64(Height)) div c;
n := (Int64(ALine) * Int64(Height)) div c - 1; // next line - 1 pix
if n > Result then
Result := n;
end;
@ -871,14 +871,14 @@ end;
function TSynGutterLineOverviewProvider.PixelLineToText(ALineIdx: Integer): Integer;
var
c: Integer;
c: Int64;
begin
c := Max(1, TextBuffer.Count);
if c = 0 then
Result := -1
else begin
Result := (ALineIdx * c) div Height + 1;
if ((Result - 1) * Height) div c <> ALineIdx then
Result := (Int64(ALineIdx) * c) div Height + 1;
if (Int64(Result - 1) * Int64(Height)) div c <> ALineIdx then
inc(Result);
end;
end;
@ -1357,7 +1357,7 @@ begin
if c = 0 then
Result := -1
else
Result := (ALine - 1) * Height div c;
Result := Int64(ALine - 1) * Int64(Height) div c;
end;
function TSynGutterLineOverview.TextLineToPixelEnd(ALine: Integer): Integer;
@ -1369,8 +1369,8 @@ begin
if c = 0 then
Result := -1
else begin
Result := ((ALine - 1) * Height) div c;
n := ( ALine * Height) div c - 1; // next line - 1 pix
Result := (Int64(ALine - 1) * Int64(Height)) div c;
n := (Int64(ALine) * Int64(Height)) div c - 1; // next line - 1 pix
if n > Result then
Result := n;
end;