Skip to content

Bugfix FXIOS-14641 - [Toolbar] - Subdomain text loses themed color when tab tray button is tapped #31664

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
PARAIPAN9 wants to merge 2 commits into
base: main
Choose a base branch
from
+1 −11
Open

Bugfix FXIOS-14641 - [Toolbar] - Subdomain text loses themed color when tab tray button is tapped #31664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30809ff
Remove setting the text color in LocationTextField.
PARAIPAN9 Jan 15, 2026
20c2723
Set textColor.
PARAIPAN9 Jan 16, 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
1 change: 0 additions & 1 deletion BrowserKit/Sources/ToolbarKit/AddressToolbar/LocationView/LocationTextField.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,6 @@ class LocationTextField: UITextField, UITextFieldDelegate, ThemeApplicable {
tintColor = colors.layerSelectedText
clearButtonTintColor = colors.iconPrimary
markedTextStyle = [NSAttributedString.Key.backgroundColor: colors.layerAutofillText]
textColor = colors.textPrimary
tintClearButton()
}

Expand Down
11 changes: 1 addition & 10 deletions BrowserKit/Sources/ToolbarKit/AddressToolbar/LocationView/LocationView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,13 +238,6 @@ final class LocationView: UIView,
}

// MARK: - Layout
override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
super.traitCollectionDidChange(previousTraitCollection)
DispatchQueue.main.async { [self] in
formatAndTruncateURLTextField()
}
}

override func layoutSubviews() {
super.layoutSubviews()

Expand Down Expand Up @@ -543,7 +536,6 @@ final class LocationView: UIView,

private func formatAndTruncateURLTextField() {
guard !isEditing else { return }

let paragraphStyle = NSMutableParagraphStyle()
paragraphStyle.lineBreakMode = .byTruncatingHead

Expand Down Expand Up @@ -703,7 +695,6 @@ final class LocationView: UIView,
}

func locationTextFieldDidEndEditing(_ textField: UITextField) {
formatAndTruncateURLTextField()
if isURLTextFieldEmpty {
updateGradient()
} else {
Expand Down Expand Up @@ -755,11 +746,11 @@ final class LocationView: UIView,
searchEngineContentView.applyTheme(theme: theme)
lockIconButton.backgroundColor = scrollAlpha.isZero ? nil : mainBackgroundColor
urlTextField.applyTheme(theme: theme)
urlTextField.textColor = urlTextFieldColor
urlTextField.attributedPlaceholder = NSAttributedString(
string: urlTextField.placeholder ?? "",
attributes: [.foregroundColor: colors.textPrimary]
)

safeListedURLImageColor = colors.iconAccentBlue
lockIconImageColor = colors.textSecondary

Expand Down