bukovinafilip/Atoll
1
0
Fork 0
mirror of https://github.com/FBukovina/Atoll.git synced 2026-10-27 15:14:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

BugFix: Hover based highlights

Browse source
This commit is contained in:
Hariharan Mudaliar 2025-12-14 12:54:34 +05:30
commit 369e4fc6a2
No known key found for this signature in database
GPG key ID: D04F1C2B9194DDFC
1 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
DynamicIsland/components/Settings/MusicSlotConfigurationView.swift
View file

@ -6,7 +6,7 @@ struct MusicSlotConfigurationView: View {
@Default(.musicControlSlots) private var musicControlSlots @Default(.musicControlSlots) private var musicControlSlots
@Default(.showMediaOutputControl) private var showMediaOutputControl @Default(.showMediaOutputControl) private var showMediaOutputControl
@ObservedObject private var musicManager = MusicManager.shared @ObservedObject private var musicManager = MusicManager.shared
@State private var selectedSlotIndex: Int? = nil @State private var hoveredSlotIndex: Int? = nil
@State private var targetedSlotIndex: Int? = nil @State private var targetedSlotIndex: Int? = nil
@State private var trashDropIsTargeted: Bool = false @State private var trashDropIsTargeted: Bool = false
@ -111,28 +111,28 @@ struct MusicSlotConfigurationView: View {
private func slotPreview(for index: Int) -> some View { private func slotPreview(for index: Int) -> some View {
let slot = slotValue(at: index) let slot = slotValue(at: index)
let isSelected = selectedSlotIndex == index let isHovered = hoveredSlotIndex == index
let isDropTarget = targetedSlotIndex == index let isDropTarget = targetedSlotIndex == index
return ZStack { return ZStack {
RoundedRectangle(cornerRadius: 10) RoundedRectangle(cornerRadius: 10)
.fill(slotBackgroundColor(isSelected: isSelected, isTargeted: isDropTarget)) .fill(slotBackgroundColor(isHovered: isHovered, isTargeted: isDropTarget))
.overlay( .overlay(
RoundedRectangle(cornerRadius: 10) RoundedRectangle(cornerRadius: 10)
.stroke(slotBorderColor(isSelected: isSelected, isTargeted: isDropTarget), lineWidth: borderWidth(isSelected: isSelected, isTargeted: isDropTarget)) .stroke(slotBorderColor(isHovered: isHovered, isTargeted: isDropTarget), lineWidth: borderWidth(isHovered: isHovered, isTargeted: isDropTarget))
) )
slotContent(for: slot) slotContent(for: slot)
} }
.frame(width: 48, height: 48) .frame(width: 48, height: 48)
.contentShape(RoundedRectangle(cornerRadius: 10)) .contentShape(RoundedRectangle(cornerRadius: 10))
.onTapGesture { .onHover { isInside in
withAnimation(.easeInOut(duration: 0.15)) { withAnimation(.easeInOut(duration: 0.12)) {
selectedSlotIndex = index hoveredSlotIndex = isInside ? index : nil
} }
} }
.onDrag { .onDrag {
selectedSlotIndex = index hoveredSlotIndex = index
return NSItemProvider(object: NSString(string: "slot:\(index)")) return NSItemProvider(object: NSString(string: "slot:\(index)"))
} }
.onDrop(of: [UTType.plainText.identifier], isTargeted: dropTargetBinding(for: index)) { providers in .onDrop(of: [UTType.plainText.identifier], isTargeted: dropTargetBinding(for: index)) { providers in
@ -284,27 +284,27 @@ struct MusicSlotConfigurationView: View {
musicControlSlots = filtered musicControlSlots = filtered
} }
private func slotBackgroundColor(isSelected: Bool, isTargeted: Bool) -> Color { private func slotBackgroundColor(isHovered: Bool, isTargeted: Bool) -> Color {
if isTargeted { if isTargeted {
return Color.accentColor.opacity(0.25) return Color.accentColor.opacity(0.25)
} else if isSelected { } else if isHovered {
return Color.accentColor.opacity(0.15) return Color.accentColor.opacity(0.15)
} }
return Color(nsColor: .controlBackgroundColor) return Color(nsColor: .controlBackgroundColor)
} }
private func slotBorderColor(isSelected: Bool, isTargeted: Bool) -> Color { private func slotBorderColor(isHovered: Bool, isTargeted: Bool) -> Color {
if isTargeted { if isTargeted {
return Color.accentColor return Color.accentColor
} else if isSelected { } else if isHovered {
return Color.accentColor.opacity(0.8) return Color.accentColor.opacity(0.8)
} }
return .clear return .clear
} }
private func borderWidth(isSelected: Bool, isTargeted: Bool) -> CGFloat { private func borderWidth(isHovered: Bool, isTargeted: Bool) -> CGFloat {
if isTargeted { return 2 } if isTargeted { return 2 }
if isSelected { return 1.5 } if isHovered { return 1.5 }
return 0 return 0
} }