🚀 RELEASE: 6.1.3 (#31)

.luacheckrc

@@ -465,6 +465,7 @@ globals = {
   "C_Commentator.ZoomIn",
   "C_Commentator.ZoomOut",
   "C_Commentator",
+  "C_Container.GetItemCooldown",
   "C_Container.GetContainerFreeSlots",
   "C_Container.GetContainerItemCooldown",
   "C_Container.GetContainerItemDurability",

Core/Changelog/6.1.3.lua

@@ -0,0 +1,23 @@
+local TXUI, F, E, I, V, P, G = unpack(select(2, ...))
+
+TXUI.Changelog["6.1.3"] = {
+  HOTFIX = true,
+  CHANGES = {
+    "* ToxiUI",
+    "Perhaps better handling for those very big UW screens.",
+    "Add '" .. F.String.ToxiUI("Title Secondary") .. "' to Fonts module.",
+    "Add descriptions to each font in the Fonts module.",
+    "* ElvUI",
+    "Move World Map coordinates to bottom right.",
+    "Increase default options window size.",
+    "Fix raid frames visibility.",
+    "Change Raid frame's name font to '" .. F.String.ToxiUI("Title Secondary") .. "'.",
+    "Reduce the max length of Raid frame's name string.",
+    "* Plater",
+    "Disable Target color on the M+ Colored Mobs mod.",
+  },
+
+  CHANGES_WRATH = {
+    "Fixes for Wrath Ulduar patch API changes",
+  },
+}

Core/Changelog/Changelog.xml

@@ -35,4 +35,5 @@
   <Script file='6.1.0.lua' />
   <Script file='6.1.1.lua' />
   <Script file='6.1.2.lua' />
+  <Script file='6.1.3.lua' />
 </Ui>

Core/Dev/Toxi/Profiles.lua

@@ -5,6 +5,7 @@ local T = TXUI:GetModule("Dev"):GetModule("Toxi")
 --@do-not-package@
 
 local SetCVar = SetCVar
+local bagFonts = { "countFont", "itemInfoFont", "itemLevelFont" }
 local unitframeTypes = { "player", "party", "focus", "target", "arena", "boss" }
 local disabledMenuIcons = { "chat", "quest", "shop", "spell", "talent", "pvp", "ach", "char", "lfg", "pet" }
 
@@ -45,7 +46,7 @@ function T:SetupProfile()
   E.db.TXUI.wunderbar.subModules.Hearthstone.primaryHS = TXUI.IsRetail and 193588 or 6948
 
   -- Themes: Gradient Mode
-  E.db.TXUI.themes.gradientMode.classColorMap[1]["DEATHKNIGHT"] = F.Table.HexToRGB("#6e1234")
+  -- E.db.TXUI.themes.gradientMode.classColorMap[1]["DEATHKNIGHT"] = F.Table.HexToRGB("#6e1234")
 
   -- Skins: ElvUI
   E.db.TXUI.addons.elvUITheme.enabled = true
@@ -62,6 +63,13 @@ function T:SetupProfile()
   -- ElvUI: Bags
   E.db.bags.useBlizzardCleanup = true
 
+  -- ElvUI: Bags Fonts
+  for _, bagFont in ipairs(bagFonts) do
+    E.db.bags[bagFont] = "- Personal"
+    E.db.bags[bagFont .. "Outline"] = "OUTLINE"
+    E.db.bags[bagFont .. "Size"] = 20
+  end
+
   E.db.bags.bagSize = TXUI.IsRetail and 50 or 60
   E.db.bags.bagButtonSpacing = 2
   E.db.bags.split.player = true
@@ -87,7 +95,9 @@ function T:SetupProfile()
   end
 
   -- WindTools
-  E.db.WT.item.inspect.enable = false -- clashes with narcissus talent inspect
+  if TXUI.IsRetail then
+    E.db.WT.item.inspect.enable = false -- clashes with narcissus talent inspect
+  end
 end
 
 T:AddCallback("SetupCvars")

Core/Functions/Color.lua

@@ -11,11 +11,7 @@ function F.Color.EqualToRGB(aColor, r, g, b)
 end
 
 function F.Color.SetGradient(obj, orientation, minColor, maxColor)
-  if TXUI.IsRetail then
-    obj:SetGradient(orientation, minColor, maxColor)
-  else
-    obj:SetGradientAlpha(orientation, minColor.r, minColor.g, minColor.b, minColor.a, maxColor.r, maxColor.g, maxColor.b, maxColor.a)
-  end
+  obj:SetGradient(orientation, minColor, maxColor)
 end
 
 function F.Color.SetGradientRGB(obj, orientation, r1, g1, b1, a1, r2, g2, b2, a2)

Core/Functions/Core.lua

@@ -121,7 +121,6 @@ end
 
 function F.PixelPerfect()
   local perfectScale = 768 / E.physicalHeight
-  if E.physicalHeight > 1440 then perfectScale = perfectScale * 2 end
   return perfectScale
 end
 

Core/Internal.lua

@@ -18,8 +18,9 @@ I.General = {
 
 I.Fonts = {
   Primary = "- M 500", -- - Montserrat Medium
-  PrimaryBold = "- M 600", -- - Montserrat Bold
+  PrimaryBold = "- M 600", -- - Montserrat SemiBold
   Title = "- Big Noodle Titling", -- - Big Noodle Titling
+  TitleSecondary = "- M 700", -- - Montserrat Bold
   Number = "- Steelfish", -- - Steelfish
   BigNumber = "- M 900", -- - Montserrat Black
   Icons = "- ToxiUI Icons",
@@ -29,14 +30,25 @@ I.FontNames = {
   [I.Fonts.Primary] = "Primary",
   [I.Fonts.PrimaryBold] = "Primary Bold",
   [I.Fonts.Title] = "Title",
+  [I.Fonts.TitleSecondary] = "Title Secondary",
   [I.Fonts.Number] = "Number",
   [I.Fonts.BigNumber] = "Number Big",
 }
 
+I.FontDescription = {
+  [I.Fonts.Primary] = "Used in the majority of the UI.",
+  [I.Fonts.PrimaryBold] = "The bold version of the Primary font, used only in a couple of places.",
+  [I.Fonts.Title] = "Used mostly for names.",
+  [I.Fonts.TitleSecondary] = "Used for names in Raid Frames.",
+  [I.Fonts.Number] = "Main number font, mostly used for cooldown text and UnitFrame health.",
+  [I.Fonts.BigNumber] = "Mostly used for combat text.",
+}
+
 I.FontOrder = {
   I.Fonts.Primary,
   I.Fonts.PrimaryBold,
   I.Fonts.Title,
+  I.Fonts.TitleSecondary,
   I.Fonts.Number,
   I.Fonts.BigNumber,
 }

Core/InternalData.lua

@@ -10,7 +10,7 @@ I.Data.Contributor = {
         ["Calistrø-Ravencrest"] = true, -- Paladin
         ["Calìstro-Ravencrest"] = true, -- Mage
         ["Melissandei-Ravencrest"] = true, -- Druid
-        ["Toxí-Ravencrest"] = true, -- Warrior
+        ["Toxirage-Ravencrest"] = true, -- Warrior
         ["Toxicom-Ravencrest"] = true, -- Warlock
         ["Toxisin-Ravencrest"] = true, -- Rogue
         ["Toxicøm-Ravencrest"] = true, -- Priest
@@ -53,6 +53,7 @@ I.Data.Contributor = {
         ["Toxilich-PyrewoodVillage"] = true,
         ["Toxivoid-PyrewoodVillage"] = true,
         ["Melissandei-PyrewoodVillage"] = true,
+        ["Toxirage-PyrewoodVillage"] = true,
       },
     },
 
@@ -177,6 +178,14 @@ I.Data.Contributor = {
         ["Ikrekot-MirageRaceway"] = true,
       },
     },
+
+    ["Hoffi"] = {
+      [I.Enum.Flavor.RETAIL] = {
+        -- Eredar
+        ["Currybart-Eredar"] = true,
+        ["Leahnari-Eredar"] = true,
+      },
+    },
   },
 
   -- EPIC => Purple Badge (epic supporter)

Core/Profile.lua

@@ -21,6 +21,7 @@ P.general = {
     [I.Fonts.Primary] = "DEFAULT",
     [I.Fonts.PrimaryBold] = "DEFAULT",
     [I.Fonts.Title] = "DEFAULT",
+    [I.Fonts.TitleSecondary] = "DEFAULT",
     [I.Fonts.Number] = "DEFAULT",
     [I.Fonts.BigNumber] = "DEFAULT",
   },
@@ -29,6 +30,7 @@ P.general = {
     [I.Fonts.Primary] = "DEFAULT",
     [I.Fonts.PrimaryBold] = "DEFAULT",
     [I.Fonts.Title] = "DEFAULT",
+    [I.Fonts.TitleSecondary] = "DEFAULT",
     [I.Fonts.Number] = "DEFAULT",
     [I.Fonts.BigNumber] = "DEFAULT",
   },
@@ -37,6 +39,7 @@ P.general = {
     [I.Fonts.Primary] = "DEFAULT",
     [I.Fonts.PrimaryBold] = "DEFAULT",
     [I.Fonts.Title] = "DEFAULT",
+    [I.Fonts.TitleSecondary] = "DEFAULT",
     [I.Fonts.Number] = "DEFAULT",
     [I.Fonts.BigNumber] = "DEFAULT",
   },

ElvUI_ToxiUI.toc

@@ -1,7 +1,7 @@
 ## Title: |cff1784d1ElvUI|r |cffffffffToxi|r|cff00e4f5UI|r
 ## Notes: Minimalistic ElvUI Edit by |cff00e4f5Toxi|r
 ## Author: Toxi (Toxicom#2957)
-## Version: 6.1.2
+## Version: 6.1.3
 ## RequiredDeps: ElvUI, ElvUI_WindTools
 ## OptionalDeps: Details, Plater
 ## DefaultState: Enabled
@@ -12,7 +12,7 @@
 ## X-Curse-Project-ID: 676447
 ## X-Tukui-ProjectID: 199
 ## X-Tukui-ProjectFolders: ElvUI_ToxiUI
-## X-ElvUIVersion: 13.06
+## X-ElvUIVersion: 13.20
 ## X-Wago-ID: XrNk5lKa
 ## X-GitHash: @project-version@
 

ElvUI_ToxiUI_Wrath.toc

@@ -1,18 +1,18 @@
 ## Title: |cff1784d1ElvUI|r |cffffffffToxi|r|cff00e4f5UI|r
 ## Notes: Minimalistic ElvUI Edit by |cff00e4f5Toxi|r
 ## Author: Toxi (Toxicom#2957)
-## Version: 6.1.2
+## Version: 6.1.3
 ## RequiredDeps: ElvUI
 ## OptionalDeps: Details, Plater
 ## DefaultState: Enabled
-## Interface: 30400
-## X-Interface: 30400
+## Interface: 30401
+## X-Interface: 30401
 ## X-Flavor: Wrath
 ## X-WoWI-ID: 25770
 ## X-Curse-Project-ID: 676447
 ## X-Tukui-ProjectID: 199
 ## X-Tukui-ProjectFolders: ElvUI_ToxiUI
-## X-ElvUIVersion: 13.06
+## X-ElvUIVersion: 13.20
 ## X-Wago-ID: XrNk5lKa
 ## X-GitHash: @project-version@
 

Media/Core.lua

@@ -19,7 +19,7 @@ F.AddMedia("font", "Montserrat-Light.ttf", "- M 300", nil, westAndRUBits)
 F.AddMedia("font", "Montserrat-Regular.ttf", "- M 400", nil, westAndRUBits)
 F.AddMedia("font", "Montserrat-Medium.ttf", I.Fonts.Primary, nil, westAndRUBits)
 F.AddMedia("font", "Montserrat-SemiBold.ttf", I.Fonts.PrimaryBold, nil, westAndRUBits)
-F.AddMedia("font", "Montserrat-Bold.ttf", "- M 700", nil, westAndRUBits)
+F.AddMedia("font", "Montserrat-Bold.ttf", I.Fonts.TitleSecondary, nil, westAndRUBits)
 F.AddMedia("font", "Montserrat-ExtraBold.ttf", "- M 800", nil, westAndRUBits)
 F.AddMedia("font", "Montserrat-Black.ttf", I.Fonts.BigNumber, nil, westAndRUBits)
 

Modules/Installer/Core.lua

@@ -94,6 +94,7 @@ function IS:ElvUI(callback)
   -- ElvUI: Profile
   PF:MergeElvUIProfile()
   PF:ElvUIProfilePrivate()
+  PF:ElvUIProfileGlobal()
 
   -- ElvUI: Fonts
   PF:ElvUIFont()

Modules/Options/Fonts/ElvUIFonts.lua

@@ -76,8 +76,10 @@ function O:Fonts_ElvUIFonts()
 
   local function generateFontOption(fontKey, fontName)
     -- Font Group
-    local fontGroup = self:AddInlineGroup(options, {
+    local fontGroup = self:AddInlineDesc(options, {
       name = fontName .. " Font",
+    }, {
+      name = F.String.Good(I.FontDescription[fontKey]) .. "\n\n" .. "Default font: " .. F.String.ToxiUI(fontKey),
     }).args
 
     -- Fonts Font

Modules/Plugins/BlizzardFonts.lua

@@ -38,7 +38,6 @@ function BF:SettingsUpdate()
   if TXUI.IsRetail then
     self:UpdateFont("InvoiceTextFontNormal", "mail")
   else
-    self:UpdateFont("OpenMailBodyText", "mail")
     self:UpdateFont("InvoiceFont_Med", "mail", medium)
     self:UpdateFont("InvoiceFont_Small", "mail", small)
     self:UpdateFont("MailFont_Large", "mail", large)

Modules/Profiles/BigWigs.lua

@@ -52,7 +52,7 @@ function PF:BuildBigWigsProfile()
             ["emphasizeGrowup"] = true,
             ["emphasizeTime"] = 10,
             ["fill"] = true,
-            ["fontName"] = "- M 700",
+            ["fontName"] = F.FontOverride(I.Fonts.TitleSecondary),
             ["fontSize"] = 16,
             ["fontSizeEmph"] = 16,
             ["fontSizeNameplate"] = 12,
@@ -137,7 +137,7 @@ function PF:BuildBigWigsProfile()
               [4] = -215,
             },
             ["emphUppercase"] = false,
-            ["fontName"] = "- M 700",
+            ["fontName"] = F.FontOverride(I.Fonts.TitleSecondary),
             ["fontSize"] = 30,
             ["normalPosition"] = {
               [1] = "CENTER",

Modules/Profiles/ElvUI/Fonts.lua

@@ -281,7 +281,7 @@ function PF:ElvUIFont()
         ),
 
         raid1 = {
-          customTexts = customTextSize { { "!Name", I.Fonts.Title, 16, "OUTLINE" } },
+          customTexts = customTextSize { { "!Name", I.Fonts.TitleSecondary, 16, "OUTLINE" } },
 
           rdebuffs = {
             font = F.FontOverride(I.Fonts.Title),
@@ -291,7 +291,7 @@ function PF:ElvUIFont()
         },
 
         raid2 = {
-          customTexts = customTextSize { { "!Name", I.Fonts.Title, 16, "OUTLINE" } },
+          customTexts = customTextSize { { "!Name", I.Fonts.TitleSecondary, 16, "OUTLINE" } },
 
           rdebuffs = {
             font = F.FontOverride(I.Fonts.Title),
@@ -301,7 +301,7 @@ function PF:ElvUIFont()
         },
 
         raid3 = {
-          customTexts = customTextSize { { "!Name", I.Fonts.Title, 16, "OUTLINE" } },
+          customTexts = customTextSize { { "!Name", I.Fonts.TitleSecondary, 16, "OUTLINE" } },
 
           rdebuffs = {
             font = F.FontOverride(I.Fonts.Title),

Modules/Profiles/ElvUI/Profile.lua

@@ -1015,14 +1015,14 @@ function PF:BuildProfile()
       raidWideSorting = false,
       startFromCenter = false,
       verticalSpacing = F.Dpi(1),
-      visibility = TXUI.Retail and "[@raid6,noexists][@raid21,exists] hide;show" or "[@raid6,noexists][@raid11,exists] hide;show",
+      visibility = TXUI.IsRetail and "[@raid6,noexists][@raid21,exists] hide;show" or "[@raid6,noexists][@raid11,exists] hide;show",
 
       -- UnitFrame Raid1 Custom Texts
       customTexts = {
         -- UnitFrame Raid1 Custom Texts Name
         ["!Name"] = createCustomText({}, {
           attachTextTo = "Frame",
-          text_format = "[tx:classcolor][name:short]",
+          text_format = "[tx:classcolor][name:veryshort]",
           justifyH = "CENTER",
           xOffset = F.Dpi(0),
           yOffset = F.Dpi(0),
@@ -1098,14 +1098,14 @@ function PF:BuildProfile()
       raidWideSorting = false,
       startFromCenter = false,
       verticalSpacing = F.Dpi(1),
-      visibility = TXUI.Retail and "[@raid21,noexists][@raid31,exists] hide;show" or "[@raid11,noexists][@raid26,exists] hide;show",
+      visibility = TXUI.IsRetail and "[@raid21,noexists][@raid31,exists] hide;show" or "[@raid11,noexists][@raid26,exists] hide;show",
 
       -- UnitFrame Raid2 Custom Texts
       customTexts = {
         -- UnitFrame Raid2 Custom Texts Name
         ["!Name"] = createCustomText({}, {
           attachTextTo = "Frame",
-          text_format = "[tx:classcolor][name:short]",
+          text_format = "[tx:classcolor][name:veryshort]",
           justifyH = "CENTER",
           xOffset = F.Dpi(0),
           yOffset = F.Dpi(0),
@@ -1180,14 +1180,14 @@ function PF:BuildProfile()
       raidWideSorting = false,
       startFromCenter = false,
       verticalSpacing = F.Dpi(1),
-      visibility = TXUI.Retail and "[@raid31,noexists] hide;show" or "[@raid26,noexists] hide;show",
+      visibility = TXUI.IsRetail and "[@raid31,noexists] hide;show" or "[@raid26,noexists] hide;show",
 
       -- UnitFrame Raid3 Custom Texts
       customTexts = {
         -- UnitFrame Raid3 Custom Texts Name
         ["!Name"] = createCustomText({}, {
           attachTextTo = "Frame",
-          text_format = "[tx:classcolor][name:short]",
+          text_format = "[tx:classcolor][name:veryshort]",
           justifyH = "CENTER",
           xOffset = F.Dpi(0),
           yOffset = F.Dpi(0),
@@ -1646,6 +1646,24 @@ function PF:ElvUIProfilePrivate()
   })
 end
 
+function PF:ElvUIProfileGlobal()
+  F.Table.Crush(E.global, {
+    -- General
+    general = {
+      ultrawide = false,
+
+      WorldMapCoordinates = {
+        position = "BOTTOMRIGHT",
+      },
+
+      AceGUI = {
+        width = 1440,
+        height = 810,
+      },
+    },
+  })
+end
+
 function PF:UpdateProfileForTheme()
   local pf = self:BuildProfile()