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
61ebc28a
Commit
61ebc28a
authored
Jan 21, 2020
by
TOM_RUS
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WOW-33095patch8.3.0_PTR
parent
f58205a2
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
26 additions
and
10 deletions
+26
-10
Interface/AddOns/Blizzard_APIDocumentation/AuctionHouseDocumentation.lua
...s/Blizzard_APIDocumentation/AuctionHouseDocumentation.lua
+9
-0
Interface/AddOns/Blizzard_AuctionHouseUI/Blizzard_AuctionHouseAuctionsFrame.lua
...ard_AuctionHouseUI/Blizzard_AuctionHouseAuctionsFrame.lua
+3
-0
Interface/AddOns/Blizzard_Collections/Blizzard_Wardrobe.lua
Interface/AddOns/Blizzard_Collections/Blizzard_Wardrobe.lua
+1
-1
Interface/FrameXML/AutoComplete.lua
Interface/FrameXML/AutoComplete.lua
+1
-0
Interface/FrameXML/AutoComplete.xml
Interface/FrameXML/AutoComplete.xml
+1
-1
Interface/FrameXML/UIParent.lua
Interface/FrameXML/UIParent.lua
+11
-8
No files found.
Interface/AddOns/Blizzard_APIDocumentation/AuctionHouseDocumentation.lua
View file @
61ebc28a
...
...
@@ -928,6 +928,15 @@ local AuctionHouse =
Type
=
"Event"
,
LiteralName
=
"AUCTION_HOUSE_FAVORITES_UPDATED"
,
},
{
Name
=
"AuctionHouseNewBidReceived"
,
Type
=
"Event"
,
LiteralName
=
"AUCTION_HOUSE_NEW_BID_RECEIVED"
,
Payload
=
{
{
Name
=
"auctionID"
,
Type
=
"number"
,
Nilable
=
false
},
},
},
{
Name
=
"AuctionHouseScriptDeprecated"
,
Type
=
"Event"
,
...
...
Interface/AddOns/Blizzard_AuctionHouseUI/Blizzard_AuctionHouseAuctionsFrame.lua
View file @
61ebc28a
...
...
@@ -148,6 +148,7 @@ local AUCTIONS_FRAME_EVENTS = {
"BIDS_UPDATED"
,
"BID_ADDED"
,
"AUCTION_CANCELED"
,
"AUCTION_HOUSE_NEW_BID_RECEIVED"
,
};
local
AuctionsFrameDisplayMode
=
{
...
...
@@ -227,6 +228,8 @@ function AuctionHouseAuctionsFrameMixin:OnEvent(event, ...)
end
elseif
event
==
"AUCTION_CANCELED"
then
self
:
RefreshSeachResults
();
elseif
event
==
"AUCTION_HOUSE_NEW_BID_RECEIVED"
then
self
:
RefreshSeachResults
();
end
end
...
...
Interface/AddOns/Blizzard_Collections/Blizzard_Wardrobe.lua
View file @
61ebc28a
...
...
@@ -229,7 +229,7 @@ function WardrobeTransmogFrame_UpdateSlotButton(slotButton)
local
sourceID
=
WardrobeTransmogFrame_GetDisplayedSource
(
correspondingWeaponButton
);
if
(
sourceID
~=
NO_TRANSMOG_SOURCE_ID
and
not
WardrobeCollectionFrame_CanEnchantSource
(
sourceID
)
)
then
-- clear anything in the enchant slot, otherwise cost and Apply button state will still reflect anything pending
C_Transmog
.
Set
Pending
(
slotButton
.
slotID
,
slotButton
.
transmogType
,
REMOVE_TRANSMOG_ID
);
C_Transmog
.
Clear
Pending
(
slotButton
.
slotID
,
slotButton
.
transmogType
);
isTransmogrified
=
false
;
-- handle legacy, this weapon could have had an illusion applied previously
canTransmogrify
=
false
;
slotButton
.
invalidWeapon
=
true
;
...
...
Interface/FrameXML/AutoComplete.lua
View file @
61ebc28a
...
...
@@ -407,6 +407,7 @@ function AutoCompleteEditBox_OnChar(self)
end
function
AutoCompleteEditBox_OnEditFocusLost
(
self
)
self
:
HighlightText
(
0
,
0
);
AutoComplete_HideIfAttachedTo
(
self
);
end
...
...
Interface/FrameXML/AutoComplete.xml
View file @
61ebc28a
...
...
@@ -30,7 +30,7 @@
<DisabledFont
style=
"GameFontDisable"
/>
<HighlightTexture
inherits=
"UIPanelButtonHighlightTexture"
/>
</Button>
<Frame
name=
"AutoCompleteBox"
parent=
"UIParent"
hidden=
"true"
>
<Frame
name=
"AutoCompleteBox"
parent=
"UIParent"
enableMouse=
"true"
hidden=
"true"
>
<Size>
<AbsDimension
x=
"5"
y=
"5"
/>
</Size>
...
...
Interface/FrameXML/UIParent.lua
View file @
61ebc28a
...
...
@@ -2193,14 +2193,17 @@ function UIParent_OnEvent(self, event, ...)
end
-- Clear keyboard focus.
if
event
==
"GLOBAL_MOUSE_DOWN"
and
buttonID
==
"LeftButton"
and
not
IsModifierKeyDown
()
then
local
keyBoardFocus
=
GetCurrentKeyBoardFocus
();
if
keyBoardFocus
then
local
hasStickyFocus
=
keyBoardFocus
.
HasStickyFocus
and
keyBoardFocus
:
HasStickyFocus
();
if
keyBoardFocus
.
ClearFocus
and
not
hasStickyFocus
and
keyBoardFocus
~=
mouseFocus
then
keyBoardFocus
:
ClearFocus
();
end
end
local
autoCompleteShown
=
AutoCompleteBox
and
AutoCompleteBox
:
IsShown
();
if
not
autoCompleteShown
or
not
DoesAncestryInclude
(
AutoCompleteBox
,
mouseFocus
)
then
if
event
==
"GLOBAL_MOUSE_DOWN"
and
buttonID
==
"LeftButton"
and
not
IsModifierKeyDown
()
then
local
keyBoardFocus
=
GetCurrentKeyBoardFocus
();
if
keyBoardFocus
then
local
hasStickyFocus
=
keyBoardFocus
.
HasStickyFocus
and
keyBoardFocus
:
HasStickyFocus
();
if
keyBoardFocus
.
ClearFocus
and
not
hasStickyFocus
and
keyBoardFocus
~=
mouseFocus
then
keyBoardFocus
:
ClearFocus
();
end
end
end
end
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