forks
/
dlangide
mirror of https://github.com/buggins/dlangide.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix merge conflict

This commit is contained in:
Vadim Lopatin 2016-03-09 09:18:52 +03:00
parent 21cc22847d 93dcab56a0
commit 2d1992ff47
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dlangide/ui/frame.d
View File

@ -986,6 +986,8 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL
_logPanel.getTabs.selectTab("search");
if(searchPanel !is null) {
searchPanel.focus();
dstring selectedText = currentEditor.getSelectedText();
searchPanel.setSearchText(selectedText);
}
return true;
case IDEActions.FileNewWorkspace:

4
src/dlangide/ui/searchPanel.d
View File

@ -170,6 +170,10 @@ class SearchWidget : TabWidget {
}
return true;
}
public void setSearchText(dstring txt){
_findText.text = txt;
}
protected bool onEditorAction(const Action action) {
if (action.id == EditorActions.InsertNewLine) {