Merge pull request #140 from abgox/v2

fix: 更新版本 2.33.1
abgox · Jan 20, 2025 · 7eb2bde · 7eb2bde
2 parents 4830bff + 3ecbbda
commit 7eb2bde
Show file tree

Hide file tree

Showing 7 changed files with 85 additions and 13 deletions.
diff --git a/src/CHANGELOG.md b/src/CHANGELOG.md
@@ -2,6 +2,20 @@
 
 - 没有特别说明的版本都是修复问题
 
+## 2.33.1
+
+- 修复了在以下情况时，处于对应状态未隐藏的问题
+
+  - `图片符号`: 当路径选择为空时
+  - `方块符号`: 当颜色设置为空时
+  - `文本符号`: 将文本设置为空时
+
+- 改进了 `设置特殊偏移量`
+
+  - 现在可以通过 `批量设置` 同时设置多个屏幕
+
+- 其他的修复和优化
+
 ## 2.33.0
 
 - `托盘菜单` 中的变化

diff --git a/src/InputTip.JAB.JetBrains.exe b/src/InputTip.JAB.JetBrains.exe
diff --git a/src/menu/about.ahk b/src/menu/about.ahk
@@ -13,7 +13,7 @@ fn_about(*) {
         g.AddText("Section", '当前版本: ')
         g.AddEdit("yp ReadOnly cRed", currentVersion)
         g.AddText("xs", '开发人员: ')
-        g.AddEdit("yp ReadOnly", 'abgox')
+        g.AddLink("yp", '<a href="https://me.abgox.com">abgox</a>')
         g.AddText("xs", 'QQ 账号: ')
         g.AddEdit("yp ReadOnly", '1151676611')
         g.AddLink("xs", 'QQ 反馈交流群( <a href="http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=ZfHFP_gIMyY6kZvqRmJhrsMlvnLDjLf6&authKey=lXo50SvLgudu%2BettInNZdb2OXGjs%2BxsoqsKIB88Vcq%2FjMb9uEW5thwU5Nm85KNX4&noverify=0&group_code=451860327">点击添加</a> ): ')

diff --git a/src/menu/app-offset.ahk b/src/menu/app-offset.ahk
@@ -134,7 +134,9 @@ fn_app_offset(*) {
 
     handleClick(LV, RowNumber, tipList, action, app := "") {
         fn_write_offset() {
-            gc.appOffsetGui_LV_rm_title.Text := "特殊偏移量列表 ( " gc.appOffsetGui_LV_rm.GetCount() " 个 )"
+            try {
+                gc.appOffsetGui_LV_rm_title.Text := "特殊偏移量列表 ( " gc.appOffsetGui_LV_rm.GetCount() " 个 )"
+            }
             _app_offset := ""
             for v in app_offset.OwnProps() {
                 _info := v "|"
@@ -252,6 +254,67 @@ fn_app_offset(*) {
                     fn_write_offset()
                 }
             }
+            _ := g.AddButton("Section w" bw, "批量设置")
+            _._exe_name := app
+            _.OnEvent("Click", e_setAll)
+            e_setAll(item, *) {
+                close()
+                createGui(setAllGui).Show()
+                setAllGui(info) {
+                    offset := { x: 0, y: 0 }
+                    g := createGuiOpt("批量设置 " item._exe_name " 在多个屏幕的特殊偏移量")
+                    g.AddText("cRed", "如果偏移量为空，将自动设置为 0")
+
+                    if (info.i) {
+                        return g
+                    }
+
+                    g.AddText("Section", "水平方向的偏移量: ")
+                    _ := g.AddEdit("yp")
+                    _.Value := 0
+                    _._o := "x"
+                    _.OnEvent("Change", e_change_offset)
+
+                    g.AddText("xs", "垂直方向的偏移量: ")
+                    _ := g.AddEdit("yp")
+                    _.Value := 0
+                    _._o := "y"
+                    _.OnEvent("Change", e_change_offset)
+                    e_change_offset(item, *) {
+                        offset.%item._o% := item.value
+                    }
+                    g.AddText("xs cRed", "所有勾选的屏幕将使用上方的偏移量设置")
+
+                    flag := 0
+                    for i, v in screenList {
+                        opt := i = 1 ? "xs" : "yp"
+                        if (flag = 5) {
+                            opt := "xs"
+                            flag := 0
+                        }
+                        _ := g.AddCheckbox(opt " v" v.num, "屏幕 " v.num)
+                        _.Value := 1
+                        _._v_num := v.num
+                        _.OnEvent("Click", e_check)
+                        e_check(item, *) {
+                            offset.%item._v_num% := item.Value
+                        }
+                        flag++
+                    }
+                    g.AddButton("xs w" w, "确认").OnEvent("Click", e_yes)
+                    e_yes(item, *) {
+                        info := g.Submit()
+                        for v in screenList {
+                            if (info.%v.num%) {
+                                app_offset.%app%.%v.num%.x := returnNumber(offset.x)
+                                app_offset.%app%.%v.num%.y := returnNumber(offset.y)
+                            }
+                        }
+                        fn_write_offset()
+                    }
+                    return g
+                }
+            }
             g.OnEvent("Close", close)
             close(*) {
                 g.Destroy()

diff --git a/src/utils/options.ahk b/src/utils/options.ahk
@@ -12,5 +12,5 @@ InstallKeybdHook
 CoordMode 'Mouse', 'Screen'
 SetStoreCapsLockMode 0
 
-;@AHK2Exe-SetVersion 2.33.0
-currentVersion := "2.33.0"
+;@AHK2Exe-SetVersion 2.33.1
+currentVersion := "2.33.1"
diff --git a/src/utils/var.ahk b/src/utils/var.ahk
@@ -46,6 +46,7 @@ showCursorPos_y := readIni("showCursorPos_y", -20)
 ; 在多少毫秒后隐藏符号，0 表示永不隐藏
 HideSymbolDelay := readIni("HideSymbolDelay", 0)
 
+; 每多少毫秒后更新符号的显示位置和状态
 delay := readIni("delay", 20)
 
 ; 开机自启动
@@ -457,16 +458,10 @@ loadSymbol(state, left, top, isShowCursorPos := 0) {
         }
         showConfig .= "x" left + x "y" top + y
     }
+    hideSymbol()
+
     if (symbolGui.%state%) {
         symbolGui.%state%.Show(showConfig)
-
-        for s in ["CN", "EN", "Caps"] {
-            if (s != state) {
-                try {
-                    symbolGui.%s%.Hide()
-                }
-            }
-        }
     }
 
     lastSymbol := state

diff --git a/src/version.txt b/src/version.txt
@@ -1 +1 @@
-2.33.0
+2.33.1