diff --git a/include/eepp/ui/doc/textdocument.hpp b/include/eepp/ui/doc/textdocument.hpp index b29ce7a59..c84396e49 100644 --- a/include/eepp/ui/doc/textdocument.hpp +++ b/include/eepp/ui/doc/textdocument.hpp @@ -179,8 +179,6 @@ class EE_API TextDocument { const TextDocumentLine& getCurrentLine() const; - std::vector& lines(); - bool hasSelection() const; const std::array& getHash() const; diff --git a/src/eepp/ui/doc/textdocument.cpp b/src/eepp/ui/doc/textdocument.cpp index 5ca6e6ff4..64ce43270 100644 --- a/src/eepp/ui/doc/textdocument.cpp +++ b/src/eepp/ui/doc/textdocument.cpp @@ -981,10 +981,6 @@ const TextDocumentLine& TextDocument::getCurrentLine() const { return mLines[getSelection().start().line()]; } -std::vector& TextDocument::lines() { - return mLines; -} - bool TextDocument::hasSelection() const { return mSelection.hasSelection(); } @@ -1248,7 +1244,7 @@ size_t TextDocument::remove( const size_t& cursorIdx, TextRange range, linesRemoved += 1; } - if ( lines().empty() ) + if ( mLines.empty() ) mLines.emplace_back( String( "\n" ) ); if ( mSelection.size() > 1 ) { diff --git a/src/tools/ecode/plugins/git/gitplugin.cpp b/src/tools/ecode/plugins/git/gitplugin.cpp index 46d21b4c1..14680e795 100644 --- a/src/tools/ecode/plugins/git/gitplugin.cpp +++ b/src/tools/ecode/plugins/git/gitplugin.cpp @@ -1072,7 +1072,8 @@ void GitPlugin::diff( const Git::DiffMode mode, const std::string& repoPath ) { break; } doc->setDefaultFileName( repoName + "-" + modeName + ".diff" ); - ret.second->setSyntaxDefinition( SyntaxDefinitionManager::instance()->getByLSPName( "diff" ) ); + ret.second->setSyntaxDefinition( + SyntaxDefinitionManager::instance()->getByLSPName( "diff" ) ); doc->textInput( res.result, false ); doc->moveToStartOfDoc(); doc->resetUndoRedo(); @@ -1090,10 +1091,11 @@ void GitPlugin::diff( const std::string& file, bool isStaged ) { auto ret = mManager->getSplitter()->createEditorInNewTab(); auto doc = ret.second->getDocumentRef(); doc->setDefaultFileName( FileSystem::fileNameFromPath( file ) + ".diff" ); - ret.second->setSyntaxDefinition( SyntaxDefinitionManager::instance()->getByLSPName( "diff" ) ); doc->textInput( res.result, false ); doc->moveToStartOfDoc(); doc->resetUndoRedo(); + ret.second->setSyntaxDefinition( + SyntaxDefinitionManager::instance()->getByLSPName( "diff" ) ); } ); } ); } diff --git a/src/tools/ecode/terminalmanager.cpp b/src/tools/ecode/terminalmanager.cpp index 030e6c94b..090428df4 100644 --- a/src/tools/ecode/terminalmanager.cpp +++ b/src/tools/ecode/terminalmanager.cpp @@ -480,8 +480,10 @@ UITerminal* TerminalManager::createNewTerminal( const std::string& title, UITabW if ( tabWidget->getContainerNode() ) { initialSize = tabWidget->getContainerNode()->getPixelsSize(); if ( Sizef::Zero == initialSize ) { - // Minor hack. Force the Scene Node to update the styles and layouts. - tabWidget->getUISceneNode()->update( Time::Zero ); + // HACK: Force the Scene Node to update the styles and layouts. + tabWidget->getUISceneNode()->updateDirtyStyles(); + tabWidget->getUISceneNode()->updateDirtyStyleStates(); + tabWidget->getUISceneNode()->updateDirtyLayouts(); initialSize = tabWidget->getContainerNode()->getPixelsSize(); } }