Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Simpy
BlizzardInterfaceCode
Commits
c5903bda
Commit
c5903bda
authored
Nov 07, 2020
by
TOM_RUS
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WOW-36532patch9.0.2_Beta
parent
819e0b70
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
7 deletions
+26
-7
Interface/AddOns/Blizzard_CovenantPreviewUI/Blizzard_CovenantPreviewUI.lua
...Blizzard_CovenantPreviewUI/Blizzard_CovenantPreviewUI.lua
+6
-1
Interface/AddOns/Blizzard_GarrisonTemplates/Blizzard_CovenantMissionTemplates.xml
...d_GarrisonTemplates/Blizzard_CovenantMissionTemplates.xml
+1
-1
Interface/SharedXML/CircularBuffer.lua
Interface/SharedXML/CircularBuffer.lua
+19
-5
No files found.
Interface/AddOns/Blizzard_CovenantPreviewUI/Blizzard_CovenantPreviewUI.lua
View file @
c5903bda
...
...
@@ -308,7 +308,7 @@ function CovenantSoulbindButtonMixin:OnEnter()
GameTooltip
:
Hide
();
local
spell
=
Spell
:
CreateFromSpellID
(
self
.
spellID
);
spell
:
ContinueOnSpellLoad
(
function
()
self
.
spellDataLoadedCancelCallback
=
spell
:
Continue
WithCancel
OnSpellLoad
(
function
()
EmbeddedItemTooltip
:
SetOwner
(
self
,
"ANCHOR_RIGHT"
,
-
12
,
-
10
);
GameTooltip_AddHighlightLine
(
EmbeddedItemTooltip
,
self
.
name
);
GameTooltip_AddBlankLineToTooltip
(
EmbeddedItemTooltip
);
...
...
@@ -316,11 +316,16 @@ function CovenantSoulbindButtonMixin:OnEnter()
GameTooltip_AddBlankLineToTooltip
(
EmbeddedItemTooltip
);
EmbeddedItemTooltip_SetSpellWithTextureByID
(
EmbeddedItemTooltip
.
ItemTooltip
,
self
.
spellID
,
spell
:
GetSpellTexture
());
EmbeddedItemTooltip
:
Show
();
self
.
spellDataLoadedCancelCallback
=
nil
;
end
);
end
function
CovenantSoulbindButtonMixin
:
OnLeave
()
EmbeddedItemTooltip
:
Hide
();
if
self
.
spellDataLoadedCancelCallback
then
self
.
spellDataLoadedCancelCallback
();
self
.
spellDataLoadedCancelCallback
=
nil
;
end
end
CovenantPreviewModelSceneContainerMixin
=
{
};
...
...
Interface/AddOns/Blizzard_GarrisonTemplates/Blizzard_CovenantMissionTemplates.xml
View file @
c5903bda
...
...
@@ -58,7 +58,7 @@
<Texture
parentKey=
"Portrait"
>
<Anchors>
<Anchor
point=
"TOPLEFT"
x=
"6"
y=
"-8"
/>
<Anchor
point=
"BOTTOMRIGHT"
x=
"-6"
y=
"1
0
"
/>
<Anchor
point=
"BOTTOMRIGHT"
x=
"-6"
y=
"1
2
"
/>
</Anchors>
</Texture>
</Layer>
...
...
Interface/SharedXML/CircularBuffer.lua
View file @
c5903bda
local
securecall
=
securecall
;
local
type
=
type
;
local
error
=
error
;
local
CreateFromMixins
=
CreateFromMixins
;
local
function
safesecurecall
(
fn
,
...
)
if
type
(
fn
)
~=
"function"
then
error
(
"Function lookups forbidden"
);
return
;
end
return
securecall
(
fn
,
...
);
end
CircularBufferMixin
=
{}
function
CreateCircularBuffer
(
maxElements
)
...
...
@@ -31,10 +45,10 @@ end
function
CircularBufferMixin
:
PushFront
(
element
)
self
.
headIndex
=
self
.
headIndex
+
1
;
local
insertIndex
=
self
.
headIndex
;
self
.
elements
[
insertIndex
]
=
element
;
self
.
headIndex
=
self
.
headIndex
%
self
.
maxElements
;
return
insertIndex
;
...
...
@@ -68,7 +82,7 @@ function CircularBufferMixin:RemoveIf(predicateFunction, transformFunction)
transformFunction
=
transformFunction
or
PassThrough
;
local
elements
=
{};
for
i
,
entry
in
self
:
EnumerateIndexedEntries
()
do
if
not
securecall
(
predicateFunction
,
securecall
(
transformFunction
,
entry
))
then
if
not
safe
securecall
(
predicateFunction
,
safe
securecall
(
transformFunction
,
entry
))
then
elements
[
#
elements
+
1
]
=
entry
;
end
end
...
...
@@ -85,8 +99,8 @@ function CircularBufferMixin:TransformIf(predicateFunction, transformFunction, e
entryTransform
=
entryTransform
or
PassThrough
;
for
i
,
entry
in
ipairs
(
self
.
elements
)
do
if
securecall
(
predicateFunction
,
securecall
(
entryTransform
,
entry
))
then
self
.
elements
[
i
]
=
securecall
(
transformFunction
,
securecall
(
entryTransform
,
entry
));
if
safe
securecall
(
predicateFunction
,
safe
securecall
(
entryTransform
,
entry
))
then
self
.
elements
[
i
]
=
safe
securecall
(
transformFunction
,
safe
securecall
(
entryTransform
,
entry
));
changed
=
true
;
end
end
...
...
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