Skip to content

Fix display name editor mouse controls #15

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

Merged
TerrifiedBug merged 1 commit into from
Jul 13, 2026
Merged

Fix display name editor mouse controls #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ All notable changes to TickerBar will be documented in this file.

## [Unreleased]

### Fixed
- Display-name editing now stays inside the menu-bar panel, so its controls respond to mouse clicks instead of dismissing the panel.

## [1.4.0] - 2026-07-13

### Added
Expand Down
60 changes: 39 additions & 21 deletions TickerBar/Views/WatchlistView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ struct WatchlistView: View {
@State private var searchTask: Task<Void, Never>?
@State private var displayNameSymbol: String?
@State private var displayNameText = ""
@State private var showingDisplayNameEditor = false
@State private var alertSymbol: String?
@State private var alertPriceText = ""
@State private var alertIsAbove = true
Expand Down Expand Up @@ -121,7 +120,6 @@ struct WatchlistView: View {
Button(service.displayNames[stock.symbol] == nil ? "Set Display Name..." : "Edit Display Name...") {
displayNameSymbol = stock.symbol
displayNameText = service.displayNames[stock.symbol] ?? ""
showingDisplayNameEditor = true
}

Divider()
Expand Down Expand Up @@ -185,6 +183,45 @@ struct WatchlistView: View {
}
}

// Display name input
if let symbol = displayNameSymbol {
VStack(spacing: 8) {
HStack {
Text("Display name for \(symbol)")
.font(.caption)
.fontWeight(.semibold)
Spacer()
Button(action: { displayNameSymbol = nil }) {
Image(systemName: "xmark.circle.fill")
.foregroundStyle(.secondary)
}
.buttonStyle(.plain)
}
Text("Replaces the ticker and hides its currency symbol in the menu bar and watchlist.")
.font(.caption2)
.foregroundStyle(.secondary)
.frame(maxWidth: .infinity, alignment: .leading)
HStack(spacing: 8) {
TextField("Alias", text: $displayNameText)
.textFieldStyle(.roundedBorder)
if service.displayNames[symbol] != nil {
Button("Clear", role: .destructive) {
service.setDisplayName("", for: symbol)
displayNameSymbol = nil
}
}
Button("Save") {
service.setDisplayName(displayNameText, for: symbol)
displayNameSymbol = nil
}
.disabled(displayNameText.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty)
}
}
.padding(.horizontal, 12)
.padding(.vertical, 8)
.background(.background.opacity(0.5))
}

// Price alert input
if let symbol = alertSymbol {
VStack(spacing: 8) {
Expand Down Expand Up @@ -423,25 +460,6 @@ struct WatchlistView: View {
MenuBarWindowResizer(targetHeight: proxy.size.height)
}
)
.alert("Display Name", isPresented: $showingDisplayNameEditor) {
TextField("Alias", text: $displayNameText)
Button("Cancel", role: .cancel) {}
if let symbol = displayNameSymbol, service.displayNames[symbol] != nil {
Button("Clear", role: .destructive) {
service.setDisplayName("", for: symbol)
}
}
Button("Save") {
if let symbol = displayNameSymbol {
service.setDisplayName(displayNameText, for: symbol)
}
}
.disabled(displayNameText.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty)
} message: {
if let symbol = displayNameSymbol {
Text("Replaces \(symbol) and hides the currency symbol in the menu bar and watchlist.")
}
}
}

// MARK: - Alert + holdings helpers
Expand Down
Loading