From f44fcf16582bd287b8788fe8373e00ebaef630c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= Date: Wed, 25 Sep 2024 01:19:15 -0300 Subject: [PATCH] A couple of nits in locator. --- src/tools/ecode/ecode.cpp | 1 + src/tools/ecode/ecode.hpp | 2 ++ src/tools/ecode/universallocator.cpp | 6 +++--- src/tools/ecode/universallocator.hpp | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/tools/ecode/ecode.cpp b/src/tools/ecode/ecode.cpp index 71eb5a829..fd4192ccb 100644 --- a/src/tools/ecode/ecode.cpp +++ b/src/tools/ecode/ecode.cpp @@ -1651,6 +1651,7 @@ std::vector App::getUnlockedCommands() { "console-toggle", "close-app", "open-locatebar", + "open-locatebar-glob-search", "open-command-palette", "open-global-search", "project-build-start", diff --git a/src/tools/ecode/ecode.hpp b/src/tools/ecode/ecode.hpp index f2f8f9942..00ff9061f 100644 --- a/src/tools/ecode/ecode.hpp +++ b/src/tools/ecode/ecode.hpp @@ -236,6 +236,8 @@ class App : public UICodeEditorSplitter::Client { [this] { mStatusAppOutputController->toggle(); } ); t.setCommand( "toggle-status-terminal", [this] { mStatusTerminalController->toggle(); } ); t.setCommand( "open-locatebar", [this] { mUniversalLocator->showLocateBar(); } ); + t.setCommand( "open-locatebar-glob-search", + [this] { mUniversalLocator->showLocateBar( true ); } ); t.setCommand( "toggle-status-locate-bar", [this] { mUniversalLocator->toggleLocateBar(); } ); t.setCommand( "open-command-palette", [this] { mUniversalLocator->showCommandPalette(); } ); diff --git a/src/tools/ecode/universallocator.cpp b/src/tools/ecode/universallocator.cpp index 79278829d..ddde7be82 100644 --- a/src/tools/ecode/universallocator.cpp +++ b/src/tools/ecode/universallocator.cpp @@ -136,7 +136,7 @@ UniversalLocator::UniversalLocator( UICodeEditorSplitter* editorSplitter, UIScen mSplitter->getCurEditor()->setFocus(); if ( cmd != "open-locatebar" && cmd != "open-workspace-symbol-search" && cmd != "open-document-symbol-search" && cmd != "go-to-line" && - cmd != "show-open-documents" ) { + cmd != "show-open-documents" && cmd != "open-locatebar-glob-search" ) { hideLocateBar(); } else { mLocateInput->setFocus(); @@ -645,11 +645,11 @@ void UniversalLocator::showBar() { mLocateInput->on( Event::OnSizeChange, [this]( const Event* ) { updateLocateBar(); } ); } -void UniversalLocator::showLocateBar() { +void UniversalLocator::showLocateBar( bool useGlob ) { showBar(); if ( isLocator( mLocateInput->getText() ) ) - mLocateInput->setText( "" ); + mLocateInput->setText( useGlob ? "g " : "" ); if ( mApp->getDirTree() && !mLocateTable->getModel() ) { mLocateTable->setModel( mApp->getDirTree()->asModel( diff --git a/src/tools/ecode/universallocator.hpp b/src/tools/ecode/universallocator.hpp index a6883936d..0cc9953b2 100644 --- a/src/tools/ecode/universallocator.hpp +++ b/src/tools/ecode/universallocator.hpp @@ -42,7 +42,7 @@ class UniversalLocator { void initLocateBar( UILocateBar* locateBar, UITextInput* locateInput ); - void showLocateBar(); + void showLocateBar( bool useGlob = false ); void hideLocateBar();