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

eepp: Added ScopedOp and BoolScopedOp. General optimization of lambda captures. Added support in UICodeEditorSplitter for navigation history.

Browse Source 
ecode: Implemented navigation history over the editor, with Alt + Left | Right you can navigate over the relevant code navigation history.
This commit is contained in:
Martín Lucas Golini
2023-06-25 21:14:36 -03:00
parent 7e1e715dfd
commit f58866dd66
85 changed files with 958 additions and 631 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/modules/eterm/src/eterm/ui/uiterminal.cpp
View File

@@ -53,7 +53,7 @@ UITerminal::UITerminal( const std::shared_ptr<TerminalDisplay>& terminalDisplay
mFlags |= UI_TAB_STOP | UI_SCROLLABLE;
if ( !terminalDisplay )
return;
mTerm->pushEventCallback( [&]( const TerminalDisplay::Event& event ) {
mTerm->pushEventCallback( [this]( const TerminalDisplay::Event& event ) {
switch ( event.type ) {
case TerminalDisplay::EventType::TITLE: {
if ( !mIsCustomTitle && mTitle != event.eventData ) {
@@ -77,28 +77,28 @@ UITerminal::UITerminal( const std::shared_ptr<TerminalDisplay>& terminalDisplay
} );
mVScroll->setParent( this );
mVScroll->addEventListener( Event::OnValueChange, [&]( const Event* ) { updateScroll(); } );
mVScroll->addEventListener( Event::OnValueChange, [this]( const Event* ) { updateScroll(); } );
setCommand( "terminal-scroll-up-screen",
[&] { mTerm->action( TerminalShortcutAction::SCROLLUP_SCREEN ); } );
[this] { mTerm->action( TerminalShortcutAction::SCROLLUP_SCREEN ); } );
setCommand( "terminal-scroll-down-screen",
[&] { mTerm->action( TerminalShortcutAction::SCROLLDOWN_SCREEN ); } );
[this] { mTerm->action( TerminalShortcutAction::SCROLLDOWN_SCREEN ); } );
setCommand( "terminal-scroll-up-row",
[&] { mTerm->action( TerminalShortcutAction::SCROLLUP_ROW ); } );
[this] { mTerm->action( TerminalShortcutAction::SCROLLUP_ROW ); } );
setCommand( "terminal-scroll-down-row",
[&] { mTerm->action( TerminalShortcutAction::SCROLLDOWN_ROW ); } );
[this] { mTerm->action( TerminalShortcutAction::SCROLLDOWN_ROW ); } );
setCommand( "terminal-scroll-up-history",
[&] { mTerm->action( TerminalShortcutAction::SCROLLUP_HISTORY ); } );
[this] { mTerm->action( TerminalShortcutAction::SCROLLUP_HISTORY ); } );
setCommand( "terminal-scroll-down-history",
[&] { mTerm->action( TerminalShortcutAction::SCROLLDOWN_HISTORY ); } );
[this] { mTerm->action( TerminalShortcutAction::SCROLLDOWN_HISTORY ); } );
setCommand( "terminal-font-size-grow",
[&] { mTerm->action( TerminalShortcutAction::FONTSIZE_GROW ); } );
[this] { mTerm->action( TerminalShortcutAction::FONTSIZE_GROW ); } );
setCommand( "terminal-font-size-shrink",
[&] { mTerm->action( TerminalShortcutAction::FONTSIZE_SHRINK ); } );
setCommand( "terminal-paste", [&] { mTerm->action( TerminalShortcutAction::PASTE ); } );
setCommand( "terminal-copy", [&] { mTerm->action( TerminalShortcutAction::COPY ); } );
[this] { mTerm->action( TerminalShortcutAction::FONTSIZE_SHRINK ); } );
setCommand( "terminal-paste", [this] { mTerm->action( TerminalShortcutAction::PASTE ); } );
setCommand( "terminal-copy", [this] { mTerm->action( TerminalShortcutAction::COPY ); } );
setCommand( "terminal-open-link",
[&] { Engine::instance()->openURI( mTerm->getTerminal()->getSelection() ); } );
[this] { Engine::instance()->openURI( mTerm->getTerminal()->getSelection() ); } );
subscribeScheduledUpdate();
}
@@ -565,7 +565,7 @@ bool UITerminal::onCreateContextMenu( const Vector2i& position, const Uint32& fl
}
menu->setCloseOnHide( true );
menu->addEventListener( Event::OnItemClicked, [&]( const Event* event ) {
menu->addEventListener( Event::OnItemClicked, [this]( const Event* event ) {
if ( !event->getNode()->isType( UI_TYPE_MENUITEM ) )
return;
UIMenuItem* item = event->getNode()->asType<UIMenuItem>();
@@ -578,7 +578,7 @@ bool UITerminal::onCreateContextMenu( const Vector2i& position, const Uint32& fl
UIMenu::findBestMenuPos( pos, menu );
menu->setPixelsPosition( pos );
menu->show();
menu->addEventListener( Event::OnClose, [&]( const Event* ) { mCurrentMenu = nullptr; } );
menu->addEventListener( Event::OnClose, [this]( const Event* ) { mCurrentMenu = nullptr; } );
mCurrentMenu = menu;
return true;
}

7
src/modules/maps/src/eepp/maps/mapeditor/mapeditor.cpp
View File

@@ -158,10 +158,11 @@ void MapEditor::createMenuBar() {
PU3->getUISceneNode()->findIconDrawable( "zoom-out", PixelDensity::dpToPxI( 16 ) ) );
PU3->add( "Normal Size", PU3->getUISceneNode()->findIconDrawable(
"zoom-original", PixelDensity::dpToPxI( 16 ) ) );
addShortcut( { KEY_KP_PLUS, KeyMod::getDefaultModifier() }, "zoom-in", [&] { zoomIn(); } );
addShortcut( { KEY_KP_MINUS, KeyMod::getDefaultModifier() }, "zoom-out", [&] { zoomOut(); } );
addShortcut( { KEY_KP_PLUS, KeyMod::getDefaultModifier() }, "zoom-in", [this] { zoomIn(); } );
addShortcut( { KEY_KP_MINUS, KeyMod::getDefaultModifier() }, "zoom-out",
[this] { zoomOut(); } );
addShortcut( { KEY_0, KeyMod::getDefaultModifier() }, "zoom-reset",
[&] { mUIMap->Map()->setScale( 1 ); } );
[this] { mUIMap->Map()->setScale( 1 ); } );
PU3->addSeparator();

2
src/modules/maps/src/eepp/maps/mapeditor/uimap.cpp
View File

@@ -50,7 +50,7 @@ UIMap::UIMap( UITheme* Theme, TileMap* Map ) :
onUpdateScreenPos();
addEventListener( Event::OnUpdateScreenPosition, [&]( const Event* ) { onUpdateScreenPos(); } );
on( Event::OnUpdateScreenPosition, [this]( const Event* ) { onUpdateScreenPos(); } );
getUIStyle()->setDisableAnimations( false );
}