Commit 92e27cad authored by TOM_RUS's avatar TOM_RUS

WOW-36639patch9.0.2_Beta

parent a55ea6aa
...@@ -475,7 +475,7 @@ function CovenantMissionButton_OnEnter(self) ...@@ -475,7 +475,7 @@ function CovenantMissionButton_OnEnter(self)
GameTooltip_AddNormalLine(GameTooltip, C_Garrison.GetFollowerName(missionInfo.followers[i])); GameTooltip_AddNormalLine(GameTooltip, C_Garrison.GetFollowerName(missionInfo.followers[i]));
end end
end end
elseif (missionInfo.isRare and missionInfo.offerTimeRemaining) then elseif (missionInfo.offerTimeRemaining) then
GameTooltip_AddBlankLineToTooltip(GameTooltip); GameTooltip_AddBlankLineToTooltip(GameTooltip);
GameTooltip_AddHighlightLine(GameTooltip, COVENANT_MISSIONS_AVAILABILITY); GameTooltip_AddHighlightLine(GameTooltip, COVENANT_MISSIONS_AVAILABILITY);
GameTooltip_AddNormalLine(GameTooltip, missionInfo.offerTimeRemaining); GameTooltip_AddNormalLine(GameTooltip, missionInfo.offerTimeRemaining);
......
...@@ -32,9 +32,7 @@ function LandingPageSoulbindButtonMixin:ShowHelpTip() ...@@ -32,9 +32,7 @@ function LandingPageSoulbindButtonMixin:ShowHelpTip()
local helpTipInfo = { local helpTipInfo = {
text = SOULBIND_LANDING_BUTTON_TUTORIAL, text = SOULBIND_LANDING_BUTTON_TUTORIAL,
buttonStyle = HelpTip.ButtonStyle.Close, buttonStyle = HelpTip.ButtonStyle.Close,
targetPoint = HelpTip.Point.BottomEdgeCenter, targetPoint = HelpTip.Point.RightEdgeCenter,
alignment = HelpTip.Alignment.BOTTOM,
offsetY = 5,
cvar = "soulbindsLandingPageTutorial", cvar = "soulbindsLandingPageTutorial",
cvarValue = 1, cvarValue = 1,
}; };
......
...@@ -46,6 +46,8 @@ end ...@@ -46,6 +46,8 @@ end
function RuneforgePowerSlotMixin:OnShow() function RuneforgePowerSlotMixin:OnShow()
self:GetRuneforgeFrame():RegisterCallback(RuneforgeFrameMixin.Event.BaseItemChanged, self.OnBaseItemChanged, self); self:GetRuneforgeFrame():RegisterCallback(RuneforgeFrameMixin.Event.BaseItemChanged, self.OnBaseItemChanged, self);
self:UpdateState();
end end
function RuneforgePowerSlotMixin:OnHide() function RuneforgePowerSlotMixin:OnHide()
......
...@@ -3,6 +3,7 @@ UIWidgetTemplateTooltipFrameMixin = {} ...@@ -3,6 +3,7 @@ UIWidgetTemplateTooltipFrameMixin = {}
function UIWidgetTemplateTooltipFrameMixin:SetMouse(disableMouse) function UIWidgetTemplateTooltipFrameMixin:SetMouse(disableMouse)
local useMouse = self.tooltip and self.tooltip ~= "" and not disableMouse; local useMouse = self.tooltip and self.tooltip ~= "" and not disableMouse;
self:EnableMouse(useMouse) self:EnableMouse(useMouse)
self:SetMouseClickEnabled(false);
end end
function UIWidgetTemplateTooltipFrameMixin:OnLoad() function UIWidgetTemplateTooltipFrameMixin:OnLoad()
...@@ -356,6 +357,7 @@ end ...@@ -356,6 +357,7 @@ end
function UIWidgetBaseSpellTemplateMixin:SetMouse(disableMouse) function UIWidgetBaseSpellTemplateMixin:SetMouse(disableMouse)
local useMouse = ((self.tooltip and self.tooltip ~= "") or self.spellID) and not disableMouse; local useMouse = ((self.tooltip and self.tooltip ~= "") or self.spellID) and not disableMouse;
self:EnableMouse(useMouse) self:EnableMouse(useMouse)
self:SetMouseClickEnabled(false);
end end
UIWidgetBaseColoredTextMixin = {}; UIWidgetBaseColoredTextMixin = {};
...@@ -442,6 +444,7 @@ end ...@@ -442,6 +444,7 @@ end
function UIWidgetBaseStatusBarTemplateMixin:SetMouse(disableMouse) function UIWidgetBaseStatusBarTemplateMixin:SetMouse(disableMouse)
local useMouse = ((self.tooltip and self.tooltip ~= "") or (self.overrideBarText and self.overrideBarText ~= "") or (self.barText and self.barText ~= "")) and not disableMouse; local useMouse = ((self.tooltip and self.tooltip ~= "") or (self.overrideBarText and self.overrideBarText ~= "") or (self.barText and self.barText ~= "")) and not disableMouse;
self:EnableMouse(useMouse) self:EnableMouse(useMouse)
self:SetMouseClickEnabled(false);
end end
UIWidgetBaseStateIconTemplateMixin = CreateFromMixins(UIWidgetTemplateTooltipFrameMixin); UIWidgetBaseStateIconTemplateMixin = CreateFromMixins(UIWidgetTemplateTooltipFrameMixin);
......
...@@ -530,6 +530,8 @@ function WeeklyRewardActivityItemMixin:SetDisplayedItem() ...@@ -530,6 +530,8 @@ function WeeklyRewardActivityItemMixin:SetDisplayedItem()
-- want highest item level of highest quality -- want highest item level of highest quality
-- this comparison is not really needed now since the rewards are 1 equippable and 1 non-equippable item -- this comparison is not really needed now since the rewards are 1 equippable and 1 non-equippable item
if itemQuality > bestItemQuality or (itemQuality == bestItemQuality and itemLevel > bestItemLevel) then if itemQuality > bestItemQuality or (itemQuality == bestItemQuality and itemLevel > bestItemLevel) then
bestItemQuality = itemQuality;
bestItemLevel = itemLevel;
self.displayedItemDBID = rewardInfo.itemDBID; self.displayedItemDBID = rewardInfo.itemDBID;
self.Name:SetText(itemName); self.Name:SetText(itemName);
self.Icon:SetTexture(itemIcon); self.Icon:SetTexture(itemIcon);
......
...@@ -191,10 +191,7 @@ local function QuestFrameProgressPanel_SetupBG(self) ...@@ -191,10 +191,7 @@ local function QuestFrameProgressPanel_SetupBG(self)
end end
end end
local defaultXSize = 510; self.Bg:SetAtlas("QuestBG-Parchment", true);
local defaultYSize = 620;
self.Bg:SetSize(defaultXSize, defaultYSize);
self.Bg:SetTexture("Interface/QuestFrame/QuestBG");
QuestFrame_SetMaterial(QuestFrameProgressPanel, material); QuestFrame_SetMaterial(QuestFrameProgressPanel, material);
return material; return material;
end end
......
local StaticPopup_Show = StaticPopup_Show or GlueDialog_Show;
function AudioOptionsFrame_Toggle () function AudioOptionsFrame_Toggle ()
if ( AudioOptionsFrame:IsShown() ) then if ( AudioOptionsFrame:IsShown() ) then
AudioOptionsFrame:Hide(); AudioOptionsFrame:Hide();
...@@ -45,7 +47,7 @@ function AudioOptionsFrame_OnHide (self) ...@@ -45,7 +47,7 @@ function AudioOptionsFrame_OnHide (self)
if ( AudioOptionsFrame.gameRestart ) then if ( AudioOptionsFrame.gameRestart ) then
StaticPopup_Show("CLIENT_RESTART_ALERT"); StaticPopup_Show("CLIENT_RESTART_ALERT");
AudioOptionsFrame.gameRestart = nil; AudioOptionsFrame.gameRestart = nil;
elseif ( AudioOptionsFrame.logout ) then elseif ( AudioOptionsFrame.logout and not IsOnGlueScreen() ) then
StaticPopup_Show("CLIENT_LOGOUT_ALERT"); StaticPopup_Show("CLIENT_LOGOUT_ALERT");
AudioOptionsFrame.logout = nil; AudioOptionsFrame.logout = nil;
end end
......
...@@ -50,6 +50,8 @@ function VideoOptionsFrameCancel_OnClick (self, button) ...@@ -50,6 +50,8 @@ function VideoOptionsFrameCancel_OnClick (self, button)
VideoOptionsFrame_Toggle(); VideoOptionsFrame_Toggle();
end end
local StaticPopup_Show = StaticPopup_Show or GlueDialog_Show;
function VideoOptionsFrameDefault_OnClick (self, button) function VideoOptionsFrameDefault_OnClick (self, button)
OptionsFrameDefault_OnClick(VideoOptionsFrame); OptionsFrameDefault_OnClick(VideoOptionsFrame);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment