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

ecode macOS fixes (WIP)

Browse Source
This commit is contained in:
Martín Lucas Golini
2023-07-18 02:32:07 -04:00
parent 6b7f6f85ac
commit 9e1549647b
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/thirdparty/efsw vendored

Submodule src/thirdparty/efsw updated: 03e36f9f80...ac1a2fc2cb

4
src/tools/ecode/ecode.cpp
View File

@@ -170,7 +170,9 @@ void App::setAppTitle( const std::string& title ) {
if ( mBenchmarkMode )
fullTitle += " - " + String::toString( mWindow->getFPS() ) + " FPS";
mWindow->setTitle( fullTitle );
mUISceneNode->runOnMainThread( [this, fullTitle] {
mWindow->setTitle( fullTitle );
} );
}
void App::onDocumentModified( UICodeEditor* editor, TextDocument& ) {

3
src/tools/ecode/plugins/lsp/lspclientplugin.cpp
View File

@@ -271,7 +271,8 @@ PluginRequestHandle LSPClientPlugin::processWorkspaceSymbol( const PluginMessage
if ( servers.empty() )
return {};
std::string query = msg.asJSON().value( "query", "" );
json jmsg = msg.asJSON();
std::string query = jmsg.value( "query", "" );
for ( const auto server : servers ) {
server->workspaceSymbol(
query, [&, query]( const PluginIDType& id, LSPSymbolInformationList&& info ) {

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

@@ -412,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() && mLocateTable->getModel()->columnCount() >= 2 ) {
mLocateTable->setColumnsVisible( { 0, 1 } );
mLocateTable->setColumnWidth( 0, eeceil( width * 0.5 ) );
mLocateTable->setColumnWidth( 1, width - mLocateTable->getColumnWidth( 0 ) );
@@ -719,7 +719,8 @@ void UniversalLocator::requestWorkspaceSymbol() {
}
mLocateTable->setModel( mWorkspaceSymbolModel );
json j = json{ json{ "query", mWorkspaceSymbolQuery } };
json j;
j["query"] = mWorkspaceSymbolQuery;
mApp->getPluginManager()->sendRequest( PluginMessageType::WorkspaceSymbol,
PluginMessageFormat::JSON, &j );
} else if ( mWorkspaceSymbolModel && mWorkspaceSymbolModel.get() != mLocateTable->getModel() ) {