Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Simpy
BlizzardInterfaceCode
Commits
92e27cad
Commit
92e27cad
authored
Nov 14, 2020
by
TOM_RUS
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WOW-36639patch9.0.2_Beta
parent
a55ea6aa
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
15 additions
and
9 deletions
+15
-9
Interface/AddOns/Blizzard_GarrisonTemplates/Blizzard_CovenantMissionTemplates.lua
...d_GarrisonTemplates/Blizzard_CovenantMissionTemplates.lua
+1
-1
Interface/AddOns/Blizzard_LandingSoulbinds/Blizzard_LandingSoulbindButton.lua
...zzard_LandingSoulbinds/Blizzard_LandingSoulbindButton.lua
+1
-3
Interface/AddOns/Blizzard_RuneforgeUI/Blizzard_RuneforgePowerList.lua
...dOns/Blizzard_RuneforgeUI/Blizzard_RuneforgePowerList.lua
+2
-0
Interface/AddOns/Blizzard_UIWidgets/Blizzard_UIWidgetTemplateBase.lua
...dOns/Blizzard_UIWidgets/Blizzard_UIWidgetTemplateBase.lua
+3
-0
Interface/AddOns/Blizzard_WeeklyRewards/Blizzard_WeeklyRewards.lua
.../AddOns/Blizzard_WeeklyRewards/Blizzard_WeeklyRewards.lua
+2
-0
Interface/FrameXML/QuestFrame.lua
Interface/FrameXML/QuestFrame.lua
+1
-4
Interface/SharedXML/AudioOptionsFrame.lua
Interface/SharedXML/AudioOptionsFrame.lua
+3
-1
Interface/SharedXML/VideoOptionsFrame.lua
Interface/SharedXML/VideoOptionsFrame.lua
+2
-0
No files found.
Interface/AddOns/Blizzard_GarrisonTemplates/Blizzard_CovenantMissionTemplates.lua
View file @
92e27cad
...
...
@@ -475,7 +475,7 @@ function CovenantMissionButton_OnEnter(self)
GameTooltip_AddNormalLine
(
GameTooltip
,
C_Garrison
.
GetFollowerName
(
missionInfo
.
followers
[
i
]));
end
end
elseif
(
missionInfo
.
isRare
and
missionInfo
.
offerTimeRemaining
)
then
elseif
(
missionInfo
.
offerTimeRemaining
)
then
GameTooltip_AddBlankLineToTooltip
(
GameTooltip
);
GameTooltip_AddHighlightLine
(
GameTooltip
,
COVENANT_MISSIONS_AVAILABILITY
);
GameTooltip_AddNormalLine
(
GameTooltip
,
missionInfo
.
offerTimeRemaining
);
...
...
Interface/AddOns/Blizzard_LandingSoulbinds/Blizzard_LandingSoulbindButton.lua
View file @
92e27cad
...
...
@@ -32,9 +32,7 @@ function LandingPageSoulbindButtonMixin:ShowHelpTip()
local
helpTipInfo
=
{
text
=
SOULBIND_LANDING_BUTTON_TUTORIAL
,
buttonStyle
=
HelpTip
.
ButtonStyle
.
Close
,
targetPoint
=
HelpTip
.
Point
.
BottomEdgeCenter
,
alignment
=
HelpTip
.
Alignment
.
BOTTOM
,
offsetY
=
5
,
targetPoint
=
HelpTip
.
Point
.
RightEdgeCenter
,
cvar
=
"soulbindsLandingPageTutorial"
,
cvarValue
=
1
,
};
...
...
Interface/AddOns/Blizzard_RuneforgeUI/Blizzard_RuneforgePowerList.lua
View file @
92e27cad
...
...
@@ -46,6 +46,8 @@ end
function
RuneforgePowerSlotMixin
:
OnShow
()
self
:
GetRuneforgeFrame
():
RegisterCallback
(
RuneforgeFrameMixin
.
Event
.
BaseItemChanged
,
self
.
OnBaseItemChanged
,
self
);
self
:
UpdateState
();
end
function
RuneforgePowerSlotMixin
:
OnHide
()
...
...
Interface/AddOns/Blizzard_UIWidgets/Blizzard_UIWidgetTemplateBase.lua
View file @
92e27cad
...
...
@@ -3,6 +3,7 @@ UIWidgetTemplateTooltipFrameMixin = {}
function
UIWidgetTemplateTooltipFrameMixin
:
SetMouse
(
disableMouse
)
local
useMouse
=
self
.
tooltip
and
self
.
tooltip
~=
""
and
not
disableMouse
;
self
:
EnableMouse
(
useMouse
)
self
:
SetMouseClickEnabled
(
false
);
end
function
UIWidgetTemplateTooltipFrameMixin
:
OnLoad
()
...
...
@@ -356,6 +357,7 @@ end
function
UIWidgetBaseSpellTemplateMixin
:
SetMouse
(
disableMouse
)
local
useMouse
=
((
self
.
tooltip
and
self
.
tooltip
~=
""
)
or
self
.
spellID
)
and
not
disableMouse
;
self
:
EnableMouse
(
useMouse
)
self
:
SetMouseClickEnabled
(
false
);
end
UIWidgetBaseColoredTextMixin
=
{};
...
...
@@ -442,6 +444,7 @@ end
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
;
self
:
EnableMouse
(
useMouse
)
self
:
SetMouseClickEnabled
(
false
);
end
UIWidgetBaseStateIconTemplateMixin
=
CreateFromMixins
(
UIWidgetTemplateTooltipFrameMixin
);
...
...
Interface/AddOns/Blizzard_WeeklyRewards/Blizzard_WeeklyRewards.lua
View file @
92e27cad
...
...
@@ -530,6 +530,8 @@ function WeeklyRewardActivityItemMixin:SetDisplayedItem()
-- 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
if
itemQuality
>
bestItemQuality
or
(
itemQuality
==
bestItemQuality
and
itemLevel
>
bestItemLevel
)
then
bestItemQuality
=
itemQuality
;
bestItemLevel
=
itemLevel
;
self
.
displayedItemDBID
=
rewardInfo
.
itemDBID
;
self
.
Name
:
SetText
(
itemName
);
self
.
Icon
:
SetTexture
(
itemIcon
);
...
...
Interface/FrameXML/QuestFrame.lua
View file @
92e27cad
...
...
@@ -191,10 +191,7 @@ local function QuestFrameProgressPanel_SetupBG(self)
end
end
local
defaultXSize
=
510
;
local
defaultYSize
=
620
;
self
.
Bg
:
SetSize
(
defaultXSize
,
defaultYSize
);
self
.
Bg
:
SetTexture
(
"Interface/QuestFrame/QuestBG"
);
self
.
Bg
:
SetAtlas
(
"QuestBG-Parchment"
,
true
);
QuestFrame_SetMaterial
(
QuestFrameProgressPanel
,
material
);
return
material
;
end
...
...
Interface/SharedXML/AudioOptionsFrame.lua
View file @
92e27cad
local
StaticPopup_Show
=
StaticPopup_Show
or
GlueDialog_Show
;
function
AudioOptionsFrame_Toggle
()
if
(
AudioOptionsFrame
:
IsShown
()
)
then
AudioOptionsFrame
:
Hide
();
...
...
@@ -45,7 +47,7 @@ function AudioOptionsFrame_OnHide (self)
if
(
AudioOptionsFrame
.
gameRestart
)
then
StaticPopup_Show
(
"CLIENT_RESTART_ALERT"
);
AudioOptionsFrame
.
gameRestart
=
nil
;
elseif
(
AudioOptionsFrame
.
logout
)
then
elseif
(
AudioOptionsFrame
.
logout
and
not
IsOnGlueScreen
()
)
then
StaticPopup_Show
(
"CLIENT_LOGOUT_ALERT"
);
AudioOptionsFrame
.
logout
=
nil
;
end
...
...
Interface/SharedXML/VideoOptionsFrame.lua
View file @
92e27cad
...
...
@@ -50,6 +50,8 @@ function VideoOptionsFrameCancel_OnClick (self, button)
VideoOptionsFrame_Toggle
();
end
local
StaticPopup_Show
=
StaticPopup_Show
or
GlueDialog_Show
;
function
VideoOptionsFrameDefault_OnClick
(
self
,
button
)
OptionsFrameDefault_OnClick
(
VideoOptionsFrame
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment