easy-codex 0.1.2 → 0.1.3

package/README.md

@@ -51,7 +51,7 @@ macOS 14+ 安装后运行：
 easy-codex overlay
 ```
 
-独立 AppKit 浮窗在 Codex 位于前台时显示，切到其他应用、最小化或关闭 Codex 窗口后隐藏。默认位于 Codex 窗口右下角上方；拖动可校准位置，偏移量保存在本机。它按窗口边界跟随，不自动识别头像；侧栏布局变化后可再次拖动。首版跟随最前面的一个 Codex 普通窗口。
+独立 AppKit 浮窗在 Codex 位于前台时显示，切到其他应用、最小化或关闭 Codex 窗口后隐藏。默认位于 Codex 窗口左下角头像上方；拖动可校准位置，偏移量保存在本机。它按窗口边界跟随，不自动识别头像；侧栏布局变化后可再次拖动。首版跟随最前面的一个 Codex 普通窗口。
 
 - 圆环长度表示剩余百分比：大于 50% 绿色，20%–50% 橙色，低于 20% 红色。
 - 浮窗为头像大小（32×32），背景透明，无底板和阴影。圆环只显示百分比，无数据时显示 `—`，不显示窗口时长或状态文字；时长与状态见悬停提示和菜单。

package/native/Overlay.swift

@@ -46,7 +46,7 @@ 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 - 32, rect.maxX - 32 - inset.x)),
+    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)))
 }
 
@@ -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 - 32, 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: 858, y: 174))
-            assert(ringOrigin(in: bounds, inset: CGPoint(x: -100, y: -100)) == CGPoint(x: 868, 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
         }

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.2</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.2",
+  "version": "0.1.3",
   "description": "Display remaining Codex account usage limits",
   "type": "module",
   "bin": {