IDE: source editor command: fixed check focus in sourcenotebook or mainidebar, issue #27165

git-svn-id: trunk@48096 -
This commit is contained in:
mattias 2015-03-02 18:12:45 +00:00
parent 0ea46491f9
commit 72b9421fd2

View File

@ -12715,11 +12715,12 @@ begin
begin begin
CurFocusControl:=FindOwnerControl(GetFocus); CurFocusControl:=FindOwnerControl(GetFocus);
while (CurFocusControl<>nil) and (CurFocusControl<>MainIDEBar) while (CurFocusControl<>nil) and (CurFocusControl<>MainIDEBar)
and not (CurFocusControl is TSourceNotebook) do and not (CurFocusControl is TCustomForm) do
CurFocusControl:=CurFocusControl.Parent; CurFocusControl:=CurFocusControl.Parent;
end; end;
if Assigned(CurFocusControl) then if (CurFocusControl is TSourceNotebook) or (CurFocusControl=MainIDEBar) then
begin // MainIDEBar or SourceNotebook has focus -> find active source editor begin
// MainIDEBar or SourceNotebook has focus -> find active source editor
GetCurrentUnit(ActiveSourceEditor,ActiveUnitInfo); GetCurrentUnit(ActiveSourceEditor,ActiveUnitInfo);
if Assigned(ActiveSourceEditor) then begin if Assigned(ActiveSourceEditor) then begin
ActiveSourceEditor.DoEditorExecuteCommand(EditorCommand); // pass the command ActiveSourceEditor.DoEditorExecuteCommand(EditorCommand); // pass the command