Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
569e56dbba | ||
|
|
78d56ca79b |
@@ -31,13 +31,20 @@ clicking an item copies it back to the clipboard.
|
|||||||
`setDone(_:ids:)`, `move(ids:to:)`) back the selection context menu, so one
|
`setDone(_:ids:)`, `move(ids:to:)`) back the selection context menu, so one
|
||||||
action applies to every selected item and image files are cleaned up once.
|
action applies to every selected item and image files are cleaned up once.
|
||||||
Saves on every mutation.
|
Saves on every mutation.
|
||||||
- `Sources/Prompt/PanelView.swift` — the panel UI. Header (section switcher,
|
- `Sources/Prompt/Theme.swift` — the panel's appearance-aware colours. Dark
|
||||||
search, add photos, close), item list, composer. Composer `# Name` creates/
|
mode is pure black rather than the system window grey (the panel is a
|
||||||
|
full-height strip beside your work, where grey reads as a half-lit window);
|
||||||
|
light mode keeps the system window colour. `Theme.background` is also handed
|
||||||
|
to the `NSPanel` so the strip under the transparent titlebar matches, and the
|
||||||
|
row colour stays slightly lighter than black so cards remain visible.
|
||||||
|
- `Sources/Prompt/PanelView.swift` — the panel UI. Header (workspace switcher,
|
||||||
|
search, add photos), item list, composer. There is no in-header close button:
|
||||||
|
the window's own close button hides the panel. Composer `# Name` creates/
|
||||||
switches sections. Click = select (Shift+click for a range); the selection
|
switches sections. Click = select (Shift+click for a range); the selection
|
||||||
bar offers Copy (single item), Copy as List and Copy as Lines; right-click =
|
bar offers Copy (single item), Copy as List, Copy as Lines and Delete;
|
||||||
context menu acting on the whole selection (Copy, Copy as List, Copy as
|
right-click = context menu acting on the whole selection (Copy, Copy as List,
|
||||||
Lines, Done, Edit, Open, Merge, Move To, Delete). Esc clears the selection
|
Copy as Lines, Done, Edit, Open, Merge, Move To, Delete). Esc clears the
|
||||||
before it hides the panel. Drop target for images/files.
|
selection before it hides the panel. Drop target for images/files.
|
||||||
- `Sources/Prompt/PanelController.swift` — owns the floating `NSPanel`
|
- `Sources/Prompt/PanelController.swift` — owns the floating `NSPanel`
|
||||||
(`.nonactivatingPanel`, `.floating`, right-edge docked, frame autosaved as
|
(`.nonactivatingPanel`, `.floating`, right-edge docked, frame autosaved as
|
||||||
`PromptPanel`), the Cmd+V image-paste monitor, and `EditWindowController`
|
`PromptPanel`), the Cmd+V image-paste monitor, and `EditWindowController`
|
||||||
|
|||||||
@@ -5,8 +5,8 @@ A native macOS app for keeping prompts and photos, in the spirit of
|
|||||||
to your work. Select what you need and send it back to your clipboard.
|
to your work. Select what you need and send it back to your clipboard.
|
||||||
|
|
||||||
- **Click to select** — clicking a card selects it (Shift+click for a range),
|
- **Click to select** — clicking a card selects it (Shift+click for a range),
|
||||||
and the selection bar copies a single item as-is, or the whole selection as a
|
and the selection bar copies a single item as-is, the whole selection as a
|
||||||
numbered list or as plain newline-separated lines.
|
numbered list or as plain newline-separated lines, or deletes it.
|
||||||
- **Text or photo** — copying sends text back as text and a photo back as an
|
- **Text or photo** — copying sends text back as text and a photo back as an
|
||||||
image.
|
image.
|
||||||
- **Capture from anywhere** — select text in any app and tap **Left Shift twice**.
|
- **Capture from anywhere** — select text in any app and tap **Left Shift twice**.
|
||||||
|
|||||||
@@ -56,6 +56,10 @@ final class PanelController: NSObject {
|
|||||||
panel.isMovableByWindowBackground = true
|
panel.isMovableByWindowBackground = true
|
||||||
panel.hidesOnDeactivate = false
|
panel.hidesOnDeactivate = false
|
||||||
panel.isReleasedWhenClosed = false
|
panel.isReleasedWhenClosed = false
|
||||||
|
panel.isOpaque = true
|
||||||
|
// Match the SwiftUI content so the titlebar strip and any resize flash
|
||||||
|
// do not show the system grey through.
|
||||||
|
panel.backgroundColor = Theme.background
|
||||||
panel.collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary]
|
panel.collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary]
|
||||||
panel.contentView = NSHostingView(rootView: PanelView(store: Store.shared))
|
panel.contentView = NSHostingView(rootView: PanelView(store: Store.shared))
|
||||||
panel.setFrameAutosaveName("PromptPanel")
|
panel.setFrameAutosaveName("PromptPanel")
|
||||||
|
|||||||
@@ -40,6 +40,7 @@ struct PanelView: View {
|
|||||||
composerField
|
composerField
|
||||||
}
|
}
|
||||||
.frame(minWidth: 300)
|
.frame(minWidth: 300)
|
||||||
|
.background(Theme.backgroundSwiftUI)
|
||||||
.background(shortcutButtons)
|
.background(shortcutButtons)
|
||||||
.overlay(sectionSwitcher)
|
.overlay(sectionSwitcher)
|
||||||
.overlay(syncOverlay)
|
.overlay(syncOverlay)
|
||||||
@@ -82,9 +83,6 @@ struct PanelView: View {
|
|||||||
.buttonStyle(.plain).foregroundStyle(.secondary).help("Search (Cmd+F)")
|
.buttonStyle(.plain).foregroundStyle(.secondary).help("Search (Cmd+F)")
|
||||||
Button { addPhotos() } label: { Image(systemName: "photo.on.rectangle.angled") }
|
Button { addPhotos() } label: { Image(systemName: "photo.on.rectangle.angled") }
|
||||||
.buttonStyle(.plain).foregroundStyle(.secondary).help("Add photos")
|
.buttonStyle(.plain).foregroundStyle(.secondary).help("Add photos")
|
||||||
Button { PanelController.shared.hide() } label: { Image(systemName: "xmark") }
|
|
||||||
.buttonStyle(.plain).foregroundStyle(.secondary)
|
|
||||||
.help("Hide the panel (Cmd+W) — Prompt keeps running so Shift-Shift capture still works. Quit from the menu bar icon or Cmd+Q.")
|
|
||||||
}
|
}
|
||||||
.padding(.horizontal, 12)
|
.padding(.horizontal, 12)
|
||||||
.padding(.vertical, 10)
|
.padding(.vertical, 10)
|
||||||
@@ -248,7 +246,7 @@ struct PanelView: View {
|
|||||||
|
|
||||||
private func rowBackground(_ item: PromptItem) -> Color {
|
private func rowBackground(_ item: PromptItem) -> Color {
|
||||||
if selection.contains(item.id) { return Color.accentColor.opacity(0.25) }
|
if selection.contains(item.id) { return Color.accentColor.opacity(0.25) }
|
||||||
return Color.primary.opacity(0.05)
|
return Theme.rowSwiftUI
|
||||||
}
|
}
|
||||||
|
|
||||||
@ViewBuilder
|
@ViewBuilder
|
||||||
@@ -575,6 +573,12 @@ struct PanelView: View {
|
|||||||
.font(.caption)
|
.font(.caption)
|
||||||
.buttonStyle(.plain)
|
.buttonStyle(.plain)
|
||||||
.foregroundStyle(Color.accentColor)
|
.foregroundStyle(Color.accentColor)
|
||||||
|
Button { deleteSelection() } label: {
|
||||||
|
Image(systemName: "trash")
|
||||||
|
}
|
||||||
|
.buttonStyle(.plain)
|
||||||
|
.foregroundStyle(.red)
|
||||||
|
.help("Delete selected")
|
||||||
Button { clearSelection() } label: {
|
Button { clearSelection() } label: {
|
||||||
Image(systemName: "xmark.circle.fill")
|
Image(systemName: "xmark.circle.fill")
|
||||||
}
|
}
|
||||||
@@ -587,6 +591,12 @@ struct PanelView: View {
|
|||||||
.background(Color.accentColor.opacity(0.12))
|
.background(Color.accentColor.opacity(0.12))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private func deleteSelection() {
|
||||||
|
guard !selection.isEmpty else { return }
|
||||||
|
store.delete(ids: selection)
|
||||||
|
clearSelection()
|
||||||
|
}
|
||||||
|
|
||||||
private func copySelection(asList: Bool) {
|
private func copySelection(asList: Bool) {
|
||||||
guard !selection.isEmpty else { return }
|
guard !selection.isEmpty else { return }
|
||||||
if asList {
|
if asList {
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
import AppKit
|
||||||
|
import SwiftUI
|
||||||
|
|
||||||
|
/// Appearance-aware colours for the panel.
|
||||||
|
///
|
||||||
|
/// Dark mode is pure black rather than the system window grey: the panel is a
|
||||||
|
/// full-height strip that sits beside your work, and the grey reads as a
|
||||||
|
/// half-lit window next to a dark editor or terminal.
|
||||||
|
enum Theme {
|
||||||
|
static func isDark(_ appearance: NSAppearance) -> Bool {
|
||||||
|
appearance.bestMatch(from: [.aqua, .darkAqua]) == .darkAqua
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The panel's own background (also handed to the NSPanel so the area under
|
||||||
|
/// the transparent titlebar matches).
|
||||||
|
static let background = NSColor(name: nil) { appearance in
|
||||||
|
isDark(appearance) ? .black : .windowBackgroundColor
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Card background, kept subtle but visible against pure black.
|
||||||
|
static let row = NSColor(name: nil) { appearance in
|
||||||
|
isDark(appearance) ? NSColor(white: 1, alpha: 0.07) : NSColor(white: 0, alpha: 0.05)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Same colours for SwiftUI.
|
||||||
|
static let backgroundSwiftUI = Color(nsColor: background)
|
||||||
|
static let rowSwiftUI = Color(nsColor: row)
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user