Merge dev branch for v0.0.3 release

- Fix Zoom crash by removing initWithContentRect swizzle
- Implement notification-based corner radius application
- Enhance window detection to protect system UI elements
- Add dock radius control functionality
- Update documentation for new features
- Improve testing with qBittorrent and Zoom

Author: aspauldingcode

.gitignore

@@ -25,4 +25,6 @@ xcuserdata/
 .ccls-cache/
 
 # Log files
-*.log
+*.log
+
+Squircles_Support/

CLI.md

@@ -12,15 +12,21 @@ sharpener off
 # Toggle
 sharpener toggle
 
-# Set radius
+# Set window radius
 sharpener -r 40
 sharpener --radius=40
 
+# Set dock radius
+sharpener -d 20
+sharpener --dock-radius=20
+
 # Show current settings
 sharpener -s
+sharpener --status
 
 # Show version
 sharpener -v
+sharpener --version
 ```
 
 ## Commands
@@ -31,25 +37,31 @@ sharpener -v
 
 ## Options
 
-- `-r, --radius <value>` — Set the sharpening radius (integer `>= 0`)
-- `--radius=<value>` — Alternative syntax to set radius
-- `-s, --status` — Show current radius and status (`on`/`off`)
+- `-r, --radius <value>` — Set the window sharpening radius (integer `>= 0`)
+- `--radius=<value>` — Alternative syntax to set window radius
+- `-d, --dock-radius <value>` — Set the dock radius (integer `>= 0`)
+- `--dock-radius=<value>` — Alternative syntax to set dock radius
+- `-s, --status` — Show current window radius, dock radius, and status (`on`/`off`)
 - `-v, --version` — Show CLI version
 - `-h, --help` — Show built‑in help
 
 ## Examples
 
 ```bash
-# Set radius to 0 for sharp (square) corners
+# Set window radius to 0 for sharp (square) corners
 sharpener -r 0
 
-# Set radius to 40 and enable immediately
+# Set dock radius to 15
+sharpener -d 15
+
+# Set window radius to 40 and enable immediately
 sharpener on && sharpener -r 40
 
 # Query current status
 sharpener -s
 # Output example:
 # Current radius: 40
+# Current dock radius: 15
 # Status: on
 
 # Show version

Makefile

@@ -41,7 +41,10 @@ INSTALL_DIR = /var/ammonia/core/tweaks
 CLI_INSTALL_DIR = /usr/local/bin
 
 # Source files
-DYLIB_SOURCES = $(SOURCE_DIR)/sharpener/sharpener.m ZKSwizzle/ZKSwizzle.m
+DYLIB_SOURCES = $(SOURCE_DIR)/sharpener/sharpener.m \
+                $(SOURCE_DIR)/sharpener/Windows/window.m \
+                $(SOURCE_DIR)/sharpener/Dock/dock.m \
+                ZKSwizzle/ZKSwizzle.m
 DYLIB_OBJECTS = $(DYLIB_SOURCES:%.m=$(BUILD_DIR)/%.o)
 
 # CLI tool source and object
@@ -113,18 +116,22 @@ install: $(BUILD_DIR)/$(DYLIB_NAME) $(BUILD_DIR)/$(CLI_NAME) ## Install dylib an
 
 # Test target that builds, installs, and relaunches test applications
 test: install ## Build, install, and restart test applications
-	@echo "Force quitting test applications..."
-	$(eval TEST_APPS := Spotify "System Settings" Chess soffice "Brave Browser" Beeper Safari Finder)
+	@echo "Force quitting test applications and Dock..."
+	$(eval TEST_APPS := Spotify "System Settings" Chess soffice "Brave Browser" Beeper Safari Finder qBittorrent zoom.us)
 	@for app in $(TEST_APPS); do \
 		pkill -9 "$$app" 2>/dev/null || true; \
 	done
+	@echo "Killing Dock to reload with new dylib..."
+	@pkill -9 "Dock" 2>/dev/null || true
 	@echo "Relaunching test applications..."
 	@for app in $(TEST_APPS); do \
-		if [ "$$app" != "soffice" ]; then \
+		if [ "$$app" != "soffice" ] && [ "$$app" != "zoom.us" ]; then \
 			open -a "$$app" 2>/dev/null || true; \
+		elif [ "$$app" = "zoom.us" ]; then \
+			open -a "zoom.us" 2>/dev/null || true; \
 		fi; \
 	done
