Commit 61ebc28a authored by TOM_RUS's avatar TOM_RUS

WOW-33095patch8.3.0_PTR

parent f58205a2
......@@ -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",
......
......@@ -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
......
......@@ -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.SetPending(slotButton.slotID, slotButton.transmogType, REMOVE_TRANSMOG_ID);
C_Transmog.ClearPending(slotButton.slotID, slotButton.transmogType);
isTransmogrified = false; -- handle legacy, this weapon could have had an illusion applied previously
canTransmogrify = false;
slotButton.invalidWeapon = true;
......
......@@ -407,6 +407,7 @@ function AutoCompleteEditBox_OnChar(self)
end
function AutoCompleteEditBox_OnEditFocusLost(self)
self:HighlightText(0, 0);
AutoComplete_HideIfAttachedTo(self);
end
......
......@@ -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>
......
......@@ -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
......
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