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

eepp:

Browse Source 
UICodeEditorSplitter, goto line of document opened when creating a split.
StyleSheetParser allow UTF-8 BOM files.
Improved UICodeEditor::scrollTo.
ecode:
Fixed a crash in universal locator.
This commit is contained in:
Martín Lucas Golini
2023-07-06 00:32:07 -03:00
parent 08ebe82efb
commit 6a4a2881ab
12 changed files with 108 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/tools/ecode/universallocator.cpp
View File

@@ -336,6 +336,7 @@ void UniversalLocator::initLocateBar( UILocateBar* locateBar, UITextInput* locat
if ( String::startsWith( mLocateInput->getText(), "sb " ) ) {
auto pbm = mApp->getProjectBuildManager();
if ( nullptr == pbm ) return;
auto cfg = pbm->getConfig();
std::string buildName = vName.toString();
if ( pbm->hasBuild( buildName ) ) {
@@ -346,6 +347,7 @@ void UniversalLocator::initLocateBar( UILocateBar* locateBar, UITextInput* locat
return;
} else if ( String::startsWith( mLocateInput->getText(), "sbt " ) ) {
auto pbm = mApp->getProjectBuildManager();
if ( nullptr == pbm ) return;
auto cfg = pbm->getConfig();
auto build = pbm->getBuild( cfg.buildName );
if ( build != nullptr ) {
@@ -410,7 +412,7 @@ void UniversalLocator::updateLocateBarSync() {
mLocateTable->setPixelsSize( width,
mLocateTable->getRowHeight() * LOCATEBAR_MAX_VISIBLE_ITEMS );
width -= mLocateTable->getVerticalScrollBar()->getPixelsSize().getWidth();
if ( mLocateTable->getModel()->columnCount() == 2 ) {
if ( mLocateTable->getModel()->columnCount() >= 2 ) {
mLocateTable->setColumnsVisible( { 0, 1 } );
mLocateTable->setColumnWidth( 0, eeceil( width * 0.5 ) );
mLocateTable->setColumnWidth( 1, width - mLocateTable->getColumnWidth( 0 ) );
@@ -610,6 +612,8 @@ void UniversalLocator::showSwitchBuild() {
std::shared_ptr<ItemListOwnerModel<std::string>>
UniversalLocator::openBuildModel( const std::string& match ) {
if ( nullptr == mApp->getProjectBuildManager() )
return ItemListOwnerModel<std::string>::create( {} );
const auto& builds = mApp->getProjectBuildManager()->getBuilds();
std::vector<std::string> buildNames;
if ( builds.empty() )
@@ -649,6 +653,8 @@ void UniversalLocator::showSwitchBuildType() {
std::shared_ptr<ItemListOwnerModel<std::string>>
UniversalLocator::openBuildTypeModel( const std::string& match ) {
if ( nullptr == mApp->getProjectBuildManager() )
return ItemListOwnerModel<std::string>::create( {} );
const auto& builds = mApp->getProjectBuildManager()->getBuilds();
const auto& cfg = mApp->getProjectBuildManager()->getConfig();
@@ -674,7 +680,7 @@ UniversalLocator::openBuildTypeModel( const std::string& match ) {
void UniversalLocator::updateSwitchBuildTypeTable() {
mLocateTable->setModel(
openBuildTypeModel( mLocateInput->getText().substr( 4 ).trim().toUtf8() ) );
if ( mLocateTable->getModel()->rowCount() > 0 ) {
if ( mLocateTable->getModel()->rowCount() > 0 && nullptr != mApp->getProjectBuildManager() ) {
ModelIndex idx =
mLocateTable->findRowWithText( mApp->getProjectBuildManager()->getConfig().buildType );
mLocateTable->getSelection().set( idx.isValid() ? idx