From 53ecbea0d9b42790c50c82b8a2f9baf443f8e7c3 Mon Sep 17 00:00:00 2001 From: mattias Date: Wed, 30 Nov 2011 02:51:37 +0000 Subject: [PATCH] IDE: shortcuts: execute source editor command, when focused control has parent MainIDEBar or a TSourceNotebook, bug #19149 git-svn-id: trunk@33857 - --- ide/main.pp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ide/main.pp b/ide/main.pp index a3aec96c0a..8117d64050 100644 --- a/ide/main.pp +++ b/ide/main.pp @@ -18423,16 +18423,16 @@ var begin // check that the currently focus is on the MainIDEBar or on the SourceEditor CurFocusControl:=FindOwnerControl(GetFocus); - if (CurFocusControl<>nil) then begin - CurFocusControl:=GetParentForm(CurFocusControl); - if (CurFocusControl<>MainIDEBar) and not(CurFocusControl is TSourceNotebook) then + while (CurFocusControl<>nil) do begin + if (CurFocusControl=MainIDEBar) or (CurFocusControl is TSourceNotebook) then begin - // continue processing shortcut, not handled yet - MainIDEBar.mnuMainMenu.ShortcutHandled := false; + DoCommand(EditorCommand); exit; end; + CurFocusControl:=CurFocusControl.Parent; end; - DoCommand(EditorCommand); + // continue processing shortcut, not handled yet + MainIDEBar.mnuMainMenu.ShortcutHandled := false; end; procedure TMainIDE.DoInsertGUID;