Merge remote-tracking branch 'upstream/master'

Author: tinymins

MY_!Base/src/lib/Chat.lua

@@ -22,6 +22,11 @@ function X.GetChatInput()
 	return frame and frame:Lookup('Edit_Input')
 end
 
+function X.GetChatPanel(k)
+	return Station.SearchFrame('ChatPanel' .. k)
+		or Station.SearchFrame('ChatPanel_Normal' .. k)
+end
+
 -- 海鳗里面抠出来的
 -- 聊天复制并发布
 function X.RepeatChatLine(hTime)
@@ -1610,8 +1615,7 @@ end
 
 local HOOKED_UI = setmetatable({}, { __mode = 'k' })
 local function Hook(i)
-	local frame = Station.SearchFrame('ChatPanel' .. i)
-		or Station.SearchFrame('ChatPanel_Normal' .. i)
+	local frame = X.GetChatPanel(i)
 	local h = frame and frame:Lookup('Wnd_Message', 'Handle_Message')
 	if h and not HOOKED_UI[h] then
 		HOOKED_UI[h] = true
@@ -1622,8 +1626,7 @@ end
 X.RegisterEvent('CHAT_PANEL_OPEN', 'ChatPanelHook', function(event) Hook(arg0) end)
 
 local function Unhook(i)
-	local frame = Station.SearchFrame('ChatPanel' .. i)
-		or Station.SearchFrame('ChatPanel_Normal' .. i)
+	local frame = X.GetChatPanel(i)
 	local h = frame and frame:Lookup('Wnd_Message', 'Handle_Message')
 	if h and HOOKED_UI[h] then
 		HOOKED_UI[h] = nil

MY_!Base/src/lib/System.Hotkey.lua

@@ -193,29 +193,20 @@ X.RegisterInit(X.NSFormatString('{$NS}#BIND_HOTKEY'), function()
 	end
 end)
 if X.PACKET_INFO.DEBUG_LEVEL <= X.DEBUG_LEVEL.DEBUG then
-	local aFrame = {
-		'Lowest2/ChatPanel1',
-		'Lowest2/ChatPanel2',
-		'Lowest2/ChatPanel3',
-		'Lowest2/ChatPanel4',
-		'Lowest2/ChatPanel5',
-		'Lowest2/ChatPanel6',
-		'Lowest2/ChatPanel7',
-		'Lowest2/ChatPanel8',
-		'Lowest2/ChatPanel9',
-		'Lowest2/EditBox',
-		'Normal1/ChatPanel1',
-		'Normal1/ChatPanel2',
-		'Normal1/ChatPanel3',
-		'Normal1/ChatPanel4',
-		'Normal1/ChatPanel5',
-		'Normal1/ChatPanel6',
-		'Normal1/ChatPanel7',
-		'Normal1/ChatPanel8',
-		'Normal1/ChatPanel9',
-		'Normal1/EditBox',
-		'Normal/' .. X.PACKET_INFO.NAME_SPACE,
-	}
+	local aFrame = {}
+	for _, v in pairs({
+		'Normal',
+		'Normal1',
+		'Lowest2',
+	}) do
+		for i = 1, 9 do
+			table.insert(aFrame, v .. '/ChatPanel' .. i)
+			table.insert(aFrame, v .. '/ChatPanel_Normal' .. i)
+		end
+		table.insert(aFrame, v .. '/EditBox')
+		table.insert(aFrame, v .. '/ChatPanel_Recently')
+		table.insert(aFrame, v .. '/' .. X.PACKET_INFO.NAME_SPACE)
+	end
 	X.RegisterHotKey(X.NSFormatString('{$NS}_STAGE_CHAT'), _L['Display only chat panel'], function()
 		if Station.IsVisible() then
 			for _, v in ipairs(aFrame) do