Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8328e8131d | ||
|
|
6661f41deb |
@@ -58,7 +58,8 @@ clicking an item copies it back to the clipboard.
|
|||||||
There is no in-header close button: the window's own close button hides the
|
There is no in-header close button: the window's own close button hides the
|
||||||
panel. Composer `# Name` creates/
|
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, Copy as Lines and Delete;
|
bar offers Copy (single item), Copy as List, Copy as Lines, Copy & Delete
|
||||||
|
(scissors icon) and Delete;
|
||||||
right-click = context menu acting on the whole selection (Copy, Copy as List,
|
right-click = context menu acting on the whole selection (Copy, Copy as List,
|
||||||
Copy as Lines, Copy & Delete, Done, Edit, Open, Merge, Move To, Delete). Esc clears the
|
Copy as Lines, Copy & Delete, Done, Edit, Open, Merge, Move To, Delete). Esc clears the
|
||||||
selection before it hides the panel. Selection is scoped to the current view:
|
selection before it hides the panel. Selection is scoped to the current view:
|
||||||
|
|||||||
@@ -354,7 +354,11 @@ struct PanelView: View {
|
|||||||
ForEach(store.sections.filter { $0.id != store.sectionID(of: item.id) }) { section in
|
ForEach(store.sections.filter { $0.id != store.sectionID(of: item.id) }) { section in
|
||||||
Button(section.name) {
|
Button(section.name) {
|
||||||
store.move(ids: ids, to: section.id)
|
store.move(ids: ids, to: section.id)
|
||||||
if multiple { clearSelection() }
|
// Moved items leave the current view, so they must
|
||||||
|
// leave the selection too — otherwise they stay
|
||||||
|
// selected, invisible, in the target workspace.
|
||||||
|
selection.subtract(ids)
|
||||||
|
lastSelectedID = nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -705,6 +709,12 @@ struct PanelView: View {
|
|||||||
.font(.caption)
|
.font(.caption)
|
||||||
.buttonStyle(.plain)
|
.buttonStyle(.plain)
|
||||||
.foregroundStyle(Color.accentColor)
|
.foregroundStyle(Color.accentColor)
|
||||||
|
Button { copyAndDeleteSelection() } label: {
|
||||||
|
Image(systemName: "scissors")
|
||||||
|
}
|
||||||
|
.buttonStyle(.plain)
|
||||||
|
.foregroundStyle(Color.accentColor)
|
||||||
|
.help("Copy & Delete")
|
||||||
Button { deleteSelection() } label: {
|
Button { deleteSelection() } label: {
|
||||||
Image(systemName: "trash")
|
Image(systemName: "trash")
|
||||||
}
|
}
|
||||||
@@ -729,6 +739,20 @@ struct PanelView: View {
|
|||||||
clearSelection()
|
clearSelection()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Same as the context menu's Copy & Delete, for the selection bar. A
|
||||||
|
/// single image still copies as an image; a multi-selection copies as
|
||||||
|
/// plain lines, same as Copy as Lines.
|
||||||
|
private func copyAndDeleteSelection() {
|
||||||
|
guard !selection.isEmpty else { return }
|
||||||
|
if selection.count == 1, let id = selection.first, let item = store.item(id) {
|
||||||
|
store.copy(item)
|
||||||
|
} else {
|
||||||
|
store.copyAsLines(ids: selection)
|
||||||
|
}
|
||||||
|
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 {
|
||||||
|
|||||||
Reference in New Issue
Block a user