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

Reimplemented TextDocument::load* and save*, now uses IOStream (also fixes some issues with line endings).

Browse Source 
String class now uses char32_t as base type, to be compatible with std::u32string.
Some minor refactor: replaced Uint32 type in hashes in favor of String::HashType. Replaced Uint32 type in keycodes in favor of Keycode.
Changed String::hash(String) from CRC32 to std::hash<std::u32string> (many times faster).
And more random refactors and small features in the code editor.
This commit is contained in:
Martín Lucas Golini
2020-05-30 05:57:27 -03:00
parent 597125bf0a
commit 3ea6ab392c
78 changed files with 499 additions and 2016 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,10 +96,6 @@ void mainLoop() {
setAppTitle( docDirtyState ? curFile + "*" : curFile );
}
if ( ( input->isControlPressed() && input->isKeyUp( KEY_O ) ) || input->isKeyUp( KEY_F2 ) ) {
openFileDialog();
}
if ( input->isKeyUp( KEY_F6 ) ) {
uiSceneNode->setHighlightFocus( !uiSceneNode->getHighlightFocus() );
uiSceneNode->setHighlightOver( !uiSceneNode->getHighlightOver() );
@@ -113,21 +109,10 @@ void mainLoop() {
uiSceneNode->setDrawDebugData( !uiSceneNode->getDrawDebugData() );
}
if ( input->isAltPressed() && input->isKeyUp( KEY_RETURN ) ) {
win->toggleFullscreen();
}
if ( input->isScancodeUp( SCANCODE_GRAVE ) ) {
console->toggle();
}
if ( input->isControlPressed() && input->isKeyUp( KEY_L ) ) {
codeEditor->setLocked( !codeEditor->isLocked() );
}
SceneManager::instance()->update();
if ( SceneManager::instance()->getUISceneNode()->invalidated() ) {
if ( SceneManager::instance()->getUISceneNode()->invalidated() || console->isActive() ||
console->isFading() ) {
win->clear();
SceneManager::instance()->draw();
console->draw();
@@ -219,11 +204,21 @@ EE_MAIN_FUNC int main( int argc, char* argv[] ) {
codeEditor->getDocument().setCommand( "find", []() { findTextMessageBox(); } );
codeEditor->getDocument().setCommand( "repeat-find", []() { findText(); } );
codeEditor->getDocument().setCommand( "close-app", []() { closeApp(); } );
codeEditor->addKeyBindingString( "ctrl+s", "save" );
codeEditor->addKeyBindingString( "ctrl+f", "find" );
codeEditor->addKeyBindingString( "f3", "repeat-find" );
codeEditor->addKeyBindingString( "escape", "close-app" );
codeEditor->addKeyBindingString( "ctrl+q", "close-app" );
codeEditor->getDocument().setCommand( "fullscreen-toggle",
[]() { win->toggleFullscreen(); } );
codeEditor->getDocument().setCommand( "open-file", [] { openFileDialog(); } );
codeEditor->getDocument().setCommand( "console-toggle", [] { console->toggle(); } );
codeEditor->addKeyBindingString( "ctrl+s", "save", false );
codeEditor->addKeyBindingString( "ctrl+f", "find", false );
codeEditor->addKeyBindingString( "f3", "repeat-find", false );
codeEditor->addKeyBindingString( "escape", "close-app", true );
codeEditor->addKeyBindingString( "ctrl+q", "close-app", true );
codeEditor->addKeyBindingString( "alt+return", "fullscreen-toggle", true );
codeEditor->addKeyBindingString( "ctrl+o", "open-file", true );
codeEditor->addKeyBindingString( "f2", "open-file", true );
codeEditor->addKeyBindingString( "ctrl+l", "lock-toggle", true );
codeEditor->addKeyBinding( {win->getInput()->getKeyFromScancode( SCANCODE_GRAVE ), 0},
"console-toggle", true );
codeEditor->setFocus();