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

Fixed a bug introduced when adding a cb to the InputEvent::Quit.

Browse Source
This commit is contained in:
Martín Lucas Golini
2023-09-24 20:17:49 -03:00
parent beddef0b8d
commit ccd6a04429
5 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3104,6 +3104,7 @@ void App::loadFolder( const std::string& path ) {
mSplitter->getCurWidget()->setFocus();
}
#if EE_PLATFORM == EE_PLATFORM_MACOS
static std::string getDefaultShell() {
std::string shell = Sys::getEnv( "SHELL" );
if ( !shell.empty() )
@@ -3141,6 +3142,7 @@ static std::string getShellEnv( const std::string& env, const std::string& defSh
}
return "";
}
#endif
FontTrueType* App::loadFont( const std::string& name, std::string fontPath,
const std::string& fallback ) {
@@ -3297,8 +3299,8 @@ void App::init( const LogLevel& logLevel, std::string file, const Float& pidelDe
}
if ( mWindow->isWindowed() && mWindow->getSize() >= currentDisplay->getSize().asInt() ) {
mWindow->setPosition( mWindow->getBorderSize().getWidth(),
mWindow->getBorderSize().getHeight() );
auto borderSize( mWindow->getBorderSize() );
mWindow->setPosition( borderSize.getWidth(), borderSize.getHeight() );
}
loadKeybindings();
@@ -3318,6 +3320,11 @@ void App::init( const LogLevel& logLevel, std::string file, const Float& pidelDe
mWindow->setCloseRequestCallback(
[this]( EE::Window::Window* win ) -> bool { return onCloseRequestCallback( win ); } );
mWindow->setQuitCallback( [this]( EE::Window::Window* win ) {
if ( mWindow->isOpen() )
onCloseRequestCallback( win );
} );
mWindow->getInput()->pushCallback( [this]( InputEvent* event ) {
if ( event->Type == InputEvent::FileDropped ) {
onFileDropped( event->file.file );