paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-14 14:01:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: view messages, view search results: do not show source editor

Browse Source 
git-svn-id: trunk@46335 -
This commit is contained in:
mattias 2014-09-26 08:41:27 +00:00
parent bde0be3358
commit 4fa796d65d
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ide/main.pp
View File

@ -8112,8 +8112,10 @@ begin
exit; exit;
if Msg=nil then begin if Msg=nil then begin
// first find an error with a source position
if MessagesView.SelectFirstUrgentMessage(mluError,true) then if MessagesView.SelectFirstUrgentMessage(mluError,true) then
Msg:=MessagesView.GetSelectedLine; Msg:=MessagesView.GetSelectedLine;
// then find any error
if (Msg=nil) and MessagesView.SelectFirstUrgentMessage(mluError,false) then if (Msg=nil) and MessagesView.SelectFirstUrgentMessage(mluError,false) then
Msg:=MessagesView.GetSelectedLine; Msg:=MessagesView.GetSelectedLine;
if Msg=nil then exit; if Msg=nil then exit;
@ -8276,9 +8278,6 @@ begin
// don't move the messagesview, if it was already visible. // don't move the messagesview, if it was already visible.
IDEWindowCreators.ShowForm(MessagesView,BringToFront); IDEWindowCreators.ShowForm(MessagesView,BringToFront);
if BringToFront then
// the sourcenotebook is more interesting than the messages
SourceEditorManager.ShowActiveWindowOnTop(False);
end; end;
procedure TMainIDE.DoShowSearchResultsView(Show: boolean; BringToFront: boolean = False); procedure TMainIDE.DoShowSearchResultsView(Show: boolean; BringToFront: boolean = False);
@ -8288,10 +8287,7 @@ begin
SearchresultsView.OnSelectionChanged := OnSearchResultsViewSelectionChanged; SearchresultsView.OnSelectionChanged := OnSearchResultsViewSelectionChanged;
end; end;
if Show then begin if Show then begin
IDEWindowCreators.ShowForm(SearchresultsView,Show); IDEWindowCreators.ShowForm(SearchresultsView,BringToFront);
// the sourcenotebook is more interesting than the search results
if BringToFront = false then
SourceEditorManager.ShowActiveWindowOnTop(False);
end; end;
end; end;

27
ide/sourcefilemanager.pas
View File

@ -1533,20 +1533,23 @@ var
SrcNoteBook: TSourceNotebook; SrcNoteBook: TSourceNotebook;
Layout: TSimpleWindowLayout; Layout: TSimpleWindowLayout;
begin begin
MainIDE.DoShowMessagesView(PutOnTop); if SourceEditorManager.SourceWindowCount > 0 then
if SourceEditorManager.SourceWindowCount = 0 then exit;
SrcNoteBook := SourceEditorManager.SourceWindows[0];
Layout:=IDEWindowCreators.SimpleLayoutStorage.ItemByFormID(SrcNoteBook.Name);
if (Layout<>nil) and (Layout.WindowPlacement=iwpDefault)
and ((SrcNoteBook.Top + SrcNoteBook.Height) > MessagesView.Top)
and (MessagesView.Parent = nil) then
SrcNoteBook.Height := Max(50,Min(SrcNoteBook.Height,MessagesView.Top-SrcNoteBook.Top));
if PutOnTop then
begin begin
IDEWindowCreators.ShowForm(MessagesView,true); SrcNoteBook := SourceEditorManager.SourceWindows[0];
SourceEditorManager.ShowActiveWindowOnTop(False);
Layout:=IDEWindowCreators.SimpleLayoutStorage.ItemByFormID(SrcNoteBook.Name);
if (Layout<>nil) and (Layout.WindowPlacement=iwpDefault)
and ((SrcNoteBook.Top + SrcNoteBook.Height) > MessagesView.Top)
and (MessagesView.Parent = nil) then
SrcNoteBook.Height := Max(50,Min(SrcNoteBook.Height,MessagesView.Top-SrcNoteBook.Top));
if PutOnTop then
begin
IDEWindowCreators.ShowForm(MessagesView,true);
SourceEditorManager.ShowActiveWindowOnTop(False);
exit;
end;
end; end;
MainIDE.DoShowMessagesView(PutOnTop);
end; end;
function TLazSourceFileManager.SomethingOfProjectIsModified(Verbose: boolean): boolean; function TLazSourceFileManager.SomethingOfProjectIsModified(Verbose: boolean): boolean;