* 真修正快捷键导致的文字模式输入失效（仅测试 CC 2018）

millionart · Mar 6, 2018 · a18d9f3 · a18d9f3
1 parent cd5c52e
commit a18d9f3
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 9 deletions.
diff --git a/bin/old/Setup.exe b/bin/old/Setup.exe
diff --git a/bin/old/Update.ini b/bin/old/Update.ini
diff --git a/bin/test/Update.ini b/bin/test/Update.ini
diff --git a/bin/x32/Setup.exe b/bin/x32/Setup.exe
diff --git a/bin/x32/Update.ini b/bin/x32/Update.ini
diff --git a/bin/x64/Setup.exe b/bin/x64/Setup.exe
diff --git a/bin/x64/Update.ini b/bin/x64/Update.ini
diff --git a/source/APssistant.ahk b/source/APssistant.ahk
@@ -269,15 +269,18 @@ SHlayer:
 	Return
 
 IfTextMode:
-	ControlGetText, textDisplayModeComboBox, ComboBox46, ahk_class Photoshop
-	ControlGetText, fontName, Edit94, ahk_class Photoshop
-	ControlGetText, fontMode, Edit93, ahk_class Photoshop
-	ControlGetText, fontSize, Edit92, ahk_class Photoshop
-	If (textDisplayModeComboBox!="衐苷ċ")
-		hotkeyOn=1
-	Else
+	ControlGetPos,textDisplayModeComboBoxX,, , , ComboBox46, ahk_class Photoshop
+	ControlGet, textDisplayModeComboBox, Visible,, ComboBox46, ahk_class Photoshop
+	ControlGet, fontName, Visible,, Edit94, ahk_class Photoshop
+	ControlGet, fontMode, Visible,, Edit93, ahk_class Photoshop
+	ControlGet, fontSize, Visible,, Edit92, ahk_class Photoshop
+	ControlGet, fill, Enabled,, Edit1, ahk_class Photoshop
+	ControlGet, layerMode, Enabled,, ComboBox1, ahk_class Photoshop
+	If (textDisplayModeComboBox=1) && (fontName=1) && (fontMode=1) && (fontSize=1) && (fill=0) && (layerMode=1) && ((textDisplayModeComboBoxX>1000) || (textDisplayModeComboBoxX<1500)) ; textDisplayModeComboBoxX = 1134 & 1139
 		hotkeyOn=0
-return
+	Else
+		hotkeyOn=1
+	return
 ; ==========================================普通拾色器点击
 FCPc1:
 	gosub, IfTextMode

diff --git a/source/Data/Update/APssistant.7z b/source/Data/Update/APssistant.7z
diff --git a/source/inc/Function.ahk b/source/inc/Function.ahk
@@ -2,7 +2,7 @@
 V_CurrentVer()
 {
 	Global f_CurrentVer
-	f_CurrentVer = 0.9.2.0
+	f_CurrentVer = 0.9.2.1
 	IniDelete, %A_scriptdir%\Data\Config.ini,Setting,Apssistantver
 	;IniWrite, %f_CurrentVer%, %A_scriptdir%\Data\Config.ini, Setting, Apssistantver
 }