IDE: update active sourceeditor on KeyDown

git-svn-id: trunk@39708 -
This commit is contained in:
mattias 2013-01-01 11:43:22 +00:00
parent 9f25516ea6
commit f531875607

View File

@ -482,6 +482,7 @@ type
procedure Activate; procedure Activate;
function PageIndex: integer; function PageIndex: integer;
function IsActiveOnNoteBook: boolean; function IsActiveOnNoteBook: boolean;
procedure CheckActiveWindow;
// debugging // debugging
procedure DoRequestExecutionMarks(Data: PtrInt); procedure DoRequestExecutionMarks(Data: PtrInt);
@ -3170,10 +3171,7 @@ Begin
FSharedValues.SetActiveSharedEditor(Self); FSharedValues.SetActiveSharedEditor(Self);
Handled:=true; Handled:=true;
if Manager.ActiveSourceWindow <> SourceNotebook then begin CheckActiveWindow;
debugln('Warning: ActiveSourceWindow is set incorrectly');
Manager.ActiveSourceWindow := SourceNotebook;
end;
case Command of case Command of
@ -4840,7 +4838,8 @@ end;
Procedure TSourceEditor.EditorKeyDown(Sender: TObject; var Key: Word; Shift : Procedure TSourceEditor.EditorKeyDown(Sender: TObject; var Key: Word; Shift :
TShiftState); TShiftState);
begin begin
//DebugLn('TSourceEditor.EditorKeyDown A ',dbgsName(Sender),' ',IntToStr(Key)); //DebugLn(['TSourceEditor.EditorKeyDown A ',dbgsName(Sender),' Key=',IntToStr(Key),' File=',ExtractFileName(Filename),' Wnd=',dbgSourceNoteBook(SourceNotebook)]);
CheckActiveWindow;
if Assigned(OnKeyDown) then if Assigned(OnKeyDown) then
OnKeyDown(Sender, Key, Shift); OnKeyDown(Sender, Key, Shift);
end; end;
@ -5135,6 +5134,13 @@ begin
Result:=false; Result:=false;
end; end;
procedure TSourceEditor.CheckActiveWindow;
begin
if Manager.ActiveSourceWindow = SourceNotebook then exit;
debugln('Warning: ActiveSourceWindow is set incorrectly Active=',dbgSourceNoteBook(Manager.ActiveSourceWindow),' Me=',dbgSourceNoteBook(SourceNotebook));
Manager.ActiveSourceWindow := SourceNotebook;
end;
procedure TSourceEditor.DoRequestExecutionMarks(Data: PtrInt); procedure TSourceEditor.DoRequestExecutionMarks(Data: PtrInt);
begin begin
DebugBoss.LineInfo.Request(FSharedValues.MarksRequestedForFile); DebugBoss.LineInfo.Request(FSharedValues.MarksRequestedForFile);