easy-codex 0.1.1 → 0.1.3

package/README.md

@@ -51,10 +51,10 @@ macOS 14+ 安装后运行：
 easy-codex overlay
 ```
 
-独立 AppKit 浮窗在 Codex 位于前台时显示，切到其他应用、最小化或关闭 Codex 窗口后隐藏。默认位于 Codex 窗口右下角上方；拖动可校准位置，偏移量保存在本机。它按窗口边界跟随，不自动识别头像；侧栏布局变化后可再次拖动。首版跟随最前面的一个 Codex 普通窗口。
+独立 AppKit 浮窗在 Codex 位于前台时显示，切到其他应用、最小化或关闭 Codex 窗口后隐藏。默认位于 Codex 窗口左下角头像上方；拖动可校准位置，偏移量保存在本机。它按窗口边界跟随，不自动识别头像；侧栏布局变化后可再次拖动。首版跟随最前面的一个 Codex 普通窗口。
 
 - 圆环长度表示剩余百分比：大于 50% 绿色，20%–50% 橙色，低于 20% 红色。
-- 浮窗为小尺寸（16×16），背景透明，无底板和阴影。圆环只显示百分比，无数据时显示 `—`，不显示窗口时长或状态文字；时长与状态见悬停提示和菜单。
+- 浮窗为头像大小（32×32），背景透明，无底板和阴影。圆环只显示百分比，无数据时显示 `—`，不显示窗口时长或状态文字；时长与状态见悬停提示和菜单。
 - 未知或过期数据为灰色；失败后的过期说明见悬停提示。已到重置时间时也先标为过期，等待重新查询，不擅自恢复满额。
 - 浮窗可见时每 60 秒刷新，查询不会重叠；回到前台且距离上次查询超过 60 秒会刷新。
 - 默认优先 codex 额度桶，显示其中剩余比例最低的窗口；右键可切换其他窗口，不把各窗口相加。

package/native/Overlay.swift

@@ -46,8 +46,8 @@ func appKitRect(_ rect: CGRect, primaryHeight: CGFloat) -> CGRect {
     CGRect(x: rect.minX, y: primaryHeight - rect.maxY, width: rect.width, height: rect.height)
 }
 func ringOrigin(in rect: CGRect, inset: CGPoint) -> CGPoint {
-    CGPoint(x: max(rect.minX, min(rect.maxX - 16, rect.maxX - 16 - inset.x)),
-            y: max(rect.minY, min(rect.maxY - 16, rect.minY + inset.y)))
+    CGPoint(x: max(rect.minX, min(rect.maxX - 32, rect.minX + inset.x)),
+            y: max(rect.minY, min(rect.maxY - 32, rect.minY + inset.y)))
 }
 
 @MainActor
@@ -81,28 +81,28 @@ final class RingView: NSView {
 
     override func draw(_ dirtyRect: NSRect) {
         let center = CGPoint(x: bounds.midX, y: bounds.midY)
-        let track = NSBezierPath(ovalIn: CGRect(x: center.x - 7, y: center.y - 7, width: 14, height: 14))
-        track.lineWidth = 1
+        let track = NSBezierPath(ovalIn: CGRect(x: center.x - 14, y: center.y - 14, width: 28, height: 28))
+        track.lineWidth = 2
         NSColor.labelColor.withAlphaComponent(0.12).setStroke()
         track.stroke()
         let state = RingState.resolve(remaining, stale: stale)
         if let remaining, remaining > 0, !stale {
             let arc = NSBezierPath()
-            arc.lineWidth = 1
+            arc.lineWidth = 2
             arc.lineCapStyle = .round
-            arc.appendArc(withCenter: center, radius: 7, startAngle: 90,
+            arc.appendArc(withCenter: center, radius: 14, startAngle: 90,
                           endAngle: 90 - CGFloat(min(100, max(0, remaining))) * 3.6, clockwise: true)
             state.color.setStroke()
             arc.stroke()
         }
         let text = remaining.map { "\(Int($0.rounded()))%" } ?? "—"
-        drawText(text, y: 5, font: .monospacedDigitSystemFont(ofSize: 4.5, weight: .semibold), color: state.color)
+        drawText(text, y: 10, font: .monospacedDigitSystemFont(ofSize: 9, weight: .semibold), color: state.color)
     }
     private func drawText(_ text: String, y: CGFloat, font: NSFont, color: NSColor) {
         let style = NSMutableParagraphStyle()
         style.alignment = .center
         style.lineBreakMode = .byTruncatingTail
-        (text as NSString).draw(in: CGRect(x: 1, y: y, width: bounds.width - 2, height: 6),
+        (text as NSString).draw(in: CGRect(x: 2, y: y, width: bounds.width - 4, height: 12),
                                withAttributes: [.font: font, .foregroundColor: color, .paragraphStyle: style])
     }
     override func mouseDown(with event: NSEvent) {
@@ -127,9 +127,9 @@ final class RingView: NSView {
 
 @MainActor
 final class Overlay: NSObject, NSApplicationDelegate, NSMenuDelegate {
-    let panel = NSPanel(contentRect: CGRect(x: 0, y: 0, width: 16, height: 16),
+    let panel = NSPanel(contentRect: CGRect(x: 0, y: 0, width: 32, height: 32),
                         styleMask: [.borderless, .nonactivatingPanel], backing: .buffered, defer: false)
-    let ring = RingView(frame: CGRect(x: 0, y: 0, width: 16, height: 16))
+    let ring = RingView(frame: CGRect(x: 0, y: 0, width: 32, height: 32))
     var status: NSStatusItem?
     var timer: Timer?
     var query: Process?
@@ -150,8 +150,8 @@ final class Overlay: NSObject, NSApplicationDelegate, NSMenuDelegate {
         node = args[1]; script = args[2]; searchPath = args[3]
         codexHome = args.count > 4 ? args[4] : ""
         let prefs = UserDefaults.standard
-        if prefs.object(forKey: "rightInset") != nil {
-            inset = CGPoint(x: prefs.double(forKey: "rightInset"), y: prefs.double(forKey: "bottomInset"))
+        if prefs.object(forKey: "leftInset") != nil {
+            inset = CGPoint(x: prefs.double(forKey: "leftInset"), y: prefs.double(forKey: "bottomInset"))
         }
         selectedID = prefs.string(forKey: "selectedWindow")
         panel.isOpaque = false
@@ -165,8 +165,8 @@ final class Overlay: NSObject, NSApplicationDelegate, NSMenuDelegate {
         ring.refresh = { [weak self] in self?.refresh() }
         ring.moved = { [weak self] point in
             guard let self, let rect = self.lastRect else { return }
-            self.inset = CGPoint(x: rect.maxX - point.x - 16, y: point.y - rect.minY)
-            prefs.set(self.inset.x, forKey: "rightInset")
+            self.inset = CGPoint(x: point.x - rect.minX, y: point.y - rect.minY)
+            prefs.set(self.inset.x, forKey: "leftInset")
             prefs.set(self.inset.y, forKey: "bottomInset")
         }
         ring.setAccessibilityElement(true)
@@ -275,7 +275,7 @@ final class Overlay: NSObject, NSApplicationDelegate, NSMenuDelegate {
     }
     @objc func resetPosition() {
         inset = CGPoint(x: 10, y: 74)
-        UserDefaults.standard.removeObject(forKey: "rightInset")
+        UserDefaults.standard.removeObject(forKey: "leftInset")
         UserDefaults.standard.removeObject(forKey: "bottomInset")
         tick()
     }
@@ -299,8 +299,9 @@ struct Main {
             assert(RingState.resolve(99, stale: true) == .unknown)
             assert(appKitRect(CGRect(x: -900, y: 100, width: 800, height: 600), primaryHeight: 900).origin == CGPoint(x: -900, y: 200))
             let bounds = CGRect(x: 100, y: 100, width: 800, height: 600)
-            assert(ringOrigin(in: bounds, inset: CGPoint(x: 10, y: 74)) == CGPoint(x: 874, y: 174))
-            assert(ringOrigin(in: bounds, inset: CGPoint(x: -100, y: -100)) == CGPoint(x: 884, y: 100))
+            assert(ringOrigin(in: bounds, inset: CGPoint(x: 10, y: 74)) == CGPoint(x: 110, y: 174))
+            assert(ringOrigin(in: bounds, inset: CGPoint(x: -100, y: -100)) == CGPoint(x: 100, y: 100))
+            assert(ringOrigin(in: bounds, inset: CGPoint(x: 9999, y: 9999)) == CGPoint(x: 868, y: 668))
             print("Swift 圆环颜色与窗口坐标检查通过")
             return
         }
@@ -318,7 +319,7 @@ struct Main {
                 NSGraphicsContext.saveGraphicsState()
                 let transform = AffineTransform(translationByX: CGFloat(index * 84 + 4), byY: 8)
                 (transform as NSAffineTransform).concat()
-                let view = RingView(frame: CGRect(x: 0, y: 0, width: 16, height: 16))
+                let view = RingView(frame: CGRect(x: 0, y: 0, width: 32, height: 32))
                 view.remaining = value < 0 ? nil : value; view.stale = value < 0
                 view.caption = value < 0 ? "额度未知" : "7天"
                 view.draw(view.bounds)

package/native/build/EasyCodexOverlay.app/Contents/Info.plist

@@ -5,7 +5,7 @@
 <key>CFBundleIdentifier</key><string>com.unionschool.easy-codex.overlay</string>
 <key>CFBundleName</key><string>Easy Codex Overlay</string>
 <key>CFBundlePackageType</key><string>APPL</string>
-<key>CFBundleShortVersionString</key><string>0.1.1</string>
+<key>CFBundleShortVersionString</key><string>0.1.3</string>
 <key>LSMinimumSystemVersion</key><string>14.0</string>
 <key>LSUIElement</key><true/>
 <key>NSHighResolutionCapable</key><true/>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy-codex",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Display remaining Codex account usage limits",
   "type": "module",
   "bin": {