Skip to content

Commit 2513e6e

Browse files
ChronosSFChronosSF
committed
Updating libs.
1 parent ba94222 commit 2513e6e

32 files changed

Lines changed: 734 additions & 238 deletions

‎Libs/AceGUI-3.0-SharedMediaWidgets/AceGUI-3.0-SharedMediaWidgets.toc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
## Interface: 40000
2-
## X-Curse-Packaged-Version: r37
1+
## Interface: 70000
2+
## X-Curse-Packaged-Version: r57-release
33
## X-Curse-Project-Name: AceGUI-3.0-SharedMediaWidgets
44
## X-Curse-Project-ID: ace-gui-3-0-shared-media-widgets
55
## X-Curse-Repository-ID: wow/ace-gui-3-0-shared-media-widgets/mainline
66

77
## Title: Lib: AceGUI-3.0-SharedMediaWidgets
88
## Notes: Enables AceGUI-3.0 widgets for the 5 basic SharedMedia-3.0 types
9-
## Version: 4.0.0
109
## Author: Yssaril
11-
## OptionalDeps: Ace3, LibSharedMedia-3.0, Libstub, CallbackHandler-1.0
10+
## OptionalDeps: Ace3, LibSharedMedia-3.0
1211
## X-Category: Library
1312

1413
#@no-lib-strip@
1514
Libs\Libstub\Libstub.lua
1615
Libs\CallbackHandler-1.0\CallbackHandler-1.0.xml
1716
Libs\AceGUI-3.0\AceGUI-3.0.xml
17+
Libs\LibSharedMedia-3.0\lib.xml
1818
#@end-no-lib-strip@
1919

2020
widget.xml

‎Libs/AceGUI-3.0-SharedMediaWidgets/AceGUI-3.0-SharedMediaWidgets/BackgroundWidget.lua‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ local AGSMW = LibStub("AceGUISharedMediaWidgets-1.0")
88

99
do
1010
local widgetType = "LSM30_Background"
11-
local widgetVersion = 9
11+
local widgetVersion = 11
1212

1313
local contentFrameCache = {}
1414
local function ReturnSelf(self)
@@ -44,23 +44,25 @@ do
4444
frame:SetHighlightTexture([[Interface\QuestFrame\UI-QuestTitleHighlight]], "ADD")
4545
frame:SetScript("OnClick", ContentOnClick)
4646
frame:SetScript("OnEnter", ContentOnEnter)
47+
4748
local check = frame:CreateTexture("OVERLAY")
4849
check:SetWidth(16)
4950
check:SetHeight(16)
5051
check:SetPoint("LEFT",frame,"LEFT",1,-1)
5152
check:SetTexture("Interface\\Buttons\\UI-CheckBox-Check")
5253
check:Hide()
5354
frame.check = check
54-
local text = frame:CreateFontString(nil,"OVERLAY","GameFontWhite")
5555

56+
local text = frame:CreateFontString(nil,"OVERLAY","GameFontWhite")
5657
local font, size = text:GetFont()
5758
text:SetFont(font,size,"OUTLINE")
5859

