From 15730529bb824baf5abb75e89c550991f06914ea Mon Sep 17 00:00:00 2001 From: Bunny67 Date: Tue, 12 Jun 2018 00:34:04 +0300 Subject: [PATCH] update AceGUIWidget-DropDown --- .../AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua b/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua index 515f599..a968ba1 100644 --- a/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua +++ b/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua @@ -107,7 +107,6 @@ do end child:ClearAllPoints() child:SetPoint("TOPLEFT", frame, "TOPLEFT", 0, offset) - child:SetPoint("TOPRIGHT", frame, "TOPRIGHT", self.slider:IsShown() and -12 or 0, offset) status.offset = offset status.scrollvalue = value end @@ -151,7 +150,6 @@ do if value < 1000 then child:ClearAllPoints() child:SetPoint("TOPLEFT", frame, "TOPLEFT", 0, offset) - child:SetPoint("TOPRIGHT", frame, "TOPRIGHT", -12, offset) status.offset = offset end end @@ -324,16 +322,17 @@ do slider.obj = self scrollFrame:SetScrollChild(itemFrame) + scrollFrame:SetWidth(defaultWidth - 12) + scrollFrame:SetHeight(self.maxHeight - 24) scrollFrame:SetPoint("TOPLEFT", frame, "TOPLEFT", 6, -12) - scrollFrame:SetPoint("BOTTOMRIGHT", frame, "BOTTOMRIGHT", -6, 12) scrollFrame:EnableMouseWheel(true) scrollFrame:SetScript("OnMouseWheel", OnMouseWheel) scrollFrame:SetScript("OnSizeChanged", OnSizeChanged) scrollFrame:SetToplevel(true) scrollFrame:SetFrameStrata("FULLSCREEN_DIALOG") + itemFrame:SetWidth(defaultWidth - 12) itemFrame:SetPoint("TOPLEFT", scrollFrame, "TOPLEFT", 0, 0) - itemFrame:SetPoint("TOPRIGHT", scrollFrame, "TOPRIGHT", -12, 0) itemFrame:SetHeight(400) itemFrame:SetToplevel(true) itemFrame:SetFrameStrata("FULLSCREEN_DIALOG") @@ -392,7 +391,10 @@ do AceGUI:ClearFocus() else self.open = true - self.pullout:SetWidth(self.pulloutWidth or self.frame:GetWidth()) + local width = self.pulloutWidth or self.frame:GetWidth() + self.pullout:SetWidth(width) + self.pullout.scrollFrame:SetWidth(width - 12) + self.pullout.itemFrame:SetWidth(width - (self.pullout.slider:IsShown() and 24 or 12)) self.pullout:Open("TOPLEFT", self.frame, "BOTTOMLEFT", 0, self.label:IsShown() and -2 or 0) AceGUI:SetFocus(self) end