Skip to content

Fix bold text flickering and theme switching on every view update #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tayl0r wants to merge 2 commits into
base: develop
Choose a base branch
from
+17 −3
Open

Fix bold text flickering and theme switching on every view update #39

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b14784
Fix bold text flickering on every click/interaction
tayl0r Mar 19, 2026
275681e
Fix theme not updating and track themeName correctly
tayl0r Mar 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions Sources/CodeEditor/UXCodeTextView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ final class UXCodeTextView: UXTextView {
}
private(set) var themeName = CodeEditor.ThemeName.default {
didSet {
guard themeName != oldValue else { return }
highlightr?.setTheme(to: themeName.rawValue)
if let font = highlightr?.theme?.codeFont { self.font = font }
}
Expand Down Expand Up @@ -247,6 +248,7 @@ final class UXCodeTextView: UXTextView {
guard let highlightr = highlightr,
highlightr.setTheme(to: newTheme.rawValue),
let theme = highlightr.theme else { return false }
themeName = newTheme
self.backgroundColor = customBackgroundColor ?? theme.themeBackgroundColor
if let font = theme.codeFont, font !== self.font { self.font = font }
return true
Expand All @@ -256,13 +258,25 @@ final class UXCodeTextView: UXTextView {
func applyNewTheme(_ newTheme: CodeEditor.ThemeName? = nil,
andFontSize newSize: CGFloat) -> Bool
{
let resolvedTheme = newTheme ?? themeName
let themeChanged = resolvedTheme != themeName

// Skip expensive setTheme reload when neither theme nor font size changed.
if !themeChanged,
let existingFont = highlightr?.theme?.codeFont,
existingFont.pointSize == newSize {
return true
}

// Setting the theme reloads it (i.e. makes a "copy").
guard let highlightr = highlightr,
highlightr.setTheme(to: (newTheme ?? themeName).rawValue),
highlightr.setTheme(to: resolvedTheme.rawValue),
let theme = highlightr.theme else { return false }


if themeChanged { themeName = resolvedTheme }

guard theme.codeFont?.pointSize != newSize else { return true }

theme.codeFont = theme.codeFont? .withSize(newSize)
theme.boldCodeFont = theme.boldCodeFont? .withSize(newSize)
theme.italicCodeFont = theme.italicCodeFont?.withSize(newSize)
Expand Down