59-
text:SetPoint("LEFT", check, "RIGHT", 1, 0)
60-
text:SetPoint("RIGHT", frame, "RIGHT", -2, 0)
60+
text:SetPoint("TOPLEFT", check, "TOPRIGHT", 1, 0)
61+
text:SetPoint("BOTTOMRIGHT", frame, "BOTTOMRIGHT", -2, 0)
6162
text:SetJustifyH("LEFT")
6263
text:SetText("Test Test Test Test Test Test Test")
6364
frame.text = text
65+
6466
frame.ReturnSelf = ReturnSelf
6567
end
6668
frame:Show()
@@ -150,7 +152,9 @@ do
150152
else
151153
AceGUI:SetFocus(self)
152154
self.dropdown = AGSMW:GetDropDownFrame()
155+
local width = self.frame:GetWidth()
153156
self.dropdown:SetPoint("TOPLEFT", self.frame, "BOTTOMLEFT")
157+
self.dropdown:SetPoint("TOPRIGHT", self.frame, "BOTTOMRIGHT", width < 160 and (160 - width) or 0, 0)
154158
for k, v in pairs(self.list) do
155159
sortedlist[#sortedlist+1] = k
156160
end

‎Libs/AceGUI-3.0-SharedMediaWidgets/AceGUI-3.0-SharedMediaWidgets/BorderWidget.lua‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ local AGSMW = LibStub("AceGUISharedMediaWidgets-1.0")
88

99
do
1010
local widgetType = "LSM30_Border"
11-
local widgetVersion = 9
11+
local widgetVersion = 11
1212

1313
local contentFrameCache = {}
1414
local function ReturnSelf(self)
@@ -55,8 +55,8 @@ do
5555
check:Hide()
5656
frame.check = check
5757
local text = frame:CreateFontString(nil,"OVERLAY","GameFontWhite")
58-
text:SetPoint("LEFT", check, "RIGHT", 1, 0)
59-
text:SetPoint("RIGHT", frame, "RIGHT", -2, 0)
58+
text:SetPoint("TOPLEFT", check, "TOPRIGHT", 1, 0)
59+
text:SetPoint("BOTTOMRIGHT", frame, "BOTTOMRIGHT", -2, 0)
6060
text:SetJustifyH("LEFT")
6161
text:SetText("Test Test Test Test Test Test Test")
6262
frame.text = text
@@ -147,7 +147,9 @@ do
147147
else
148148
AceGUI:SetFocus(self)
149149
self.dropdown = AGSMW:GetDropDownFrame()
150+
local width = self.frame:GetWidth()
150151
self.dropdown:SetPoint("TOPLEFT", self.frame, "BOTTOMLEFT")
152+
self.dropdown:SetPoint("TOPRIGHT", self.frame, "BOTTOMRIGHT", width < 160 and (160 - width) or 0, 0)
151153
for k, v in pairs(self.list) do
152154
sortedlist[#sortedlist+1] = k
153155
end

‎Libs/AceGUI-3.0-SharedMediaWidgets/AceGUI-3.0-SharedMediaWidgets/FontWidget.lua‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ local AGSMW = LibStub("AceGUISharedMediaWidgets-1.0")
88

99
do
1010
local widgetType = "LSM30_Font"
11-
local widgetVersion = 9
11+
local widgetVersion = 11
1212

1313
local contentFrameCache = {}
1414
local function ReturnSelf(self)
@@ -44,8 +44,8 @@ do
4444
check:Hide()
4545
frame.check = check
4646
local text = frame:CreateFontString(nil,"OVERLAY","GameFontWhite")
47-
text:SetPoint("LEFT", check, "RIGHT", 1, 0)
48-
text:SetPoint("RIGHT", frame, "RIGHT", -2, 0)
47+
text:SetPoint("TOPLEFT", check, "TOPRIGHT", 1, 0)
48+
text:SetPoint("BOTTOMRIGHT", frame, "BOTTOMRIGHT", -2, 0)
4949
text:SetJustifyH("LEFT")
5050
text:SetText("Test Test Test Test Test Test Test")
5151
frame.text = text
@@ -132,7 +132,9 @@ do
132132
else
133133
AceGUI:SetFocus(self)
134134
self.dropdown = AGSMW:GetDropDownFrame()
135+
local width = self.frame:GetWidth()
135136
self.dropdown:SetPoint("TOPLEFT", self.frame, "BOTTOMLEFT")
137+
self.dropdown:SetPoint("TOPRIGHT", self.frame, "BOTTOMRIGHT", width < 160 and (160 - width) or 0, 0)
136138
for k, v in pairs(self.list) do
137139
sortedlist[#sortedlist+1] = k
138140
end

‎Libs/AceGUI-3.0-SharedMediaWidgets/AceGUI-3.0-SharedMediaWidgets/SharedFunctions.lua‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎Libs/AceGUI-3.0-SharedMediaWidgets/AceGUI-3.0-SharedMediaWidgets/SoundWidget.lua‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ local AGSMW = LibStub("AceGUISharedMediaWidgets-1.0")
88

99
do
1010
local widgetType = "LSM30_Sound"
11-
local widgetVersion = 9
11+
local widgetVersion = 11
1212

1313
local contentFrameCache = {}
1414
local function ReturnSelf(self)
@@ -29,7 +29,7 @@ do
2929
local function ContentSpeakerOnClick(this, button)
3030
local self = this.frame.obj
3131
local sound = this.frame.text:GetText()
32-
PlaySoundFile(self.list[sound] ~= sound and self.list[sound] or Media:Fetch('sound',sound))
32+
PlaySoundFile(self.list[sound] ~= sound and self.list[sound] or Media:Fetch('sound',sound), "Master")
3333
end
3434

3535
local function GetContentLine()
@@ -68,8 +68,8 @@ do
6868
frame.speakeron = speakeron
6969

7070
local text = frame:CreateFontString(nil,"OVERLAY","GameFontWhite")
71-
text:SetPoint("LEFT", check, "RIGHT", 1, 0)
72-
text:SetPoint("RIGHT", soundbutton, "LEFT", -2, 0)
71+
text:SetPoint("TOPLEFT", check, "TOPRIGHT", 1, 0)
72+
text:SetPoint("BOTTOMRIGHT", soundbutton, "BOTTOMLEFT", -2, 0)
7373
text:SetJustifyH("LEFT")
7474
text:SetText("Test Test Test Test Test Test Test")
7575
frame.text = text
@@ -157,7 +157,9 @@ do
157157
else
158158
AceGUI:SetFocus(self)
159159
self.dropdown = AGSMW:GetDropDownFrame()
160+
local width = self.frame:GetWidth()
160161
self.dropdown:SetPoint("TOPLEFT", self.frame, "BOTTOMLEFT")
162+
self.dropdown:SetPoint("TOPRIGHT", self.frame, "BOTTOMRIGHT", width < 160 and (160 - width) or 0, 0)
161163
for k, v in pairs(self.list) do
162164
sortedlist[#sortedlist+1] = k
163165
end
@@ -199,7 +201,7 @@ do
199201
local function WidgetPlaySound(this)
200202
local self = this.obj
201203
local sound = self.frame.text:GetText()
202-
PlaySoundFile(self.list[sound] ~= sound and self.list[sound] or Media:Fetch('sound',sound))
204+
PlaySoundFile(self.list[sound] ~= sound and self.list[sound] or Media:Fetch('sound',sound), "Master")
203205
end
204206

205207
local function Constructor()

‎Libs/AceGUI-3.0-SharedMediaWidgets/AceGUI-3.0-SharedMediaWidgets/StatusbarWidget.lua‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ local AGSMW = LibStub("AceGUISharedMediaWidgets-1.0")
88

99
do
1010
local widgetType = "LSM30_Statusbar"
11-
local widgetVersion = 9
11+
local widgetVersion = 11
1212

1313
local contentFrameCache = {}
1414
local function ReturnSelf(self)
@@ -53,8 +53,8 @@ do
5353
local font, size = text:GetFont()
5454
text:SetFont(font,size,"OUTLINE")
5555

56-
text:SetPoint("LEFT", check, "RIGHT", 3, 0)
57-
text:SetPoint("RIGHT", frame, "RIGHT", -2, 0)
56+
text:SetPoint("TOPLEFT", check, "TOPRIGHT", 3, 0)
57+
text:SetPoint("BOTTOMRIGHT", frame, "BOTTOMRIGHT", -2, 0)
5858
text:SetJustifyH("LEFT")
5959
text:SetText("Test Test Test Test Test Test Test")
6060
frame.text = text
@@ -141,7 +141,9 @@ do
141141
else
142142
AceGUI:SetFocus(self)
143143
self.dropdown = AGSMW:GetDropDownFrame()
144+
local width = self.frame:GetWidth()
144145
self.dropdown:SetPoint("TOPLEFT", self.frame, "BOTTOMLEFT")
146+
self.dropdown:SetPoint("TOPRIGHT", self.frame, "BOTTOMRIGHT", width < 160 and (160 - width) or 0, 0)
145147
for k, v in pairs(self.list) do
146148
sortedlist[#sortedlist+1] = k
147149
end
@@ -198,13 +200,14 @@ do
198200
frame.dropButton:SetScript("OnClick",ToggleDrop)
199201
frame:SetScript("OnHide", OnHide)
200202

201-
local bar = frame:CreateTexture(nil, "ARTWORK")
203+
local bar = frame:CreateTexture(nil, "OVERLAY")
202204
bar:SetPoint("TOPLEFT", frame,"TOPLEFT",6,-25)
203205
bar:SetPoint("BOTTOMRIGHT", frame,"BOTTOMRIGHT", -21, 5)
206+
bar:SetAlpha(0.5)
204207
self.bar = bar
205208

206209
self.alignoffset = 31
207-
210+
208211
self.OnRelease = OnRelease
209212
self.OnAcquire = OnAcquire
210213
self.ClearFocus = ClearFocus

‎Libs/AceGUI-3.0-SharedMediaWidgets/AceGUI-3.0-SharedMediaWidgets/prototypes.lua‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@
33
local DataVersion = 9001 -- dev version always overwrites everything else :)
44
--@end-debug@]===]
55
--@non-debug@
6-
local DataVersion = 37
6+
local DataVersion = 56
77
--@end-non-debug@
88
local AGSMW = LibStub:NewLibrary("AceGUISharedMediaWidgets-1.0", DataVersion)
99

1010
if not AGSMW then
1111
return -- already loaded and no upgrade necessary
1212
end
1313

14-
LoadAddOn("LibSharedMedia-3.0")
1514
local AceGUI = LibStub("AceGUI-3.0")
1615
local Media = LibStub("LibSharedMedia-3.0")
1716

@@ -57,7 +56,6 @@ do
5756
local frame = CreateFrame("Frame", nil, UIParent)
5857
frame:SetHeight(44)
5958
frame:SetWidth(200)
60-
frame:SetPoint("CENTER", UIParent, "CENTER")
6159

6260
local label = frame:CreateFontString(nil,"OVERLAY","GameFontNormalSmall")
6361
label:SetPoint("TOPLEFT",frame,"TOPLEFT",0,0)
@@ -74,6 +72,7 @@ do
7472
DLeft:SetTexture([[Interface\Glues\CharacterCreate\CharacterCreate-LabelFrame]])
7573
DLeft:SetTexCoord(0, 0.1953125, 0, 1)
7674
frame.DLeft = DLeft
75+
7776
local DRight = frame:CreateTexture(nil, "ARTWORK")
7877
DRight:SetWidth(25)
7978
DRight:SetHeight(64)
@@ -82,6 +81,7 @@ do
8281
DRight:SetTexture([[Interface\Glues\CharacterCreate\CharacterCreate-LabelFrame]])
8382
DRight:SetTexCoord(0.8046875, 1, 0, 1)
8483
frame.DRight = DRight
84+
8585
local DMiddle = frame:CreateTexture(nil, "ARTWORK")
8686
DMiddle:SetHeight(64)
8787
DMiddle:SetPoint("TOP", DLeft, "TOP")
@@ -162,10 +162,9 @@ do
162162

163163
local function AddFrame(self, frame)
164164
frame:SetParent(self.contentframe)
165-
local strata = self:GetFrameStrata()
166-
frame:SetFrameStrata(strata)
167-
local level = self:GetFrameLevel() + 100
168-
frame:SetFrameLevel(level)
165+
frame:SetFrameStrata(self:GetFrameStrata())
166+
frame:SetFrameLevel(self:GetFrameLevel() + 100)
167+
169168
if next(self.contentRepo) then
170169
frame:SetPoint("TOPLEFT", self.contentRepo[#self.contentRepo], "BOTTOMLEFT", 0, 0)
171170
frame:SetPoint("RIGHT", self.contentframe, "RIGHT", 0, 0)
@@ -177,15 +176,16 @@ do
177176
frame:SetPoint("RIGHT", self.contentframe, "RIGHT", 0, 0)
178177
self.contentRepo[1] = frame
179178
end
179+
180180
if self.contentframe:GetHeight() > UIParent:GetHeight()*2/5 - 20 then
181-
self.scrollframe:SetWidth(146)
181+
self.scrollframe:SetPoint("BOTTOMRIGHT", self, "BOTTOMRIGHT", -28, 12)
182182
self:SetHeight(UIParent:GetHeight()*2/5)
183183
self.slider:Show()
184184
self:SetScript("OnMouseWheel", OnMouseWheel)
185185
self.scrollframe:UpdateScrollChildRect()
186186
self.slider:SetMinMaxValues(0, self.contentframe:GetHeight()-self.scrollframe:GetHeight())
187187
else
188-
self.scrollframe:SetWidth(160)
188+
self.scrollframe:SetPoint("BOTTOMRIGHT", self, "BOTTOMRIGHT", -14, 12)
189189
self:SetHeight(self.contentframe:GetHeight()+25)
190190
self.slider:Hide()
191191
self:SetScript("OnMouseWheel", nil)
@@ -223,19 +223,25 @@ do
223223
contentframe:SetWidth(160)
224224
contentframe:SetHeight(0)
225225
frame.contentframe = contentframe
226+
226227
local scrollframe = CreateFrame("ScrollFrame", nil, frame)
227-
scrollframe:SetPoint("TOPLEFT", frame, "TOPLEFT", 14, -13)
228-
scrollframe:SetPoint("BOTTOM", frame, "BOTTOM", 0, 12)
229228
scrollframe:SetWidth(160)
229+
scrollframe:SetPoint("TOPLEFT", frame, "TOPLEFT", 14, -13)
230+
scrollframe:SetPoint("BOTTOMRIGHT", frame, "BOTTOMRIGHT", -14, 12)
230231
scrollframe:SetScrollChild(contentframe)
231232
frame.scrollframe = scrollframe
233+
234+
contentframe:SetPoint("TOPLEFT", scrollframe)
235+
contentframe:SetPoint("TOPRIGHT", scrollframe)
236+
232237
local bgTex = frame:CreateTexture(nil, "ARTWORK")
233238
bgTex:SetAllPoints(scrollframe)
234239
frame.bgTex = bgTex
235240

236241
frame.AddFrame = AddFrame
237242
frame.ClearFrames = ClearFrames
238243
frame.contentRepo = {} -- store all our frames in here so we can get rid of them later
244+
239245
local slider = CreateFrame("Slider", nil, scrollframe)
240246
slider:SetOrientation("VERTICAL")
241247
slider:SetPoint("TOPRIGHT", frame, "TOPRIGHT", -14, -10)

0 commit comments

Comments
 (0)