From 809ae8f82875b92f0436a78b7a020ae5589b32de Mon Sep 17 00:00:00 2001 From: abgox Date: Mon, 20 Jan 2025 22:15:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=202.33.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/InputTip.JAB.JetBrains.exe | Bin 1365504 -> 1365504 bytes src/menu/about.ahk | 2 +- src/menu/app-offset.ahk | 65 ++++++++++++++++++++++++++++++++- src/utils/options.ahk | 4 +- src/utils/var.ahk | 11 ++---- 5 files changed, 70 insertions(+), 12 deletions(-) diff --git a/src/InputTip.JAB.JetBrains.exe b/src/InputTip.JAB.JetBrains.exe index 47fdcb63f288417daed0a618b6d45127aef29537..fdcfc9cb4650ddeb5c6186e3264b89b88d9d83d2 100644 GIT binary patch delta 294 zcmZoz6Wp*Sc*7P(rVH0LZ)3Cq(aoQj+CMQd0x^hY24WT;8m`F2SB89=@d z68{Mr-@qSLz6Qu|U_zMpr~M#{@b-f&A_p@V4YoJuig4OapSeoJhBYm}NTGOo{sIvN zT?Iv3h2oOLl2lEFYOa!^N+4NWnVXcK<6fGnr&_G4=aHF`s-ekM3xeCPtP;^sWD0QH n{^ztv9wR3MgCYaaJ_d&A#b-qxGa5_}KPQq8wCeadk&kQuabgox') g.AddText("xs", 'QQ 账号: ') g.AddEdit("yp ReadOnly", '1151676611') g.AddLink("xs", 'QQ 反馈交流群( 点击添加 ): ') diff --git a/src/menu/app-offset.ahk b/src/menu/app-offset.ahk index 119fb44..b0716a8 100644 --- 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 index e7bd234..ae041b6 100644 --- 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 index e9460e6..b6511c2 100644 --- 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 From 3ecbbdacb4712ee1d5fcd7f7898ae34d265dfb10 Mon Sep 17 00:00:00 2001 From: abgox Date: Mon, 20 Jan 2025 22:51:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?docs:=20=E6=9B=B4=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7=E6=96=87=E4=BB=B6=E5=92=8C=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/CHANGELOG.md | 14 ++++++++++++++ src/version.txt | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG.md b/src/CHANGELOG.md index 44939e3..599d887 100644 --- a/src/CHANGELOG.md +++ b/src/CHANGELOG.md @@ -2,6 +2,20 @@ - 没有特别说明的版本都是修复问题 +## 2.33.1 + +- 修复了在以下情况时，处于对应状态未隐藏的问题 + + - `图片符号`: 当路径选择为空时 + - `方块符号`: 当颜色设置为空时 + - `文本符号`: 将文本设置为空时 + +- 改进了 `设置特殊偏移量` + + - 现在可以通过 `批量设置` 同时设置多个屏幕 + +- 其他的修复和优化 + ## 2.33.0 - `托盘菜单` 中的变化 diff --git a/src/version.txt b/src/version.txt index 3afbaeb..ba13d3c 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -2.33.0 +2.33.1