fix some bugs with mount preview

Hoizame · Aug 15, 2019 · 4ad9ba5 · 4ad9ba5
1 parent 2bc9209
commit 4ad9ba5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/AtlasLootClassic/Button/Item_type.lua b/AtlasLootClassic/Button/Item_type.lua
@@ -4,7 +4,7 @@ local AtlasLoot = _G.AtlasLoot
 local Item = AtlasLoot.Button:AddType("Item", "i")
 local Query = {}
 Item.Query = Query
-local AL = AtlasLoot.Locales
+local AL, ALIL = AtlasLoot.Locales, AtlasLoot.IngameLocales
 local ClickHandler = AtlasLoot.ClickHandler
 local Token = AtlasLoot.Data.Token
 local Recipe = AtlasLoot.Data.Recipe
@@ -277,6 +277,7 @@ function Item.Refresh(button)
 			Token.GetTokenDescription(itemID) or
 			Recipe.GetRecipeDescriptionWithRank(itemID) or
 			Profession.GetColorSkillRankItem(itemID) or
+			(Mount.IsMount(button.ItemID) and ALIL["Mount"] or nil) or
 			( Sets:GetItemSetForItemID(itemID) and AL["|cff00ff00Set item:|r "] or "")..GetItemDescInfo(itemEquipLoc, itemType, itemSubType)
 		)
 	end
@@ -317,15 +318,18 @@ function Item.ShowQuickDressUp(itemLink, ttFrame)
 		local frame = CreateFrame("Frame", name)
 		frame:SetClampedToScreen(true)
 		frame:SetSize(230, 280)
+		frame:SetBackdrop(ALPrivate.BOX_BORDER_BACKDROP)
+		frame:SetBackdropColor(0,0,0,1)
 
 		frame.modelFrame = CreateFrame("DressUpModel", name.."-ModelFrame", frame)
 		frame.modelFrame:ClearAllPoints()
 		frame.modelFrame:SetParent(frame)
-		frame.modelFrame:SetAllPoints(frame)
+		frame.modelFrame:SetPoint("TOPLEFT", frame, "TOPLEFT", 5, -5)
+		frame.modelFrame:SetPoint("BOTTOMRIGHT", frame, "BOTTOMRIGHT", -5, 5)
 		frame.modelFrame.defaultRotation = MODELFRAME_DEFAULT_ROTATION
 		frame.modelFrame:SetRotation(MODELFRAME_DEFAULT_ROTATION)
-		frame.modelFrame:SetBackdrop(ALPrivate.BOX_BORDER_BACKDROP)
-		frame.modelFrame:SetBackdropColor(0,0,0,1)
+		--frame.modelFrame:SetBackdrop(ALPrivate.BOX_BORDER_BACKDROP)
+		--frame.modelFrame:SetBackdropColor(0,0,0,1)
 		frame.modelFrame:SetUnit("player")
 		frame.modelFrame.minZoom = 0
 		frame.modelFrame.maxZoom = 1.0
@@ -426,7 +430,7 @@ local function EventFrame_OnEvent(frame, event, arg1, arg2)
 					GameTooltip_ShowCompareItem(itemIsOnEnter)
 				elseif arg1 == "LCTRL" or arg1 == "RCTRL" then
 					if Mount.IsMount(buttonOnEnter.ItemID) then
-						Item.ShowQuickDressUp(buttonOnEnter.ItemID, itemIsOnEnter)
+						--Item.ShowQuickDressUp(buttonOnEnter.ItemID, itemIsOnEnter)
 					else
 						--local _, link = itemIsOnEnter:GetItem()
 						Item.ShowQuickDressUp(buttonOnEnter.ItemID, itemIsOnEnter)
@@ -438,7 +442,7 @@ local function EventFrame_OnEvent(frame, event, arg1, arg2)
 					ShoppingTooltip2:Hide()
 					--ShoppingTooltip3:Hide()
 				elseif arg1 == "LCTRL" or arg1 == "RCTRL" then
-					if Item.previewTooltipFrame and Item.previewTooltipFrame:IsShown() then Item.previewTooltipFrame:Hide() end
+					if Item.previewTooltipFrame and not Mount.IsMount(buttonOnEnter.ItemID) and Item.previewTooltipFrame:IsShown() then Item.previewTooltipFrame:Hide() end
 				end
 			end
 		end

diff --git a/AtlasLootClassic/Documentation/Release_Notes.txt b/AtlasLootClassic/Documentation/Release_Notes.txt
@@ -15,7 +15,7 @@ v1.1.4-beta (Aug. XX, 2019)
 - Update pvp sets
 - Fix missing Minimap button text
 - Fix AQ mounts preview
-- Moce out PvP Weapons and Mounts into own tables
+- Move out PvP Weapons and Mounts into own tables
 
 
 v1.1.3-beta (Aug. 12, 2019)

diff --git a/AtlasLootClassic/Locales/IngameLocales.lua b/AtlasLootClassic/Locales/IngameLocales.lua
@@ -266,6 +266,7 @@ local IngameLocales = {
 	["Food"] = _G["POWER_TYPE_FOOD"],
 	["Special"] = _G["SPECIAL"],
 	["Mounts"] = _G["MOUNTS"],
+	["Mount"] = _G["MOUNT"],
 }
 AtlasLoot.IngameLocales = IngameLocales