Merge branch 'dev'

.luacheckrc

@@ -144,6 +144,7 @@ read_globals = {
 	"FlowContainer_PauseUpdates",
 	"FramerateFrame",
 	"GameFontNormal",
+	"GameMenuFrame",
 	"GameTimeFrame",
 	"GameTooltip",
 	"GameTooltip_SetDefaultAnchor",

CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## Version 110000.02
+
+### Blizzard
+
+- Added an option to scale the game menu. Can be found at /LSUI > Blizzard > Game Menu.
+
+### Tooltips
+
+- Added the bag vs bank (bank + reagent bank + warbank) details to the total item count. It'll only be shown if you have that item in your banks.
+
 ## Version 110000.01
 
 - Added 11.0.0 support.

ls_UI/core/changelog.lua

@@ -6,33 +6,11 @@ local _G = getfenv(0)
 
 -- Mine
 E.CHANGELOG = [[
-- Added 11.0.0 support.
-- Added a set of options to adjust status bar textures. Can be found /LSUI > General > Textures.
-- Updated a bunch of art assets.
-
-### Config
-
-- Removed outdated and confusing "character-specific" wording. Clarified what global and private profiles are for. To reiterate, the global profile is for settings of various modules and submodules, these don't need a UI reload to work, whereas the private profile includes the aura tracker settings and which modules and submodules are enabled or disabled, these typically require a UI reload.
-- Marked all private profile setting that require a UI reload to take effect with a light blue colour.
-- Reworked the reload UI popup. Instead of appearing right away, it'll appear after you close the config panel.
-
-### Action Bars
-
-- Added an option to increase the number of main action bar's button slots up to 24 when the artwork is enabled. The main action bar will take up the first 12 slots, the extra slots are empty, and they're there to create room for additional action bars that can be moved there manually. All animations were adjusted accordingly to support this. Can be found at /LSUI > Action Bars > Action Bar 1 > Number of Buttons.
-- Split the spacing option into vertical and horizontal spacings. This will allow to create more space between the row without affecting the gap between the buttons.
-- Reduced the minimum button size to 8. Fun fact, at the height set to 14 and the number of buttons per row set to 6 a single 12 button action bar to be as big as just 6 button slots.
-- Fixed an issue where the XP bar would occasionally blink/flash. It generally should perform a lot better now.
-
 ### Blizzard
 
-- Added compact variant for the Suggested Content tab of the Adventure Guide. Can be found at /LSUI > Blizzard > Adventure Guide, enabled by default.
+- Added an option to scale the game menu. Can be found at /LSUI > Blizzard > Game Menu.
 
-### Unit Frames
+### Tooltips
 
-- Added adjustable gradient. Can be found at /LSUI > Unit Frames, next to the gloss slider.
-- Added temporary max health reduction bar. It's a new feature in TWW, most likely will be used in raid and dungeon encounters. Can be found at /LSUI > Unit Frames > Unit Frame > Health > Health Reduction, next to the heal prediction toggle.
-- Reworked the damage absorb shield into a widget that's displayed on top of the health bar.
-- Added an option to adjust the zoom of 3D portraits. /LSUI > Unit Frames > Unit Frame > Portrait > Scale, only visible when using 3D portraits.
-- Cropped 2D portraits. They're less round now, and there's less wasted space. There's no way to completely remove the round mask.
-- Added options to enable word wrapping for health and power texts.
+- Added the bag vs bank (bank + reagent bank + warbank) details to the total item count. It'll only be shown if you have that item in your banks.
 ]]

ls_UI/core/defaults.lua

@@ -2814,6 +2814,9 @@ D.profile = {
 			ilvl = true,
 			enhancements = true,
 		},
+		game_menu = {
+			scale = 1,
+		},
 		gm = {
 			point = {"TOPRIGHT", "UIParent", "TOPRIGHT", -250, -240},
 		},

ls_UI/locales/enUS.lua

@@ -56,6 +56,7 @@ L["FACTION_NEUTRAL"] = _G.FACTION_NEUTRAL
 L["FOCUS"] = _G.FOCUS
 L["FOCUS_CAST_KEY"] = _G.FOCUS_CAST_KEY_TEXT
 L["FURY"] = _G.FURY
+L["GAME_MENU"] = _G.MAINMENU_BUTTON
 L["GENERAL"] = _G.GENERAL_LABEL
 L["HIDE"] = _G.HIDE
 L["HOLY_POWER"] = _G.HOLY_POWER

ls_UI/ls_UI.toc

@@ -1,6 +1,6 @@
 ## Interface: 110000, 110002
 ## Author: lightspark
-## Version: 110000.01
+## Version: 110000.02
 ## Title: LS: |cff1a9fc0UI|r
 ## Notes: Yet another UI, but this one is a bit special...
 ## IconTexture: Interface\AddOns\ls_UI\assets\logo-64

ls_UI/modules/bars/xpbar.lua

@@ -427,7 +427,7 @@ do
 		local cur, max = C_PetBattles.GetXP(1, i)
 
 		self.tooltipInfo = {
-			header = C.db.global.colors.quality[rarity - 1]:WrapTextInColorCode(name),
+			header = C.db.global.colors.quality[rarity]:WrapTextInColorCode(name),
 			line1 = L["LEVEL_TOOLTIP"]:format(level),
 		}
 

ls_UI/modules/blizzard/_blizzard.xml

@@ -2,6 +2,7 @@
 	<Script file="core.lua"/>
 	<Script file="characterframe.lua"/>
 	<Script file="commandbar.lua"/>
+	<Script file="gamemenu.lua"/>
 	<Script file="gm.lua"/>
 	<Script file="mail.lua"/>
 	<Script file="suggestframe.lua"/>

ls_UI/modules/blizzard/core.lua

@@ -13,6 +13,7 @@ function BLIZZARD:Init()
 	if not isInit and PrC.db.profile.blizzard.enabled then
 		self:SetUpCharacterFrame()
 		self:SetUpCommandBar()
+		self:SetUpGameMenu()
 		self:SetUpGMFrame()
 		self:SetUpMail()
 		self:SetUpSuggestFrame()

ls_UI/modules/blizzard/gamemenu.lua

@@ -0,0 +1,25 @@
+local _, ns = ...
+local E, C, PrC, M, L, P, D, PrD, oUF = ns.E, ns.C, ns.PrC, ns.M, ns.L, ns.P, ns.D, ns.PrD, ns.oUF
+local MODULE = P:GetModule("Blizzard")
+
+-- Lua
+local _G = getfenv(0)
+
+-- Mine
+local isInit = false
+
+local function adjustScale(self)
+	self:SetScale(C.db.profile.blizzard.game_menu.scale)
+end
+
+function MODULE:HasGameMenu()
+	return isInit
+end
+
+function MODULE:SetUpGameMenu()
+	if not isInit then
+		GameMenuFrame:HookScript("OnShow", adjustScale)
+
+		isInit = true
+	end
+end

ls_UI/modules/tooltips/tooltips.lua

@@ -25,6 +25,7 @@ local ILVL_SPEC_FORMAT = "|cffffd100%s|r %s"
 local PLAYER_TARGET_FORMAT = "%s (|c%s" .. _G.PLAYER .. "|r)"
 local TARGET = "|cffffd100" .. _G.TARGET .. _G.HEADER_COLON .. "|r %s"
 local TOTAL = "|cffffd100" .. _G.TOTAL .. _G.HEADER_COLON .. "|r %d"
+local TOTAL_DETAILED = TOTAL .. " |cff888987(%d + %d)|r"
 
 local PHASE_ICONS = {
 	[Enum.PhaseReason.Phasing] = M.textures.icons_inline.PHASE,
@@ -115,7 +116,14 @@ function MODULE:Init()
 			if id then
 				local textRight
 				if C.db.profile.tooltips.count then
-					textRight = TOTAL:format(C_Item.GetItemCount(id, true))
+					local inBags = C_Item.GetItemCount(id)
+					local total = C_Item.GetItemCount(id, true, false, true, true)
+					local inBanks = total - inBags
+					if inBanks > 0 then
+						textRight = TOTAL_DETAILED:format(total, inBags, inBanks)
+					else
+						textRight = TOTAL:format(total)
+					end
 				end
 
 				tooltip:AddLine(" ")

ls_UI_Options/blizzard.lua

@@ -179,6 +179,27 @@ function CONFIG:CreateBlizzardOptions(order)
 					},
 				},
 			},
+			game_menu = {
+				order = inc(1),
+				type = "group",
+				name = L["GAME_MENU"],
+				disabled = isModuleDisabled,
+				get = function(info)
+					return C.db.profile.blizzard.game_menu[info[#info]]
+				end,
+				set = function(info, value)
+					C.db.profile.blizzard.game_menu[info[#info]] = value
+				end,
+				args = {
+					scale = {
+						order = reset(2),
+						type = "range",
+						name = L["SCALE"],
+						min = 0.5, max = 1, step = 0.01, bigStep = 0.05,
+						isPercent = true,
+					},
+				},
+			},
 			talking_head = {
 				order = inc(1),
 				type = "group",