-	@echo "Test applications restarted with new dylib loaded"
+	@echo "Test applications and Dock restarted with new dylib loaded"
 
 # Clean build files
 clean: ## Remove build directory and artifacts
@@ -133,11 +140,13 @@ clean: ## Remove build directory and artifacts
 
 # Delete installed files
 delete: ## Delete installed files and relaunch Finder
-	@echo "Force quitting test applications..."
-	$(eval TEST_APPS := Spotify "System Settings" Chess soffice "Brave Browser" Beeper Safari Finder)
+	@echo "Force quitting test applications and Dock..."
+	$(eval TEST_APPS := Spotify "System Settings" Chess soffice "Brave Browser" Beeper Safari Finder qBittorrent zoom.us)
 	@for app in $(TEST_APPS); do \
 		pkill -9 "$$app" 2>/dev/null || true; \
 	done
+	@echo "Killing Dock..."
+	@pkill -9 "Dock" 2>/dev/null || true
 	@sleep 2 && open -a "Finder" || true
 	@sudo rm -f $(INSTALL_PATH)
 	@sudo rm -f $(CLI_INSTALL_PATH)

README.md

@@ -16,7 +16,7 @@ View more screenshots: [GALLERY.md](./GALLERY.md)
 - Square corners for application windows with configurable radius (`0` for sharp corners)
 - Live control via CLI: `on`, `off`, `toggle` (no app restart needed)
 - Live radius adjustment via `-r/--radius` with immediate effect across open windows
-- Status query via `-s/--show-radius` (shows current radius and on/off state)
+- Status query via `-s/--status` (shows current radius and on/off state)
 - Persists enabled state and radius across apps via `notifyd` channels
 - Preserves system UI (menus, popovers, HUD/utility windows) by targeting standard app windows only
 - Fullscreen-safe behavior; uses `0` radius in fullscreen to avoid visual artifacts
