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

eepp: Fixed Node::debounce.

Browse Source 
ecode: Fixes in Git plugin, now status also recurses submodules. Fixed doc info being incorrect on startup.
This commit is contained in:
Martín Lucas Golini
2023-12-18 21:18:17 -03:00
parent 40a56513ad
commit fc8ec9610b
14 changed files with 134 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/tools/ecode/plugins/git/gitplugin.cpp
View File

@@ -99,6 +99,13 @@ void GitPlugin::load( PluginManager* pluginManager ) {
config["statusbar_display_modifications"] = mStatusBarDisplayModifications;
updateConfigFile = true;
}
if ( config.contains( "status_recurse_submodules" ) )
mStatusRecurseSubmodules = config.value( "status_recurse_submodules", true );
else {
config["status_recurse_submodules"] = mStatusRecurseSubmodules;
updateConfigFile = true;
}
}
if ( mKeyBindings.empty() ) {
@@ -160,12 +167,17 @@ void GitPlugin::updateStatusBar( bool force ) {
mThreadPool->run( [this, force] {
if ( !mGit )
return;
auto prevBranch = mGitBranch;
mGitBranch = mGit->branch();
auto prevGitStatus = mGitStatus;
mGitStatus = mGit->status();
if ( !force && mGitBranch == prevBranch && mGitStatus == prevGitStatus )
if ( !mGit->getGitFolder().empty() ) {
auto prevBranch = mGitBranch;
mGitBranch = mGit->branch();
auto prevGitStatus = mGitStatus;
mGitStatus = mGit->status( mStatusRecurseSubmodules );
if ( !force && mGitBranch == prevBranch && mGitStatus == prevGitStatus )
return;
} else if ( !mStatusButton ) {
return;
}
getUISceneNode()->runOnMainThread( [this] {
if ( !mStatusBar )
@@ -191,6 +203,11 @@ void GitPlugin::updateStatusBar( bool force ) {
mStatusButton->toPosition( mStatusBar->getChildCount() - 2 );
}
mStatusButton->setVisible( !mGit->getGitFolder().empty() );
if ( mGit->getGitFolder().empty() )
return;
std::string text( mStatusBarDisplayModifications &&
( mGitStatus.totalInserts || mGitStatus.totalDeletions )
? String::format( "%s (+%d / -%d)", mGitBranch.c_str(),
@@ -231,8 +248,10 @@ void GitPlugin::updateStatusBar( bool force ) {
PluginRequestHandle GitPlugin::processMessage( const PluginMessage& msg ) {
switch ( msg.type ) {
case PluginMessageType::WorkspaceFolderChanged: {
if ( mGit )
if ( mGit ) {
mGit->setProjectPath( msg.asJSON()["folder"] );
updateUINow( true );
}
break;
}
case ecode::PluginMessageType::UIReady: {
@@ -285,11 +304,15 @@ void GitPlugin::displayTooltip( UICodeEditor* editor, const Git::Blame& blame,
editor->setTooltipText( str );
mTooltipInfoShowing = true;
mOldBackgroundColor = tooltip->getBackgroundColor();
if ( Color::Transparent == mOldBackgroundColor ) {
tooltip->reloadStyle( true, true, true, true );
mOldBackgroundColor = tooltip->getBackgroundColor();
}
mOldTextStyle = tooltip->getFontStyle();
mOldTextAlign = tooltip->getHorizontalAlign();
mOldDontAutoHideOnMouseMove = tooltip->dontAutoHideOnMouseMove();
mOldUsingCustomStyling = tooltip->getUsingCustomStyling();
mOldBackgroundColor = tooltip->getBackgroundColor();
tooltip->setHorizontalAlign( UI_HALIGN_LEFT );
tooltip->setPixelsPosition( tooltip->getTooltipPosition( position ) );
tooltip->setDontAutoHideOnMouseMove( true );