Add an option to configure the Settings -> Window -> "Use editor font in input fields" (this is enabled by default but not always convenient).

This commit is contained in:
Martín Lucas Golini
2025-12-21 13:00:52 -03:00
parent 8378f2a1fa
commit 5965d77e02
9 changed files with 64 additions and 25 deletions

View File

@@ -498,17 +498,8 @@ void App::openFontDialog( std::string& fontPath, bool loadingMonoFont, bool term
mUISceneNode->find<UICodeEditor>( "app_output_output" ) )
appOutputEditor->setFont( fontMono );
if ( auto locateFind =
mUISceneNode->find<UITextInput>( "locate_find" ) )
locateFind->setFont( fontMono );
if ( auto globalSearchFind =
mUISceneNode->find<UITextInput>( "global_search_find" ) )
globalSearchFind->setFont( fontMono );
if ( auto globalSearchWhere =
mUISceneNode->find<UITextInput>( "global_search_where" ) )
globalSearchWhere->setFont( fontMono );
if ( mConfig.ui.editorFontInInputFields )
updateInputFonts();
}
}
};
@@ -521,6 +512,25 @@ void App::openFontDialog( std::string& fontPath, bool loadingMonoFont, bool term
dialog->show();
}
void App::updateInputFonts() {
FontTrueType* font = mConfig.ui.editorFontInInputFields ? mFontMono : mFont;
if ( auto locateFind = mUISceneNode->find<UITextInput>( "locate_find" ) )
locateFind->setFont( font );
if ( auto searchFind = mUISceneNode->find<UITextInput>( "search_find" ) )
searchFind->setFont( font );
if ( auto searchReplace = mUISceneNode->find<UITextInput>( "search_replace" ) )
searchReplace->setFont( font );
if ( auto globalSearchFind = mUISceneNode->find<UITextInput>( "global_search_find" ) )
globalSearchFind->setFont( font );
if ( auto globalSearchWhere = mUISceneNode->find<UITextInput>( "global_search_where" ) )
globalSearchWhere->setFont( font );
}
void App::downloadFileWebDialog() {
UIMessageBox* msgBox =
UIMessageBox::New( UIMessageBox::INPUT, i18n( "please_enter_file_url_ellipsis",
@@ -2020,7 +2030,7 @@ std::vector<std::string> App::getUnlockedCommands() {
"terminal-font-size",
"ui-font-size",
"ui-panel-font-size",
"serif-font",
"sans-serif-font",
"monospace-font",
"terminal-font",
"fallback-font",
@@ -3893,7 +3903,7 @@ void App::init( InitParameters& params ) {
// Load fonts
Clock fontsClock;
mFont = loadFont( "sans-serif", mConfig.ui.serifFont, "fonts/NotoSans-Regular.ttf" );
mFont = loadFont( "sans-serif", mConfig.ui.sansSerifFont, "fonts/NotoSans-Regular.ttf" );
FontFamily::loadFromRegular( mFont );
mFontMono = loadFont( "monospace", mConfig.ui.monospaceFont, "fonts/DejaVuSansMono.ttf" );
@@ -4289,6 +4299,8 @@ void App::init( InitParameters& params ) {
if ( !mConfig.ui.showSidePanel )
showSidePanel( mConfig.ui.showSidePanel );
updateInputFonts();
mSplitter = UICodeEditorSplitter::New( this, mUISceneNode, mThreadPool, mColorSchemes,
mInitColorScheme );
mSplitter->setHideTabBarOnSingleTab( mConfig.editor.hideTabBarOnSingleTab );