Skip to content

🐞 Fix icon for cycle actions #648

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
mrkai77 merged 2 commits into from
Dec 29, 2024
Merged

🐞 Fix icon for cycle actions #648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
646267f
🐞 Make cycle icon reflect first action
mrkai77 Dec 29, 2024
fb2343f
✨ Backup icons for custom and cycle actions
mrkai77 Dec 29, 2024
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
2 changes: 1 addition & 1 deletion Loop/Luminare/Settings/Keybindings/CustomActionConfigurationView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ struct CustomActionConfigurationView: View {
columns: 3,
roundTop: false
) { anchor in
IconView(action: .constant(anchor.iconAction))
IconView(action: anchor.iconAction)
}

if action.anchor ?? .center == .center || action.anchor == .macOSCenter {
Expand Down
4 changes: 2 additions & 2 deletions Loop/Luminare/Settings/Keybindings/KeybindItemView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ struct KeybindItemView: View {
} label: {
HStack(spacing: 0) {
HStack(spacing: 8) {
IconView(action: $keybind)
IconView(action: keybind)

Text(keybind.getName())
.lineLimit(1)
Expand Down Expand Up @@ -227,7 +227,7 @@ struct KeybindItemView: View {
sections + [moreSection]
) { item in
HStack(spacing: 8) {
IconView(action: .constant(.init(item)))
IconView(action: .init(item))
Text(item.name)
}
}
Expand Down
39 changes: 27 additions & 12 deletions Loop/Window Management/WindowAction+Image.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,24 +57,22 @@ extension WindowAction {
}

struct IconView: View {
@Binding var action: WindowAction
@State var frame: CGRect = .init(x: 0, y: 0, width: 1, height: 1)
let action: WindowAction

let size = CGSize(width: 14, height: 10)
let inset: CGFloat = 2
let outerCornerRadius: CGFloat = 3
@State private var frame: CGRect = .init(x: 0, y: 0, width: 1, height: 1)

private let size = CGSize(width: 14, height: 10)
private let inset: CGFloat = 2
private let outerCornerRadius: CGFloat = 3

var body: some View {
if action.direction == .cycle, let first = action.cycle?.first {
IconView(action: .constant(first))
IconView(action: first)
.id(first.id)
.animation(LuminareConstants.fastAnimation, value: first)
} else {
ZStack {
if let icon = action.icon {
icon
.font(.system(size: 8))
.fontWeight(.bold)
.frame(width: size.width, height: size.height)
} else {
if frame.size.area != 0 {
ZStack {
RoundedRectangle(cornerRadius: outerCornerRadius - inset)
.frame(
Expand All @@ -95,6 +93,23 @@ struct IconView: View {
refreshFrame()
}
}
} else {
Group {
if let icon = action.icon {
icon
.font(.system(size: 8))
.fontWeight(.bold)
} else if action.direction == .cycle {
Image(._18PxRepeat4)
.resizable()
.scaledToFit()
} else {
Image(._18PxRuler)
.resizable()
.scaledToFit()
}
}
.frame(width: size.width, height: size.height)
}
}
.clipShape(.rect(cornerRadius: outerCornerRadius - inset))
Expand Down