Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-06-03 20:16:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

UIConsole now correctly caches rendered lines.

Browse Source 
ecode :Minor improvements in GlobalSearchController keybindings.
This commit is contained in:
Martín Lucas Golini
2022-11-01 22:21:57 -03:00
parent 69426fdf42
commit 5c46540f8e
7 changed files with 92 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/tools/ecode/globalsearchcontroller.cpp
View File

@@ -112,13 +112,6 @@ void GlobalSearchController::initGlobalSearchBar(
wholeWordChk->isChecked(), luaPatternChk->isChecked(),
escapeSequenceChk->isChecked(), false );
} );
mGlobalSearchBarLayout->setCommand(
"search-replace-in-files",
[&, caseSensitiveChk, wholeWordChk, luaPatternChk, escapeSequenceChk] {
doGlobalSearch( mGlobalSearchInput->getText(), caseSensitiveChk->isChecked(),
wholeWordChk->isChecked(), luaPatternChk->isChecked(),
escapeSequenceChk->isChecked(), true );
} );
mGlobalSearchBarLayout->setCommand(
"search-again", [&, caseSensitiveChk, wholeWordChk, luaPatternChk, escapeSequenceChk] {
auto listBox = mGlobalSearchHistoryList->getListBox();
@@ -173,7 +166,7 @@ void GlobalSearchController::initGlobalSearchBar(
mGlobalSearchTree->forceKeyDown( keyEvent );
}
} );
mGlobalSearchInput->addEventListener( Event::KeyDown, [&]( const Event* event ) {
auto switchInputToTree = [&]( const Event* event ) {
const KeyEvent* keyEvent = static_cast<const KeyEvent*>( event );
Uint32 keyCode = keyEvent->getKeyCode();
if ( ( keyCode == KEY_UP || keyCode == KEY_DOWN || keyCode == KEY_PAGEUP ||
@@ -181,7 +174,8 @@ void GlobalSearchController::initGlobalSearchBar(
mGlobalSearchTree->forceKeyDown( *keyEvent ) && !mGlobalSearchTree->hasFocus() ) {
mGlobalSearchTree->setFocus();
}
} );
};
mGlobalSearchInput->addEventListener( Event::KeyDown, switchInputToTree );
mGlobalSearchInput->addEventListener( Event::OnSizeChange, [&]( const Event* ) {
if ( mGlobalSearchBarLayout->isVisible() )
updateGlobalSearchBar();
@@ -239,11 +233,27 @@ void GlobalSearchController::initGlobalSearchBar(
if ( replaceInput->hasFocus() )
mGlobalSearchBarLayout->execute( "replace-in-files" );
} );
replaceInput->addEventListener( Event::KeyDown, [&]( const Event* event ) {
replaceInput->addEventListener( Event::KeyDown, switchInputToTree );
mGlobalSearchLayout->addEventListener( Event::KeyDown, [&]( const Event* event ) {
const KeyEvent* keyEvent = static_cast<const KeyEvent*>( event );
if ( keyEvent->getKeyCode() == KEY_ESCAPE )
if ( keyEvent->getKeyCode() == KEY_ESCAPE ) {
mGlobalSearchBarLayout->execute( "close-global-searchbar" );
return;
}
mGlobalSearchBarLayout->forceKeyDown( *keyEvent );
} );
mGlobalSearchBarLayout->setCommand(
"search-replace-in-files",
[&, caseSensitiveChk, wholeWordChk, luaPatternChk, escapeSequenceChk, replaceInput] {
if ( mGlobalSearchTreeReplace == mGlobalSearchTree ) {
replaceInput->setFocus();
replaceInput->getDocument().selectAll();
return;
}
doGlobalSearch( mGlobalSearchInput->getText(), caseSensitiveChk->isChecked(),
wholeWordChk->isChecked(), luaPatternChk->isChecked(),
escapeSequenceChk->isChecked(), true );
} );
mGlobalSearchBarLayout->setCommand( "replace-in-files", [&, replaceInput, escapeSequenceChk] {
auto listBox = mGlobalSearchHistoryList->getListBox();
if ( listBox->getItemSelectedIndex() < mGlobalSearchHistory.size() ) {
@@ -265,6 +275,12 @@ void GlobalSearchController::initGlobalSearchBar(
UITreeViewGlobalSearch::New( mEditorSplitter->getCurrentColorScheme(), true );
initGlobalSearchTree( mGlobalSearchTreeSearch );
initGlobalSearchTree( mGlobalSearchTreeReplace );
mGlobalSearchTreeReplace->addEventListener( Event::KeyDown, [&]( const Event* event ) {
const KeyEvent* keyEvent = static_cast<const KeyEvent*>( event );
if ( keyEvent->getSanitizedMod() == KeyMod::getDefaultModifier() &&
keyEvent->getKeyCode() == KEY_RETURN )
mGlobalSearchBarLayout->execute( "replace-in-files" );
} );
mGlobalSearchTree = mGlobalSearchTreeSearch;
}
@@ -488,11 +504,6 @@ void GlobalSearchController::initGlobalSearchTree( UITreeViewGlobalSearch* searc
searchTree->setHeadersVisible( false );
searchTree->setColumnsHidden(
{ ProjectSearch::ResultModel::Line, ProjectSearch::ResultModel::ColumnStart }, true );
searchTree->addEventListener( Event::KeyDown, [&]( const Event* event ) {
const KeyEvent* keyEvent = static_cast<const KeyEvent*>( event );
if ( keyEvent->getKeyCode() == KEY_ESCAPE )
mGlobalSearchBarLayout->execute( "close-global-searchbar" );
} );
searchTree->addEventListener( Event::OnModelEvent, [&]( const Event* event ) {
const ModelEvent* modelEvent = static_cast<const ModelEvent*>( event );
if ( modelEvent->getModelEventType() == ModelEventType::Open ) {