@@ -81,7 +81,17 @@ Did you follow this [readme](./README.md#requirements) carefully?
 
 ## How It Works
 
-Apple Sharpener uses method swizzling to modify the window corner mask and titlebar decoration view behavior of macOS applications. It specifically targets application windows while preserving the native appearance of menus, popovers, and other system UI elements.
+Apple Sharpener uses method swizzling to modify the window corner mask and titlebar decoration view behavior of macOS applications. 
+
+### Technical Implementation
+
+- **Safe Window Targeting**: Uses notification-based corner radius application to avoid recursion crashes
+- **Intelligent Filtering**: Only targets standard titled windows with minimum size requirements
+- **System UI Preservation**: Excludes context menus, tooltips, HUD windows, and other transient UI elements
+- **Window Level Checking**: Respects macOS window hierarchy to avoid affecting floating panels and system overlays
+- **Lifecycle-Aware**: Applies corner radius when windows become active, ensuring proper initialization
+
+The implementation specifically addresses compatibility issues with complex applications like Zoom while maintaining the native appearance of system UI elements.
 
 ## Contributing
 

src/sharpener/Dock/dock.h

@@ -0,0 +1,26 @@
+#ifndef DOCK_H
+#define DOCK_H
+
+#import <Foundation/Foundation.h>
+#import <AppKit/AppKit.h>
+#import <QuartzCore/QuartzCore.h>
+
+/**
+ * Dock sharpening API for apple-sharpener
+ * Provides functions to control dock corner radius modification
+ */
+
+/**
+ * Check if the current process is the Dock
+ * @return YES if running in Dock process, NO otherwise
+ */
+BOOL isDockProcess(void);
+
+/**
+ * Toggle square corners for the dock
+ * @param enable Whether to enable custom corner radius
+ * @param radius The corner radius to apply (0 for square corners)
+ */
+void toggleDockCorners(BOOL enable, NSInteger radius);
+
+#endif /* DOCK_H */

src/sharpener/Dock/dock.m

@@ -0,0 +1,212 @@
+#import "dock.h"
+#import "ZKSwizzle.h"
+#import <notify.h>
+#import <QuartzCore/QuartzCore.h>
+#import <objc/runtime.h>
+
+// Debug logging disabled by default; enable with APPLE_SHARPENER_DEBUG
+#ifdef APPLE_SHARPENER_DEBUG
+static void ASDebugLog(const char *fmt, ...) {
+    va_list args; va_start(args, fmt);
+    vfprintf(stderr, fmt, args);
+    fprintf(stderr, "\n");
+    va_end(args);
+}
+#else
+#define ASDebugLog(...) do {} while (0)
+#endif
+
+/**
+ * Dock sharpening implementation for apple-sharpener
+ * Hooks into CALayer layoutSublayers to target DockCore.ModernFloorLayer
+ */
+
+#pragma mark - Constants
+
+NSString * const kDockBundleIdentifier = @"com.apple.dock";
+const CGFloat kDockDefaultRadius = 16.0;
+const CGFloat kDockSquareRadius = 0.0;
+
+#pragma mark - Global State
+
+static BOOL enableDockSharpener = YES;
+static NSInteger dockCustomRadius = 0;
+
+#pragma mark - Helper Functions
+
+BOOL isDockProcess(void) {
+    NSString *bundleId = [[NSBundle mainBundle] bundleIdentifier];
+    return [bundleId isEqualToString:kDockBundleIdentifier];
+}
+
+static void DoDock(CALayer *layer) {
+    if (!layer || !enableDockSharpener) return;
+    
+    ASDebugLog("DoDock on %s, radius=%ld", [layer.className UTF8String], (long)dockCustomRadius);
+    
+    // Apply corner radius to the dock layer
+    CGFloat targetRadius = enableDockSharpener ? dockCustomRadius : kDockDefaultRadius;
+    layer.cornerRadius = targetRadius;
+    layer.masksToBounds = YES;
+    
+    // Also apply to sublayers that might need it
+    for (CALayer *sublayer in layer.sublayers) {
+        NSString *subClass = sublayer.className;
+        if ([subClass containsString:@"Dock"] ||
+            [subClass containsString:@"Floor"] ||
+            [subClass containsString:@"Background"] ||
+            [subClass containsString:@"Backdrop"] ||
+            [subClass containsString:@"Portal"] ||
+            [subClass containsString:@"SDF"]) {
+            ASDebugLog("Apply radius to sublayer: %s", [subClass UTF8String]);
+            sublayer.cornerRadius = targetRadius;
+            sublayer.masksToBounds = YES;
+            [sublayer setNeedsLayout];
+            [sublayer setNeedsDisplay];
+        }
+    }
+}
+
+#pragma mark - CALayer Hook
+
+// Store original method implementation
+static IMP __LayoutSublayers = NULL;
+
+// Optional WALayerKitWindow hook (root layer provider)
+static IMP __WALayerKitWindow_layer = NULL;
+static CALayer* _PatchedWALayerKitWindow_layer(id self, SEL _cmd) {
+    CALayer *root = ((CALayer*(*)(id,SEL))__WALayerKitWindow_layer)(self, _cmd);
+    ASDebugLog("WALayerKitWindow layer root: %p", root);
+    return root;
+}
+
+// Hooked layoutSublayers method
+static void _PatchedLayoutSublayers(id self, SEL _cmd) {
+    // Call original implementation first
+    if (__LayoutSublayers) {
+        ((void(*)(id, SEL))__LayoutSublayers)(self, _cmd);
+    }
+    
+    // Only process if we're in the dock and sharpening is enabled
+    if (!isDockProcess() || !enableDockSharpener) return;
+    
+    // Debug: Log all layer classes we encounter
+    NSString *className = [self className];
+    ASDebugLog("CALayer layout: %s", [className UTF8String]);
+    
+    // Check if this is the DockCore.ModernFloorLayer we're looking for
+    if ([className isEqualToString:@"DockCore.ModernFloorLayer"]) {
+        ASDebugLog("Found DockCore.ModernFloorLayer, applying radius=%ld", (long)dockCustomRadius);
+        DoDock((CALayer *)self);
+    }
+    // Also try broader detection for dock-related layers
+    else if ([className containsString:@"Dock"] || 
+             [className containsString:@"Floor"] ||
+             [className containsString:@"Background"] ||
+             [className containsString:@"Modern"] ||
+             [className containsString:@"Backdrop"] ||
+             [className containsString:@"Portal"] ||
+             [className containsString:@"SDF"]) {
+        ASDebugLog("Found potential dock layer: %s, applying radius=%ld", [className UTF8String], (long)dockCustomRadius);
+        DoDock((CALayer *)self);
+    }
+}
+
+#pragma mark - Public API
+
+void toggleDockCorners(BOOL enable, NSInteger radius) {
+    if (!isDockProcess()) return;
+    
+    enableDockSharpener = enable;
+    dockCustomRadius = MAX(0, radius);
+    
+    // Force layout update on all layers to trigger our hook
+    NSArray *windows = [[NSApplication sharedApplication] windows];
+    for (NSWindow *window in windows) {
+        if (window.contentView && window.contentView.layer) {
+            [window.contentView.layer setNeedsLayout];
+        }
+    }
+}
+
+#pragma mark - Dock View Swizzling
+
+// Remove old placeholder swizzling - we're using direct method hooking instead
+
+#pragma mark - Notification Setup
+
+static void setupDockNotifications(void) __attribute__((constructor));
+static void setupDockNotifications(void) {
+    // Only setup if we're in the Dock process
+    if (!isDockProcess()) {
+        NSLog(@"[AppleSharpener] Not in Dock process (bundle ID: %@), skipping setup", [[NSBundle mainBundle] bundleIdentifier]);
+        return;
+    }
+    
+    NSLog(@"[AppleSharpener] Setting up dock notifications in process: %@", [[NSBundle mainBundle] bundleIdentifier]);
+    
+    // Load persisted settings from NSUserDefaults
+    NSUserDefaults *defaults = [[NSUserDefaults alloc] initWithSuiteName:@"com.aspauldingcode.apple_sharpener"];
+    enableDockSharpener = [defaults boolForKey:@"enabled"];
+    dockCustomRadius = [defaults integerForKey:@"dock_radius"];
+    
+    // Hook CALayer's layoutSublayers method
+    Class layerClass = [CALayer class];
+    Method originalMethod = class_getInstanceMethod(layerClass, @selector(layoutSublayers));
+    if (originalMethod) {
+        __LayoutSublayers = method_getImplementation(originalMethod);
+        method_setImplementation(originalMethod, (IMP)_PatchedLayoutSublayers);
+        ASDebugLog("Hooked CALayer layoutSublayers");
+    } else {
+        ASDebugLog("Failed to find CALayer layoutSublayers");
+    }
+    
+    // Optionally hook WALayerKitWindow - root layer provider for Dock windows
+    Class walClass = NSClassFromString(@"WALayerKitWindow");
+    if (walClass) {
+        Method walLayerMethod = class_getInstanceMethod(walClass, @selector(layer));
+        if (walLayerMethod) {
+            __WALayerKitWindow_layer = method_getImplementation(walLayerMethod);
+            method_setImplementation(walLayerMethod, (IMP)_PatchedWALayerKitWindow_layer);
+            ASDebugLog("Hooked WALayerKitWindow layer method");
+        } else {
+            ASDebugLog("WALayerKitWindow layer method not found");
+        }
+    } else {
+        ASDebugLog("WALayerKitWindow class not present");
+    }
+    
+    dispatch_queue_t queue = dispatch_get_main_queue();
+    
+    static const char *kNotifyEnabled = "com.aspauldingcode.apple_sharpener.enabled";
+    static const char *kNotifyDockRadius = "com.aspauldingcode.apple_sharpener.dock.set_radius";
+    
+    int tokenEnabled;
+    if (notify_register_dispatch(kNotifyEnabled, &tokenEnabled, dispatch_get_main_queue(), ^(int token) {
+        uint64_t state;
+        notify_get_state(token, &state);
+        enableDockSharpener = (state != 0);
+        [defaults setBool:enableDockSharpener forKey:@"enabled"];
+        [defaults synchronize];
+        toggleDockCorners(enableDockSharpener, dockCustomRadius);
+        ASDebugLog("Updated enabled=%d", enableDockSharpener);
+    }) != NOTIFY_STATUS_OK) {
+        ASDebugLog("Failed to register for enabled notification");
+    }
+    
+    int tokenRadius;
+    if (notify_register_dispatch(kNotifyDockRadius, &tokenRadius, dispatch_get_main_queue(), ^(int token) {
+        uint64_t state;
+        notify_get_state(token, &state);
+        dockCustomRadius = (NSInteger)state;
+        [defaults setInteger:dockCustomRadius forKey:@"dock_radius"];
+        [defaults synchronize];
+        toggleDockCorners(enableDockSharpener, dockCustomRadius);
+        ASDebugLog("Updated dock radius=%ld", (long)dockCustomRadius);
+    }) != NOTIFY_STATUS_OK) {
+        ASDebugLog("Failed to register for dock radius notification");
+    }
+    
+    // Initial application
+    toggleDockCorners(enableDockSharpener, dockCustomRadius);
+}