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

Merge branch 'a11_2_a12'

This commit is contained in:
Basile Burg 2015-01-30 15:43:40 +01:00
parent ccb28ede51 c9bebfd262
commit 70a4fe5327
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ce_dmdwrap.pas
View File

@ -225,8 +225,8 @@ type
property Sources: TStringList read fExtraSrcs write setSrcs stored false; deprecated; property Sources: TStringList read fExtraSrcs write setSrcs stored false; deprecated;
property exclusions: TStringList read fExcl write setExcl; property exclusions: TStringList read fExcl write setExcl;
property extraSources: TStringList read fExtraSrcs write setSrcs; property extraSources: TStringList read fExtraSrcs write setSrcs;
property includes: TStringList read fIncl write setIncl; deprecated; property includes: TStringList read fIncl write setIncl stored false; deprecated;
property imports: TStringList read fImpt write setImpt; deprecated; property imports: TStringList read fImpt write setImpt stored false; deprecated;
property importModulePaths: TStringList read fIncl write setIncl; property importModulePaths: TStringList read fIncl write setIncl;
property importStringPaths: TStringList read fImpt write setImpt; property importStringPaths: TStringList read fImpt write setImpt;
public public

2
src/ce_editor.pas
View File

@ -234,6 +234,7 @@ begin
macRecorder.Editor := fDoc; macRecorder.Editor := fDoc;
fSyncEdit.Editor := fDoc; fSyncEdit.Editor := fDoc;
completion.Editor := fDoc; completion.Editor := fDoc;
//TODO-cbugfix: prevent completion to steal the focus, this trigs too much updates after Ctrl+Space
if (pageControl.ActivePage.Caption = '') then if (pageControl.ActivePage.Caption = '') then
begin begin
fKeyChanged := true; fKeyChanged := true;
@ -249,6 +250,7 @@ end;
procedure TCEEditorWidget.completionExecute(Sender: TObject); procedure TCEEditorWidget.completionExecute(Sender: TObject);
begin begin
getCompletionList; getCompletionList;
completion.TheForm.Font.Size := fDoc.Font.Size;
end; end;
procedure TCEEditorWidget.completionCodeCompletion(var Value: string; procedure TCEEditorWidget.completionCodeCompletion(var Value: string;

2
src/ce_libmaneditor.pas
View File

@ -110,7 +110,7 @@ end;
procedure TCELibManEditorWidget.btnRemLibClick(Sender: TObject); procedure TCELibManEditorWidget.btnRemLibClick(Sender: TObject);
begin begin
if List.Selected = nil then exit; if List.Selected = nil then exit;
List.Items.Delete( List.Selected.Index ); List.Items.Delete(List.Selected.Index);
gridToData; gridToData;
end; end;