diff --git a/BuildSkillsUI.lua b/BuildSkillsUI.lua index c102705..d8e7f8f 100755 --- a/BuildSkillsUI.lua +++ b/BuildSkillsUI.lua @@ -340,7 +340,7 @@ function AltSystem:CreateBuildSkillsContent(parentFrame) local sectionHeader = parentFrame:CreateFontString(nil, "OVERLAY", "GameFontNormalLarge") sectionHeader:SetPoint("TOPLEFT", parentFrame, "TOPLEFT", PADDING, yPos) sectionHeader:SetText("Skill list") - sectionHeader:SetTextColor(1, 1, 1) + --sectionHeader:SetTextColor(1, 1, 1) yPos = yPos - 24 diff --git a/UI.lua b/UI.lua index 86d5ba2..534d061 100755 --- a/UI.lua +++ b/UI.lua @@ -5,10 +5,10 @@ AltSystem = AltSystem or {} -local WINDOW_WIDTH = 700 +local WINDOW_WIDTH = 720 local WINDOW_HEIGHT = 520 local CONTROLS_WIDTH = 360 -local LOG_WIDTH = 340 +local LOG_WIDTH = 360 local PADDING = 12 local PADDING_HEADER = 6 local ROW_HEIGHT = 26 @@ -192,32 +192,38 @@ function AltSystem:CreateMainFrame() -- TAB BUTTONS (span full window width) --------------------- local contentTop = -24 - local tabHeight = 28 + local tabHeight = 36 local contentWidth = WINDOW_WIDTH - 8 -- 4px inset on each side local tabWidth = contentWidth / 2 local tabUseSkills = CreateFrame("Button", "AltSystemTabUseSkills", f) tabUseSkills:SetSize(tabWidth, tabHeight) tabUseSkills:SetPoint("TOPLEFT", f, "TOPLEFT", 4, contentTop) - tabUseSkills:SetNormalFontObject("GameFontHighlight") - tabUseSkills:SetHighlightFontObject("GameFontHighlight") + tabUseSkills:SetNormalFontObject("GameFontNormalLarge") + tabUseSkills:SetHighlightFontObject("GameFontNormalLarge") tabUseSkills:SetText("Use Skills") local tabUseSkillsBg = tabUseSkills:CreateTexture(nil, "BACKGROUND") tabUseSkillsBg:SetAllPoints() - tabUseSkillsBg:SetColorTexture(0.15, 0.15, 0.15, 1) + tabUseSkillsBg:SetColorTexture(0, 0, 0, 0) + + local tabUseSkillsText = tabUseSkills:GetFontString() + tabUseSkillsText:SetTextColor(0.9, 0.75, 0.2, 1) local tabBuildSkills = CreateFrame("Button", "AltSystemTabBuildSkills", f) tabBuildSkills:SetSize(tabWidth, tabHeight) tabBuildSkills:SetPoint("TOPLEFT", tabUseSkills, "TOPRIGHT", 0, 0) - tabBuildSkills:SetNormalFontObject("GameFontHighlight") - tabBuildSkills:SetHighlightFontObject("GameFontHighlight") + tabBuildSkills:SetNormalFontObject("GameFontNormalLarge") + tabBuildSkills:SetHighlightFontObject("GameFontNormalLarge") tabBuildSkills:SetText("Build Skills") local tabBuildSkillsBg = tabBuildSkills:CreateTexture(nil, "BACKGROUND") tabBuildSkillsBg:SetAllPoints() tabBuildSkillsBg:SetColorTexture(0.3, 0.3, 0.3, 1) + local tabBuildSkillsText = tabBuildSkills:GetFontString() + tabBuildSkillsText:SetTextColor(1, 1, 1, 1) + --------------------- -- TAB CONTENT FRAMES --------------------- @@ -241,13 +247,17 @@ function AltSystem:CreateMainFrame() if tabIndex == 1 then useSkillsContent:Show() buildSkillsContent:Hide() - tabUseSkillsBg:SetColorTexture(0.15, 0.15, 0.15, 1) + tabUseSkillsBg:SetColorTexture(0, 0, 0, 0) tabBuildSkillsBg:SetColorTexture(0.3, 0.3, 0.3, 1) + tabUseSkillsText:SetTextColor(0.9, 0.75, 0.2, 1) + tabBuildSkillsText:SetTextColor(1, 1, 1, 1) else useSkillsContent:Hide() buildSkillsContent:Show() tabUseSkillsBg:SetColorTexture(0.3, 0.3, 0.3, 1) - tabBuildSkillsBg:SetColorTexture(0.15, 0.15, 0.15, 1) + tabBuildSkillsBg:SetColorTexture(0, 0, 0, 0) + tabUseSkillsText:SetTextColor(1, 1, 1, 1) + tabBuildSkillsText:SetTextColor(0.9, 0.75, 0.2, 1) AltSystem:RefreshBuildSkillsList() end end @@ -560,7 +570,7 @@ function AltSystem:CreateMainFrame() -- Log scroll area background local logBg = CreateFrame("Frame", nil, logPanel, "InsetFrameTemplate") logBg:SetPoint("TOPLEFT", logPanel, "TOPLEFT", 4, -38) - logBg:SetPoint("BOTTOMRIGHT", logPanel, "BOTTOMRIGHT", -4, 4) + logBg:SetPoint("BOTTOMRIGHT", logPanel, "BOTTOMRIGHT", -PADDING, 4) -- Scroll frame for log entries local scrollFrame = CreateFrame("ScrollFrame", "AltSystemLogScrollFrame", logBg, "UIPanelScrollFrameTemplate")