jmbwell/world-manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restore list selection and improve sidebar header clicks

Browse Source
This commit is contained in:
John Burwell 2026-05-29 18:41:25 -05:00
parent f6ab43833c
commit 5a2eea1a3d
2 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
World Manager for Minecraft/UI/List/ItemListColumnViews.swift
View File

@ -50,11 +50,8 @@ struct ItemListColumnView<MenuContent: View>: View {
.onDrop(of: [UTType.fileURL.identifier], isTargeted: $isDropTargeted, perform: dropAction) .onDrop(of: [UTType.fileURL.identifier], isTargeted: $isDropTargeted, perform: dropAction)
} else { } else {
List(items, selection: $selectedItemID) { item in List(items, selection: $selectedItemID) { item in
ContentRowView(item: item) ContentRowView(item: item, dragProvider: dragProvider)
.tag(item.id) .tag(item.id)
.onDrag {
dragProvider(item)
}
.contextMenu { .contextMenu {
itemContextMenu(item) itemContextMenu(item)
} }
@ -143,10 +140,14 @@ private struct ItemListHeaderView: View {
private struct ContentRowView: View { private struct ContentRowView: View {
let item: MinecraftContentItem let item: MinecraftContentItem
let dragProvider: (MinecraftContentItem) -> NSItemProvider
var body: some View { var body: some View {
HStack(alignment: .center, spacing: 10) { HStack(alignment: .center, spacing: 10) {
ItemThumbnailView(iconURL: item.iconURL) ItemThumbnailView(iconURL: item.iconURL)
.onDrag {
dragProvider(item)
}
VStack(alignment: .leading, spacing: 4) { VStack(alignment: .leading, spacing: 4) {
Text(item.displayName) Text(item.displayName)
@ -164,6 +165,14 @@ private struct ContentRowView: View {
ProgressView() ProgressView()
.controlSize(.small) .controlSize(.small)
} }
Image(systemName: "square.and.arrow.up")
.font(.caption)
.foregroundStyle(.tertiary)
.help("Drag Out as Minecraft Package")
.onDrag {
dragProvider(item)
}
} }
.padding(.vertical, 2) .padding(.vertical, 2)
.contentShape(Rectangle()) .contentShape(Rectangle())

8
World Manager for Minecraft/UI/Sidebar/SidebarColumnViews.swift
View File

@ -74,6 +74,8 @@ struct SourcesSidebarView: View {
@ViewBuilder @ViewBuilder
private func sourceSectionRows(for source: MinecraftSource) -> some View { private func sourceSectionRows(for source: MinecraftSource) -> some View {
let sourceFilters = filters(source)
SourceHeaderRow( SourceHeaderRow(
source: source, source: source,
isSelected: selection == .source(sourceID: source.id), isSelected: selection == .source(sourceID: source.id),
@ -96,7 +98,7 @@ struct SourcesSidebarView: View {
} }
} }
ForEach(filters(source)) { filter in ForEach(sourceFilters) { filter in
SidebarFilterRow(filter: filter, isIndented: true) SidebarFilterRow(filter: filter, isIndented: true)
.tag(filter.selection as SidebarSelection?) .tag(filter.selection as SidebarSelection?)
} }
@ -154,6 +156,7 @@ private struct SourceHeaderRow: View {
@State private var isHovering = false @State private var isHovering = false
var body: some View { var body: some View {
Button(action: onSelect) {
HStack(spacing: 8) { HStack(spacing: 8) {
Image(systemName: headerSymbolName) Image(systemName: headerSymbolName)
.font(.system(size: 14, weight: .semibold)) .font(.system(size: 14, weight: .semibold))
@ -178,11 +181,12 @@ private struct SourceHeaderRow: View {
.frame(width: 24, height: 24) .frame(width: 24, height: 24)
} }
} }
}
.buttonStyle(.plain)
.padding(.horizontal, 10) .padding(.horizontal, 10)
.padding(.vertical, 8) .padding(.vertical, 8)
.appSidebarRowSurface(isHighlighted: isHovering && !isSelected) .appSidebarRowSurface(isHighlighted: isHovering && !isSelected)
.contentShape(Rectangle()) .contentShape(Rectangle())
.onTapGesture(perform: onSelect)
.onHover { isHovering = $0 } .onHover { isHovering = $0 }
} }