Merge branch 'main' of github.com:Ludovicus-Maior/WoW-Pro-Guides

Ludovicus-Maior · May 1, 2024 · 0d4ae46 · 0d4ae46
2 parents 2a9c398 + 83b8d01
commit 0d4ae46
Show file tree

Hide file tree

Showing 197 changed files with 22,040 additions and 32,261 deletions.
diff --git a/WoWPro/WoWPro_CurrentGuide.lua b/WoWPro/WoWPro_CurrentGuide.lua
@@ -13,13 +13,15 @@ WoWPro.CreateCurrentGuideTitle = true
 local frame = _G.CreateFrame("Frame", "CreateGuide", _G.UIParent, "BackdropTemplate")
 frame.name = L["Current Guide"]
 frame.parent = "WoWPro"
-frame.parent = "WoWPro"
 if WoWPro.CLASSIC then
-    frame:SetSize(600, 500)
+    frame:SetSize(600, 700)
     frame:SetPoint("CENTER", _G.UIParent, "CENTER", 105, 10)
 elseif WoWPro.WRATH then
     frame:SetSize(650, 520)
     frame:SetPoint("CENTER", _G.UIParent, "CENTER", 105, 10)
+elseif WoWPro.CATA then
+    frame:SetSize(700, 550)
+    frame:SetPoint("CENTER", _G.UIParent, "CENTER", 105, 10)
 else
     frame:SetSize(625, 480)
     frame:SetPoint("CENTER", _G.UIParent, "CENTER", 105, 10)
@@ -30,7 +32,6 @@ texture:SetAllPoints(true)
 texture:SetColorTexture(0, 0, 0, 0)
 frame:SetBackdropColor(0, 0, 0, 0)
 
-
 -- Add the frame to the special frames list
 _G.table.insert(_G.UISpecialFrames, frame:GetName())
 
@@ -45,22 +46,25 @@ do
     elseif WoWPro.WRATH then
         title:SetPoint("TOPLEFT", 16, -60)
         title:SetPoint("RIGHT", frame, -16, -10)
+    elseif WoWPro.CATA then
+        title:SetPoint("TOPLEFT", 16, -65)
+        title:SetPoint("RIGHT", frame, -16, -20)
     else
-        title:SetPoint("TOPLEFT", 16, 0)
+        title:SetPoint("TOPLEFT", 16, -60)
         title:SetPoint("RIGHT", frame, -18, -5)
     end
     title:SetText("WoWPro - "..L["Current Guide"])
     title:SetJustifyH("CENTER")
     frame.title = title
 
-local subtitle = frame:CreateFontString(nil, "ARTWORK", "GameFontHighlightSmall")
-subtitle:SetHeight(32)
-subtitle:SetPoint("TOPLEFT", title, "BOTTOMLEFT", 0, -8)
-subtitle:SetPoint("RIGHT", frame, -32, 0)
-subtitle:SetNonSpaceWrap(true)
-subtitle:SetJustifyH("CENTER")
-subtitle:SetJustifyV("TOP")
-frame.subtitle = subtitle
+    local subtitle = frame:CreateFontString(nil, "ARTWORK", "GameFontHighlightSmall")
+    subtitle:SetHeight(32)
+    subtitle:SetPoint("TOPLEFT", title, "BOTTOMLEFT", 0, -8)
+    subtitle:SetPoint("RIGHT", frame, -32, 0)
+    subtitle:SetNonSpaceWrap(true)
+    subtitle:SetJustifyH("CENTER")
+    subtitle:SetJustifyV("TOP")
+    frame.subtitle = subtitle
 
     local box = WoWPro:CreateBG(frame)
     box:SetPoint("TOP", subtitle, "BOTTOM", 0, -GAP)

diff --git a/WoWPro/WoWPro_Frames.lua b/WoWPro/WoWPro_Frames.lua
@@ -616,7 +616,7 @@ function WoWPro:CreateStickyFrame()
     stickytitle:SetPoint("TOPRIGHT", -5, 4)
     stickytitle:SetHeight(25)
     stickytitle:SetJustifyH("LEFT")
