Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ Public macOS window manager. Swift 6, SwiftPM, macOS 14+, Apple Silicon.
- AX success is not frame acceptance: verify actual geometry, including same-display resize clipping.
- Readiness text must use the full model.ready state, not permission alone.
- Cross-display acceptance must cover a full round trip between unequal screen sizes; verify the realized frame after settling.
- Custom button backgrounds, padding and contentShape must live inside the label; verify physical clicks in empty painted edges, not only AX activation.
4 changes: 2 additions & 2 deletions Assets/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0.0</string>
<string>1.0.1</string>
<key>CFBundleVersion</key>
<string>10</string>
<string>11</string>
<key>LSMinimumSystemVersion</key>
<string>14.0</string>
<key>LSUIElement</key>
Expand Down
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,19 @@ All notable changes to this project are documented here.

## [Unreleased]

## [1.0.1] - 2026-09-06

### Changed

- Simplified Settings and Welcome windows with integrated native window controls.
- Reduced unused space at the bottom of the menu bar panel.

### Fixed

- Made the entire painted pause/resume button clickable, including its empty edges.
- Expanded add, dismiss and restore-defaults button targets.
- Aligned the language selector with the switches in Preferences.

## [1.0.0] - 2026-09-06

First public release.
Expand Down
6 changes: 5 additions & 1 deletion Sources/EncajeApp/EncajeApp.swift
Original file line number Diff line number Diff line change
Expand Up @@ -256,8 +256,12 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate, NSMe
private func makeWindow<V: View>(title: String, size: NSSize, view: V) -> NSWindow {
let window = NSWindow(
contentRect: NSRect(origin: .zero, size: size),
styleMask: [.titled, .closable, .miniaturizable], backing: .buffered, defer: false)
styleMask: [.titled, .closable, .miniaturizable, .fullSizeContentView], backing: .buffered,
defer: false)
window.title = title
window.titleVisibility = .hidden
window.titlebarAppearsTransparent = true
window.titlebarSeparatorStyle = .none
window.isReleasedWhenClosed = false
let hosting = NSHostingView(rootView: view)
hosting.sizingOptions = []
Expand Down
11 changes: 8 additions & 3 deletions Sources/EncajeApp/MenuBarPopover.swift
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,11 @@ private struct MenuBarPopoverView: View {
systemImage: model.paused ? "play.fill" : "pause.fill"
)
.font(.system(size: 14, weight: .semibold)).frame(maxWidth: .infinity).padding(
.vertical, 11)
}.buttonStyle(.plain).background(.teal.gradient, in: RoundedRectangle(cornerRadius: 10))
.vertical, 11
)
.background(.teal.gradient, in: RoundedRectangle(cornerRadius: 10))
.contentShape(RoundedRectangle(cornerRadius: 10))
}.buttonStyle(.plain)
.foregroundStyle(.white)
if updates.available, updates.phase != .idle {
UpdateActionView()
Expand All @@ -178,7 +181,9 @@ private struct MenuBarPopoverView: View {
Rectangle())
}.buttonStyle(.plain).foregroundStyle(.red)
}.font(.system(size: 13, weight: .medium))
}.padding(18).frame(width: 300).fixedSize(horizontal: false, vertical: true).tint(.teal)
}.padding(.horizontal, 18).padding(.top, 18).padding(.bottom, 8).frame(width: 300).fixedSize(
horizontal: false, vertical: true
).tint(.teal)
}

private func row(_ text: String, symbol: String, action: @escaping () -> Void) -> some View {
Expand Down
8 changes: 4 additions & 4 deletions Sources/EncajeApp/SettingsView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ struct SettingsView: View {
Text(sectionSubtitle).font(.callout).foregroundStyle(.secondary)
}
Spacer()
}.padding(22)
}.padding(22).padding(.top, 12)
Divider()
Group {
switch section {
Expand All @@ -37,13 +37,13 @@ struct SettingsView: View {
Button {
model.message = nil
} label: {
Image(systemName: "xmark")
Image(systemName: "xmark").frame(width: 24, height: 24).contentShape(Rectangle())
}
.buttonStyle(.plain).accessibilityLabel(localized("Dismiss", "Cerrar"))
}.padding(12).background(.quaternary.opacity(0.5))
}
}
}.frame(width: 880, height: 660).tint(.teal)
}.frame(width: 880, height: 660).ignoresSafeArea(.container, edges: .top).tint(.teal)
}

