Skip to content

🧹 [code health improvement] Refactor getDockRects to use a helper function #13

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

Open
hatimhtm wants to merge 1 commit into
base: main
Choose a base branch
from
Open

🧹 [code health improvement] Refactor getDockRects to use a helper function #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
59 changes: 33 additions & 26 deletions Click2Minimize/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,39 +289,46 @@ class AppDelegate: NSObject, NSApplicationDelegate {
return
}

if result.descriptorType == typeAEList {
for index in 1...result.numberOfItems {
if let item = result.atIndex(index) {
// Each item is an array containing position, size, and app ID
if let positionDescriptor = item.atIndex(1),
let sizeDescriptor = item.atIndex(2),
let appIDDescriptor = item.atIndex(3) {

// Extract position values
let positionX = positionDescriptor.atIndex(1)?.doubleValue ?? 0
let positionY = positionDescriptor.atIndex(2)?.doubleValue ?? 0

// Extract size values
let sizeWidth = sizeDescriptor.atIndex(1)?.doubleValue ?? 0
let sizeHeight = sizeDescriptor.atIndex(2)?.doubleValue ?? 0

// Extract app ID (name)
let appID = appIDDescriptor.stringValue ?? "Unknown"

let rect = NSRect(x: positionX, y: positionY, width: sizeWidth, height: sizeHeight)
let dockItem = DockItem(rect: rect, appID: appID)
dockItems.append(dockItem)
}
}
}
}
let parsedItems = self.parseDockItems(from: result)
dockItems.append(contentsOf: parsedItems)
}

promise(.success(dockItems))
}
}
}

private func parseDockItems(from descriptor: NSAppleEventDescriptor) -> [DockItem] {
var items: [DockItem] = []

guard descriptor.descriptorType == typeAEList else {
return items
}

for index in 1...descriptor.numberOfItems {
guard let item = descriptor.atIndex(index),
let positionDescriptor = item.atIndex(1),
let sizeDescriptor = item.atIndex(2),
let appIDDescriptor = item.atIndex(3) else { continue }

// Extract position values
let positionX = positionDescriptor.atIndex(1)?.doubleValue ?? 0
let positionY = positionDescriptor.atIndex(2)?.doubleValue ?? 0

// Extract size values
let sizeWidth = sizeDescriptor.atIndex(1)?.doubleValue ?? 0
let sizeHeight = sizeDescriptor.atIndex(2)?.doubleValue ?? 0

// Extract app ID (name)
let appID = appIDDescriptor.stringValue ?? "Unknown"

let rect = NSRect(x: positionX, y: positionY, width: sizeWidth, height: sizeHeight)
items.append(DockItem(rect: rect, appID: appID))
}

return items
}

func registerLoginItem() {
do {
if SMAppService.mainApp.status == .enabled {
Expand Down