-    stickytitle:SetJustifyV("CENTER")
+    stickytitle:SetJustifyV("MIDDLE")
     stickytitle:SetText(L["As you go:"])
     WoWPro.StickyTitle = stickytitle
 end

diff --git a/WoWPro/WoWPro_GuideList.lua b/WoWPro/WoWPro_GuideList.lua
@@ -82,7 +82,7 @@ function GuideListMixin:SelectTab(tabIndex)
                     text = button:CreateFontString(nil, "ARTWORK", "GameFontHighlightSmall")
                     text:SetPoint("TOP")
                     text:SetPoint("BOTTOM")
-                    text:SetPoint("LEFT", self.headers[index], 6, 0)
+                    text:SetPoint("LEFT", self.headers[index], 6, 0) -- Controls position of list
                     text:SetPoint("RIGHT", self.headers[index], -6, 0)
 
                     button[index] = text
@@ -111,6 +111,9 @@ function WoWPro.CreateGuideList()
     elseif WoWPro.WRATH then
         frame:SetSize(650, 520)
         frame:SetPoint("CENTER", _G.UIParent, "CENTER", 105, 10)
+    elseif WoWPro.CATA then
+        frame:SetSize(650, 550)
+        frame:SetPoint("CENTER", _G.UIParent, "CENTER", 105, 10)
     else
         frame:SetSize(625, 600)
         frame:SetPoint("CENTER", _G.UIParent, "CENTER", 105, 10)
@@ -133,16 +136,20 @@ function WoWPro.CreateGuideList()
         title:SetPoint("TOP", frame, "TOP", 0, -30)
     elseif WoWPro.WRATH then
         title:SetPoint("TOP", frame, "TOP", 0, -10)
+    elseif WoWPro.CATA then
+        title:SetPoint("TOP", frame, "TOP", 0, 0) -- Set the point for Cataclysm
     else
         title:SetPoint("TOP", frame, "TOP", 0, 50)
     end
     frame.title = title
-    local subtitle = frame:CreateFontString(nil, "ARTWORK", "GameFontHighlightSmall")
+    local subtitle = frame:CreateFontString(nil, "ARTWORK", "GameFontHighlightSmall") -- White text
     subtitle:SetHeight(40)
     if WoWPro.CLASSIC then
         subtitle:SetPoint("TOP", title, "BOTTOM", 0, -30)
     elseif WoWPro.WRATH then
         subtitle:SetPoint("TOP", title, "BOTTOM", 0, -45)
+    elseif WoWPro.CATA then
+        subtitle:SetPoint("TOP", title, "BOTTOM", 0, -60)
     else
         subtitle:SetPoint("TOP", title, "BOTTOM", 0, -60)
     end
@@ -169,6 +176,8 @@ function WoWPro.CreateGuideList()
                     tab:SetPoint("BOTTOMLEFT", scrollBox.titleRow, "TOPLEFT", 13, -1)
                 elseif WoWPro.WRATH then
                     tab:SetPoint("BOTTOMLEFT", scrollBox.titleRow, "TOPLEFT", 13, 1)
+                elseif WoWPro.CATA then
+                    tab:SetPoint("BOTTOMLEFT", scrollBox.titleRow, "TOPLEFT", 13, 2)
                 else
                     tab:SetPoint("BOTTOMLEFT", scrollBox.titleRow, "TOPLEFT", 80, 20)
                 end
@@ -343,7 +352,7 @@ function WoWPro:Setup_TitleRow(frame)
         TitleRow[colDesc[1]]:SetWidth(buttonWidth)
         local fontString = TitleRow[colDesc[1]]:GetFontString()
         fontString:SetJustifyH("LEFT")
-        fontString:SetJustifyV("CENTER")
+        fontString:SetJustifyV("MIDDLE")
         lastButton = TitleRow[colDesc[1]]
     end