Mercurial > wow > askmrrobot

diff ui/AmrUiFrame.lua @ 69:69db1c3025ac v27

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed some bugs with 6.2 item link format changes, added bib overwolf support
author yellowfive
date Mon, 06 Jul 2015 17:39:57 -0700
parents cf2b6b9a8337
children 0515882856f1
line wrap: on
line diff
--- a/ui/AmrUiFrame.lua	Mon Jun 29 17:06:02 2015 -0700
+++ b/ui/AmrUiFrame.lua	Mon Jul 06 17:39:57 2015 -0700
@@ -162,18 +162,22 @@
 	bg:SetPoint("BOTTOMRIGHT", frame, "BOTTOMRIGHT", -_borderWidth, _borderWidth)
 
 	local btnClose = CreateFrame("Button", nil, frame)
-	btnClose:SetNormalFontObject(Amr.CreateFont("Bold", 16, Amr.Colors.White))
-	btnClose:SetText("x")
+	btnClose:SetNormalTexture("Interface\\AddOns\\" .. Amr.ADDON_NAME .. "\\Media\\IconClose")
+	btnClose:SetHighlightTexture("Interface\\AddOns\\" .. Amr.ADDON_NAME .. "\\Media\\IconCloseOver")
+	
+	--btnClose:SetNormalFontObject(Amr.CreateFont("Bold", 16, Amr.Colors.White))
+	--btnClose:SetText("x")
 	btnClose:SetWidth(22)
 	btnClose:SetHeight(22)
 	btnClose:SetPoint("TOPRIGHT", frame, "TOPRIGHT", -4, -4)
 	btnClose:SetScript("OnClick", buttonOnClick)
 
-	local lbl = btnClose:GetFontString()
-	lbl:ClearAllPoints()
-	lbl:SetPoint("TOP", btnClose, "TOP", -1, -2)
+	--local lbl = btnClose:GetFontString()
+	--lbl:ClearAllPoints()
+	--lbl:SetPoint("TOP", btnClose, "TOP", -1, -2)
 	
 	-- style the button similar to AmrUiButton
+	--[[
 	Amr.DropShadow(btnClose)
 
 	local tex = Amr.CreateTexture(btnClose, Amr.Colors.Red)
@@ -188,6 +192,7 @@
 	tex = Amr.CreateTexture(btnClose, Amr.Colors.White, 0.1)
 	tex:SetAllPoints(true)
 	btnClose:SetHighlightTexture(tex)
+	]]
 	
 	-- title
 	local titleFrame = CreateFrame("Frame", nil, frame)