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

fix, completion menu pos

This commit is contained in:
Basile Burg 2015-12-15 02:31:52 +01:00
parent bbdef1778f
commit 873adf97f1
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ce_synmemo.pas
View File

@ -443,6 +443,7 @@ begin
inherited; inherited;
// //
fDefaultFontSize := 10; fDefaultFontSize := 10;
Font.Size:=10;
SetDefaultCoeditKeystrokes(Self); // not called in inherited if owner = nil ! SetDefaultCoeditKeystrokes(Self); // not called in inherited if owner = nil !
// //
ShowHint := false; ShowHint := false;
@ -786,7 +787,7 @@ begin
begin begin
fCanAutoDot:=false; fCanAutoDot:=false;
fCompletion.Execute(GetWordAtRowCol(LogicalCaretXY), fCompletion.Execute(GetWordAtRowCol(LogicalCaretXY),
ClientToScreen(point(CaretXPix, CaretYPix))); ClientToScreen(point(CaretXPix, CaretYPix + LineHeight)));
end; end;
ecPreviousLocation: ecPreviousLocation:
fPositions.back; fPositions.back;
@ -837,7 +838,7 @@ begin
if not fCanAutoDot then exit; if not fCanAutoDot then exit;
if fAutoDotDelay = 0 then exit; if fAutoDotDelay = 0 then exit;
fCanAutoDot := false; fCanAutoDot := false;
fCompletion.Execute('', ClientToScreen(point(CaretXPix, CaretYPix + Font.Size))); fCompletion.Execute('', ClientToScreen(point(CaretXPix, CaretYPix + LineHeight)));
end; end;
procedure TCESynMemo.setAutoDotDelay(aValue: Integer); procedure TCESynMemo.setAutoDotDelay(aValue: Integer);
@ -1039,6 +1040,8 @@ procedure TCESynMemo.KeyDown(var Key: Word; Shift: TShiftState);
begin begin
inherited; inherited;
highlightCurrentIdentifier; highlightCurrentIdentifier;
if fCompletion.IsActive then
fCompletion.CurrentString:= GetWordAtRowCol(LogicalCaretXY);
case Key of case Key of
VK_BROWSER_BACK: fPositions.back; VK_BROWSER_BACK: fPositions.back;
VK_BROWSER_FORWARD: fPositions.next; VK_BROWSER_FORWARD: fPositions.next;
@ -1054,8 +1057,6 @@ begin
VK_SUBTRACT: if Font.Size > 3 then Font.Size := Font.Size - 1; VK_SUBTRACT: if Font.Size > 3 then Font.Size := Font.Size - 1;
VK_DECIMAL: Font.Size := fDefaultFontSize; VK_DECIMAL: Font.Size := fDefaultFontSize;
end; end;
if fCompletion.IsActive then
fCompletion.CurrentString:= GetWordAtRowCol(LogicalCaretXY);
fCanShowHint:=false; fCanShowHint:=false;
fDDocWin.Hide; fDDocWin.Hide;
end; end;