private var sidebar: some View {
Expand Down Expand Up @@ -72,7 +72,7 @@ struct SettingsView: View {
: model.ready ? localized("Ready", "Listo") : localized("Setup needed", "Falta acceso"),
systemImage: model.ready && !model.paused ? "checkmark.circle.fill" : "circle"
).font(.caption).foregroundStyle(model.ready && !model.paused ? .teal : .secondary)
}.padding(16).frame(width: 152).frame(maxHeight: .infinity)
}.padding(16).padding(.top, 28).frame(width: 152).frame(maxHeight: .infinity)
.background(.quaternary.opacity(0.22))
}

Expand Down
2 changes: 1 addition & 1 deletion Sources/EncajeApp/UI/PreferencesView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ struct PreferencesView: View {
ForEach(AppLanguage.allCases, id: \.self) { language in
Text(language.label).tag(language)
}
}.labelsHidden().frame(width: 150)
}.labelsHidden().fixedSize().frame(width: 150, alignment: .trailing)
}
Divider()
HStack {
Expand Down
10 changes: 7 additions & 3 deletions Sources/EncajeApp/UI/ZoneSettingsView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ struct ZoneSettingsView: View {
Button {
selectedID = model.addRule()
} label: {
Image(systemName: "plus")
Image(systemName: "plus").frame(width: 24, height: 24).contentShape(Rectangle())
}
.buttonStyle(.borderless).help(localized("Add a zone", "Añadir una zona"))
}.padding(14)
Expand All @@ -37,8 +37,12 @@ struct ZoneSettingsView: View {
}.padding(.horizontal, 6)
}
Divider()
Button(localized("Restore defaults", "Restaurar originales")) { confirmReset = true }
.font(.caption).buttonStyle(.borderless).padding(12)
Button {
confirmReset = true
} label: {
Text(localized("Restore defaults", "Restaurar originales"))
.frame(maxWidth: .infinity).padding(12).contentShape(Rectangle())
}.font(.caption).buttonStyle(.borderless)
}.frame(width: 202)
Divider()
if let rule = selectedRule {
Expand Down
14 changes: 8 additions & 6 deletions Sources/EncajeApp/WelcomeView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,14 @@ struct WelcomeView: View {
Button(localized("Set up later", "Configurar después"), action: finish).buttonStyle(.plain)
.foregroundStyle(.secondary).font(.caption)
}
}.padding(32).frame(width: 510, height: 590).tint(.teal)
.animation(
reduceMotion ? nil : .spring(response: 0.4, dampingFraction: 0.85),
value: permissions.granted
)
.onAppear { withAnimation(reduceMotion ? nil : .easeOut(duration: 0.3)) { entrance = true } }
}.padding(32).frame(width: 510, height: 590).ignoresSafeArea(.container, edges: .top).tint(
.teal
)
.animation(
reduceMotion ? nil : .spring(response: 0.4, dampingFraction: 0.85),
value: permissions.granted
)
.onAppear { withAnimation(reduceMotion ? nil : .easeOut(duration: 0.3)) { entrance = true } }
}

private func complete() {
Expand Down
4 changes: 4 additions & 0 deletions docs/validation.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ retries when the observed size proves that correction is needed.
- Open/close the menu panel by icon, outside click and Escape; Configuration/About
must retain focus, and closed views must release monitors/rendering work.
- Check the app icon in both its UI and the system's representation.
- Click empty painted edges of pause/resume and padded buttons; verify the action,
not only Accessibility activation. Confirm the language picker aligns with switches.
- Open Settings and Welcome in both languages; confirm integrated traffic lights,
no visible titlebar text or separator, unclipped content and native close behavior.
- After closing the UI and settling for at least one minute, sample process CPU
and memory over multiple intervals. Report bundle size separately from ignored
development caches and rollback artifacts.
Expand Down
Loading