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

Minor annoying bugs fixes.

Browse Source 
ecode: Added fallback font to the build.
This commit is contained in:
Martín Lucas Golini
2022-10-19 01:42:22 -03:00
parent 46c374cabe
commit f361c69115
11 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/ecode/ecode.cpp
View File

@@ -376,7 +376,7 @@ void App::loadConfig( const LogLevel& logLevel ) {
FileSystem::makeDir( mConfigPath );
FileSystem::dirAddSlashAtEnd( mConfigPath );
mPluginsPath = mConfigPath + "plugins";
mColorSchemesPath = mConfigPath + "colorschemes";
mColorSchemesPath = mConfigPath + "editor" + FileSystem::getOSSlash() + "colorschemes";
mTerminalManager = std::make_unique<TerminalManager>( this );
mTerminalManager->setTerminalColorSchemesPath( mConfigPath + "terminal" +
FileSystem::getOSSlash() + "colorschemes" );
@@ -2053,11 +2053,13 @@ static void updateKeybindings( IniFile& ini, const std::string& group, Input* in
for ( const auto& key : keybindings )
invertedKeybindings[key.second] = key.first;
bool keybindingsWereEmpty = keybindings.empty();
if ( defKeybindings.size() != keybindings.size() || forceRebind ) {
for ( const auto& key : defKeybindings ) {
auto foundCmd = invertedKeybindings.find( key.second );
auto shortcutStr = bindings.getShortcutString( key.first );
if ( foundCmd == invertedKeybindings.end() &&
if ( ( foundCmd == invertedKeybindings.end() || keybindingsWereEmpty ) &&
keybindings.find( shortcutStr ) == keybindings.end() ) {
keybindings[shortcutStr] = key.second;
invertedKeybindings[key.second] = shortcutStr;