fix: fix rematch top bar buttons

Author: fang2hou

Modules/Skins/Addons/Rematch.lua

@@ -113,6 +113,63 @@ local function ReskinToggleButton(button)
 	button.__windSkin = true
 end
 
+local texList = {
+	close = { E.Media.Textures.Close, 0 },
+	minimize = { E.Media.Textures.ArrowUp, ES.ArrowRotation.up },
+	maximize = { E.Media.Textures.ArrowUp, ES.ArrowRotation.down },
+	left = { E.Media.Textures.ArrowUp, ES.ArrowRotation.left },
+	right = { E.Media.Textures.ArrowUp, ES.ArrowRotation.right },
+	pin = { W.Media.Icons.buttonPin, 0 },
+	lock = { W.Media.Icons.buttonLock, 0 },
+	unlock = { W.Media.Icons.buttonUnlock, 0 },
+	flip = { W.Media.Icons.buttonUndo, 0 },
+}
+
+---@param frame Button?
+---@param size number?
+local function ReskinTitlebarButton(frame, size)
+	if not frame or frame.__windSkin then
+		return
+	end
+
+	---@param tex Texture
+	---@param r number?
+	---@param g number?
+	---@param b number?
+	local function UpdateTexture(tex, r, g, b)
+		if not frame.icon or not texList[frame.icon] then
+			return
+		end
+		local texData = texList[frame.icon]
+
+		tex:SetTexture(texData[1])
+		tex:SetRotation(texData[2] or 0)
+		tex:SetTexCoord(0, 1, 0, 1)
+		tex:Size(size or 12)
+		tex:SetVertexColor(r or 1, g or 1, b or 1)
+		tex:SetAlpha(1)
+		tex:SetBlendMode("BLEND")
+
+		F.InternalizeMethod(tex, "SetTexture", true)
+		F.InternalizeMethod(tex, "SetTexCoord", true)
+	end
+
+	local hoverColor = E.media.rgbvaluecolor
+
+	frame.Update = function(self)
+		UpdateTexture(self:GetNormalTexture(), 1, 1, 1)
+		UpdateTexture(self:GetDisabledTexture(), 0.5, 0.5, 0.5)
+		UpdateTexture(self:GetPushedTexture(), hoverColor.r, hoverColor.g, hoverColor.b)
+		UpdateTexture(self:GetHighlightTexture(), hoverColor.r, hoverColor.g, hoverColor.b)
+	end
+
+	frame:Update()
+
+	frame:Size(size or 12, size or 12)
+
+	frame.__windSkin = true
+end
+
 local function ReskinCardStatusBar(parent, key)
 	if not parent or not key or not parent[key] or parent[key].__windSkin then
 		return
@@ -280,7 +337,18 @@ local function ReskinTitleBar(frame)
 
 	frame.Portrait:Kill()
 	F.SetFontOutline(frame.Title)
-	S:Proxy("HandleCloseButton", frame.CloseButton)
+
+	ReskinTitlebarButton(frame.CloseButton)
+	F.Move(frame.CloseButton, -4, -4)
+	ReskinTitlebarButton(frame.MinimizeButton, 16)
+	F.Move(frame.MinimizeButton, -4, 2)
+
+	ReskinTitlebarButton(frame.LockButton, 14)
+	F.Move(frame.LockButton, 4, -4)
+	ReskinTitlebarButton(frame.NextModeButton, 14)
+	F.Move(frame.NextModeButton, 4, 0)
+	ReskinTitlebarButton(frame.PrevModeButton, 14)
+	F.Move(frame.PrevModeButton, 4, 0)
 end
 
 local function ReskinToolBar(frame)
@@ -849,59 +917,6 @@ local function ReskinOptionsPanel(frame)
 	frame.List.ScrollBox:ForEachFrame(ReskinListElement)
 end
 
-local texList = {
-	close = { E.Media.Textures.Close, 0 },
-	minimize = { E.Media.Textures.ArrowUp, ES.ArrowRotation.up },
-	maximize = { E.Media.Textures.ArrowUp, ES.ArrowRotation.down },
-	left = { E.Media.Textures.ArrowUp, ES.ArrowRotation.left },
-	right = { E.Media.Textures.ArrowUp, ES.ArrowRotation.right },
-	pin = { W.Media.Icons.buttonPin, 0 },
-	lock = { W.Media.Icons.buttonLock, 0 },
-	unlock = { W.Media.Icons.buttonUnlock, 0 },
-	flip = { W.Media.Icons.buttonUndo, 0 },
-}
-
----@param frame Button?
----@param size number?
-local function ReskinTitlebarButton(frame, size)
-	if not frame or frame.__windSkin then
-		return
-	end
-
-	---@param tex Texture
-	---@param r number?
-	---@param g number?
-	---@param b number?
-	local function UpdateTexture(tex, r, g, b)
-		if not frame.icon or not texList[frame.icon] then
-			return
-		end
-
-		tex:SetTexture(texList[frame.icon][1])
-		tex:SetRotation(texList[frame.icon][2] or 0)
-		tex:SetTexCoord(0, 1, 0, 1)
-		tex:Size(size or 12, size or 12)
-		tex:SetVertexColor(r or 1, g or 1, b or 1)
-		tex:SetAlpha(1)
-		tex:SetBlendMode("DISABLE")
-	end
-
-	local hoverColor = E.media.rgbvaluecolor
-
-	frame.Update = function(self)
-		UpdateTexture(self:GetNormalTexture(), 1, 1, 1)
-		UpdateTexture(self:GetDisabledTexture(), 0.5, 0.5, 0.5)
-		UpdateTexture(self:GetPushedTexture(), hoverColor.r, hoverColor.g, hoverColor.b)
-		UpdateTexture(self:GetHighlightTexture(), hoverColor.r, hoverColor.g, hoverColor.b)
-	end
-
-	frame:Update()
-
-	frame:Size(size or 12, size or 12)
-
-	frame.__windSkin = true
-end
-
 local function ReskinRoundButton(frame)
 	for _, tex in pairs({ frame:GetRegions() }) do
 		if tex:IsObjectType("Texture") and tex:GetDrawLayer() == "ARTWORK" then