Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-05-30 01:56:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixes not reloading loaded document from an file system modified event after the first reload (SpartanJ/ecode#196).

Browse Source 
Improved project search UI.
This commit is contained in:
Martín Lucas Golini
2024-03-14 22:57:44 -03:00
parent b3d0eea6fc
commit ff29ed3c71
11 changed files with 168 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -232,6 +232,8 @@ void GlobalSearchController::initGlobalSearchBar(
};
mGlobalSearchInput->on( Event::OnPressEnter, pressEnterCb );
mGlobalSearchWhereInput->on( Event::OnPressEnter, pressEnterCb );
mGlobalSearchWhereInput->on( Event::OnTabNavigate,
[this]( auto ) { mGlobalSearchInput->setFocus(); } );
auto switchInputToTree = [this]( const Event* event ) {
const KeyEvent* keyEvent = static_cast<const KeyEvent*>( event );
Uint32 keyCode = keyEvent->getKeyCode();
@@ -358,6 +360,36 @@ void GlobalSearchController::initGlobalSearchBar(
keyEvent->getKeyCode() == KEY_RETURN )
mGlobalSearchBarLayout->execute( "replace-in-files" );
} );
UIWidget* menuBtn =
mGlobalSearchBarLayout->find<UIWidget>( "global_search_filters_menu_button" );
menuBtn->onClick( [this, menuBtn]( auto ) {
UIPopUpMenu* menu = UIPopUpMenu::New();
menu->add( mApp->i18n( "add_include_filter", "Add Include Filter" ) )
->setId( "add-include-filter" );
menu->add( mApp->i18n( "add_exclude_filter", "Add Exclude Filter" ) )
->setId( "add-exclude-filter" );
menu->on( Event::OnItemClicked, [this]( const Event* event ) {
const auto& id = event->getNode()->getId();
String appendTxt = "";
bool addComma = !mGlobalSearchWhereInput->getText().empty() &&
mGlobalSearchWhereInput->getText().back() != ',';
if ( "add-include-filter" == id ) {
appendTxt = ( addComma ? String{ "," } : String{ "" } ) + "*.txt";
} else if ( "add-exclude-filter" == id ) {
appendTxt = ( addComma ? String{ "," } : String{ "" } ) + "-*.txt";
}
if ( !appendTxt.empty() )
mGlobalSearchWhereInput->setText( mGlobalSearchWhereInput->getText() + appendTxt );
} );
menu->showAtScreenPosition( menuBtn->convertToWorldSpace( { 0, 0 } ) );
menu->setFocus();
} );
mGlobalSearchTree = mGlobalSearchTreeSearch;
}