Minor fixes.

SpartanJ · Dec 27, 2024 · 48772bc · 48772bc
1 parent 524ea4d
commit 48772bc
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/include/eepp/graphics/fonttruetype.hpp b/include/eepp/graphics/fonttruetype.hpp
@@ -146,8 +146,6 @@ class EE_API FontTrueType : public Font {
 
 	void clearCache();
 
-	void updateMonospaceState();
-
   protected:
 	friend class Text;
 
@@ -229,6 +227,7 @@ class EE_API FontTrueType : public Font {
 	bool mEnableDynamicMonospace{ false };
 	bool mIsBold{ false };
 	bool mIsItalic{ false };
+	mutable bool mIsMonospaceCompletePending{ false };
 	mutable UnorderedMap<unsigned int, unsigned int> mClosestCharacterSize;
 	mutable UnorderedMap<Uint32, Uint32> mCodePointIndexCache;
 	mutable UnorderedMap<Uint32, std::tuple<Uint32, Uint32, bool>> mKeyCache;
@@ -244,6 +243,8 @@ class EE_API FontTrueType : public Font {
 	void updateFontInternalId();
 
 	bool setFontFace( void* face );
+
+	void updateMonospaceState() const;
 };
 
 }} // namespace EE::Graphics

diff --git a/src/eepp/graphics/fonttruetype.cpp b/src/eepp/graphics/fonttruetype.cpp
@@ -1403,6 +1403,8 @@ bool FontTrueType::isColorEmojiFont() const {
 }
 
 bool FontTrueType::isMonospace() const {
+	if ( mIsMonospaceCompletePending )
+		updateMonospaceState();
 	return mIsMonospaceComplete;
 }
 
@@ -1422,10 +1424,13 @@ void FontTrueType::setBoldAdvanceSameAsRegular( bool boldAdvanceSameAsRegular )
 	mBoldAdvanceSameAsRegular = boldAdvanceSameAsRegular;
 }
 
-void FontTrueType::updateMonospaceState() {
+void FontTrueType::updateMonospaceState() const {
 	mIsMonospaceComplete = mIsMonospace && !mUsingFallback;
-	if ( !Engine::isEngineRunning() )
+	if ( !Engine::isEngineRunning() || !Engine::instance()->isMainThread() ) {
+		mIsMonospaceCompletePending = true;
 		return;
+	}
+	mIsMonospaceCompletePending = false;
 	if ( mIsMonospaceComplete && mFontBold != nullptr ) {
 		mIsMonospaceComplete = mIsMonospaceComplete && mFontBold->isMonospace() &&
 							   getGlyph( ' ', 10, false, false ).advance ==

diff --git a/src/tools/ecode/ecode.cpp b/src/tools/ecode/ecode.cpp
@@ -3661,11 +3661,6 @@ void App::init( const LogLevel& logLevel, std::string file, const Float& pidelDe
 			return;
 		}
 
-		FontManager::instance()->each( []( auto& font ) {
-			if ( font.second->getType() == FontType::TTF )
-				static_cast<FontTrueType*>( font.second )->updateMonospaceState();
-		} );
-
 		SceneManager::instance()->add( mUISceneNode );
 
 		setTheme( getThemePath() );

diff --git a/src/tools/ecode/plugins/lsp/lspdocumentclient.cpp b/src/tools/ecode/plugins/lsp/lspdocumentclient.cpp
@@ -378,7 +378,7 @@ void LSPDocumentClient::highlight() {
 			[this, firstLine, lastLine]( UICodeEditor* editor ) {
 				if ( editor->isVisible() && &editor->getDocument() == mDoc &&
 					 editor->getVisibleRange().intersectsLineRange( firstLine, lastLine ) ) {
-					editor->invalidateDraw();
+					editor->runOnMainThread( [editor] { editor->invalidateDraw(); } );
 				}
 			} );
 	}