From cf25add3fabdaf8224fd29d618df2265997490d7 Mon Sep 17 00:00:00 2001 From: mattias Date: Mon, 2 Mar 2015 18:13:08 +0000 Subject: [PATCH] IDE: source editor command: fixed check focus in sourcenotebook or mainidebar, issue #27165 git-svn-id: branches/fixes_1_4@48097 - --- ide/main.pp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ide/main.pp b/ide/main.pp index 42f02b2610..943ee3c067 100644 --- a/ide/main.pp +++ b/ide/main.pp @@ -12715,11 +12715,12 @@ begin begin CurFocusControl:=FindOwnerControl(GetFocus); while (CurFocusControl<>nil) and (CurFocusControl<>MainIDEBar) - and not (CurFocusControl is TSourceNotebook) do + and not (CurFocusControl is TCustomForm) do CurFocusControl:=CurFocusControl.Parent; end; - if Assigned(CurFocusControl) then - begin // MainIDEBar or SourceNotebook has focus -> find active source editor + if (CurFocusControl is TSourceNotebook) or (CurFocusControl=MainIDEBar) then + begin + // MainIDEBar or SourceNotebook has focus -> find active source editor GetCurrentUnit(ActiveSourceEditor,ActiveUnitInfo); if Assigned(ActiveSourceEditor) then begin ActiveSourceEditor.DoEditorExecuteCommand(EditorCommand); // pass the command