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

editor search panel enhancements - close #427

This commit is contained in:
Vadim Lopatin 2017-09-08 13:22:56 +03:00
parent 3810b5848c
commit c269537679
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/dlangui/widgets/editors.d
View File

@ -3468,8 +3468,8 @@ class FindPanel : HorizontalLayout {
_edFind.editorAction.connect(&onFindEditorAction); _edFind.editorAction.connect(&onFindEditorAction);
_edFind.contentChange.connect(&onFindTextChange); _edFind.contentChange.connect(&onFindTextChange);
_edFind.keyEvent = &onEditorKeyEvent; //_edFind.keyEvent = &onEditorKeyEvent;
_edReplace.keyEvent = &onEditorKeyEvent; //_edReplace.keyEvent = &onEditorKeyEvent;
_btnFindNext = childById!Button("btnFindNext"); _btnFindNext = childById!Button("btnFindNext");
_btnFindNext.click = &onButtonClick; _btnFindNext.click = &onButtonClick;
@ -3489,6 +3489,7 @@ class FindPanel : HorizontalLayout {
_cbCaseSensitive.checkChange = &onCaseSensitiveCheckChange; _cbCaseSensitive.checkChange = &onCaseSensitiveCheckChange;
_cbWholeWords.checkChange = &onCaseSensitiveCheckChange; _cbWholeWords.checkChange = &onCaseSensitiveCheckChange;
_cbSelection.checkChange = &onCaseSensitiveCheckChange; _cbSelection.checkChange = &onCaseSensitiveCheckChange;
focusGroup = true;
if (!replace) if (!replace)
childById("replace").visibility = Visibility.Gone; childById("replace").visibility = Visibility.Gone;
//_edFind = new EditLine("edFind" //_edFind = new EditLine("edFind"
@ -3535,14 +3536,28 @@ class FindPanel : HorizontalLayout {
_editor.closeFindPanel(); _editor.closeFindPanel();
} }
bool onEditorKeyEvent(Widget source, KeyEvent event) { override bool onKeyEvent(KeyEvent event) {
if (event.keyCode == KeyCode.TAB) if (event.keyCode == KeyCode.TAB)
return true; return super.onKeyEvent(event);
if (event.action == KeyAction.KeyDown && event.keyCode == KeyCode.ESCAPE) { if (event.action == KeyAction.KeyDown && event.keyCode == KeyCode.ESCAPE) {
close(); close();
return true; return true;
} }
return false; return true;
}
/// override to handle specific actions
override bool handleAction(const Action a) {
switch (a.id) {
case EditorActions.FindNext:
findNext(false);
return true;
case EditorActions.FindPrev:
findNext(true);
return true;
default:
return false;
}
} }
protected bool _backDirection; protected bool _backDirection;