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

More improvements to the text document and code editor.

Browse Source 
The current working directory is not forced anymore (except for Android), since it can cause some troubles in certain situations.
This commit is contained in:
Martín Lucas Golini
2020-05-27 03:04:16 -03:00
parent 2de37d3a45
commit ed289b5ec6
24 changed files with 764 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/tools/codeeditor/codeeditor.cpp
View File

@@ -52,48 +52,45 @@ void mainLoop() {
input->update();
if ( win->isActive() ) {
if ( codeEditor->isDirty() != docDirtyState ) {
docDirtyState = codeEditor->isDirty();
setAppTitle( docDirtyState ? curFile + "*" : curFile );
}
if ( codeEditor->isDirty() != docDirtyState ) {
docDirtyState = codeEditor->isDirty();
setAppTitle( docDirtyState ? curFile + "*" : curFile );
}
if ( ( input->isControlPressed() && input->isKeyUp( KEY_O ) ) ||
input->isKeyUp( KEY_F2 ) ) {
openFileDialog();
}
if ( ( input->isControlPressed() && input->isKeyUp( KEY_O ) ) || input->isKeyUp( KEY_F2 ) ) {
openFileDialog();
}
if ( input->isControlPressed() && input->isKeyUp( KEY_S ) ) {
codeEditor->save();
}
if ( input->isControlPressed() && input->isKeyUp( KEY_S ) ) {
codeEditor->save();
}
if ( input->isKeyUp( KEY_F6 ) ) {
uiSceneNode->setHighlightOver( !uiSceneNode->getHighlightOver() );
}
if ( input->isKeyUp( KEY_F6 ) ) {
uiSceneNode->setHighlightOver( !uiSceneNode->getHighlightOver() );
}
if ( input->isKeyUp( KEY_F7 ) ) {
uiSceneNode->setDrawBoxes( !uiSceneNode->getDrawBoxes() );
}
if ( input->isKeyUp( KEY_F7 ) ) {
uiSceneNode->setDrawBoxes( !uiSceneNode->getDrawBoxes() );
}
if ( input->isKeyUp( KEY_F8 ) ) {
uiSceneNode->setDrawDebugData( !uiSceneNode->getDrawDebugData() );
}
if ( input->isKeyUp( KEY_F8 ) ) {
uiSceneNode->setDrawDebugData( !uiSceneNode->getDrawDebugData() );
}
if ( input->isKeyUp( KEY_ESCAPE ) && NULL == MsgBox && onCloseRequestCallback( win ) ) {
win->close();
}
if ( input->isKeyUp( KEY_ESCAPE ) && NULL == MsgBox && onCloseRequestCallback( win ) ) {
win->close();
}
if ( input->isAltPressed() && input->isKeyUp( KEY_RETURN ) ) {
win->toggleFullscreen();
}
if ( input->isAltPressed() && input->isKeyUp( KEY_RETURN ) ) {
win->toggleFullscreen();
}
if ( input->isKeyUp( KEY_F3 ) ) {
console->toggle();
}
if ( input->isKeyUp( KEY_F3 ) ) {
console->toggle();
}
if ( input->isControlPressed() && input->isKeyUp( KEY_L ) ) {
codeEditor->setLocked( !codeEditor->isLocked() );
}
if ( input->isControlPressed() && input->isKeyUp( KEY_L ) ) {
codeEditor->setLocked( !codeEditor->isLocked() );
}
SceneManager::instance()->update();
@@ -127,12 +124,18 @@ EE_MAIN_FUNC int main( int argc, char* argv[] ) {
return EXIT_FAILURE;
}
Display* currentDisplay = Engine::instance()->getDisplayManager()->getDisplayIndex( 0 );
DisplayManager* displayManager = Engine::instance()->getDisplayManager();
Display* currentDisplay = displayManager->getDisplayIndex( 0 );
Float pixelDensity = currentDisplay->getPixelDensity();
displayManager->enableScreenSaver();
displayManager->enableMouseFocusClickThrough();
std::string resPath( Sys::getProcessPath() );
win = Engine::instance()->createWindow(
WindowSettings( 1280, 720, windowTitle, WindowStyle::Default, WindowBackend::Default, 32,
"assets/icon/ee.png", pixelDensity ),
resPath + "assets/icon/ee.png", pixelDensity ),
ContextSettings( true ) );
if ( win->isOpen() ) {
@@ -153,15 +156,16 @@ EE_MAIN_FUNC int main( int argc, char* argv[] ) {
uiSceneNode = UISceneNode::New();
uiSceneNode->getUIThemeManager()->setDefaultFont(
FontTrueType::New( "NotoSans-Regular", "assets/fonts/NotoSans-Regular.ttf" ) );
uiSceneNode->getUIThemeManager()->setDefaultFont( FontTrueType::New(
"NotoSans-Regular", resPath + "assets/fonts/NotoSans-Regular.ttf" ) );
Font* fontMono = FontTrueType::New( "monospace", "assets/fonts/DejaVuSansMono.ttf" );
Font* fontMono =
FontTrueType::New( "monospace", resPath + "assets/fonts/DejaVuSansMono.ttf" );
SceneManager::instance()->add( uiSceneNode );
StyleSheetParser cssParser;
if ( cssParser.loadFromFile( "assets/ui/breeze.css" ) ) {
if ( cssParser.loadFromFile( resPath + "assets/ui/breeze.css" ) ) {
uiSceneNode->setStyleSheet( cssParser.getStyleSheet() );
}