Skip to content

Commit 68f7fc5

Browse files
LegolandoBloomLegolandoBloom
committed
changed audio slider UI order and order of the code section(for readability) to be the same as Blizzard's
1 parent 01188bb commit 68f7fc5

2 files changed

Lines changed: 40 additions & 41 deletions

File tree

‎init.lua‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -166,18 +166,19 @@ function Init_AngleurSavedVariables()
166166
if AngleurAudio.ultraFocusMaster == nil then
167167
AngleurAudio.ultraFocusMaster = 1
168168
end
169-
if AngleurAudio.ultraFocusSFX == nil then
170-
AngleurAudio.ultraFocusSFX = 1
171-
end
172169
if AngleurAudio.ultraFocusMusic == nil then
173170
AngleurAudio.ultraFocusMusic = 0
174171
end
175-
if AngleurAudio.ultraFocusDialog == nil then
176-
AngleurAudio.ultraFocusDialog = 0
172+
if AngleurAudio.ultraFocusSFX == nil then
173+
AngleurAudio.ultraFocusSFX = 1
177174
end
178175
if AngleurAudio.ultraFocusAmbience == nil then
179176
AngleurAudio.ultraFocusAmbience = 0
180177
end
178+
if AngleurAudio.ultraFocusDialog == nil then
179+
AngleurAudio.ultraFocusDialog = 0
180+
end
181+
181182

182183
if AngleurMinimapButton.hide == nil then
183184
AngleurMinimapButton.hide = false
@@ -601,18 +602,18 @@ Angleur_TempCVars = {
601602
Sound_MasterVolume = {
602603
active = false, cached = nil, setTo = AngleurAudio.ultraFocusMaster, updating = false,
603604
},
604-
Sound_SFXVolume = {
605-
active = false, cached = nil, setTo = AngleurAudio.ultraFocusSFX, updating = false,
606-
},
607605
Sound_MusicVolume = {
608606
active = false, cached = nil, setTo = AngleurAudio.ultraFocusMusic, updating = false,
609607
},
610-
Sound_DialogVolume = {
611-
active = false, cached = nil, setTo = AngleurAudio.ultraFocusDialog, updating = false,
608+
Sound_SFXVolume = {
609+
active = false, cached = nil, setTo = AngleurAudio.ultraFocusSFX, updating = false,
612610
},
613611
Sound_AmbienceVolume = {
614612
active = false, cached = nil, setTo = AngleurAudio.ultraFocusAmbience, updating = false,
615613
},
614+
Sound_DialogVolume = {
615+
active = false, cached = nil, setTo = AngleurAudio.ultraFocusDialog, updating = false,
616+
},
616617
}
617618

618619

@@ -622,10 +623,10 @@ Angleur_TempCVarHandler:Init()
622623
local function cvars_load()
623624
-- Need to re-assign here because when table is first created Saved Vars haven't loaded yet
624625
Angleur_TempCVars["Sound_MasterVolume"].setTo = AngleurAudio.ultraFocusMaster
625-
Angleur_TempCVars["Sound_SFXVolume"].setTo = AngleurAudio.ultraFocusSFX
626626
Angleur_TempCVars["Sound_MusicVolume"].setTo = AngleurAudio.ultraFocusMusic
627-
Angleur_TempCVars["Sound_DialogVolume"].setTo = AngleurAudio.ultraFocusDialog
627+
Angleur_TempCVars["Sound_SFXVolume"].setTo = AngleurAudio.ultraFocusSFX
628628
Angleur_TempCVars["Sound_AmbienceVolume"].setTo = AngleurAudio.ultraFocusAmbience
629+
Angleur_TempCVars["Sound_DialogVolume"].setTo = AngleurAudio.ultraFocusDialog
629630

630631
-- Order: Anywhere in PLAYER_ENTERING_WORLD
631632
if Angleur_TinyOptions.softIconOff == true and C_CVar.GetCVar("SoftTargetIconGameObject") == "1" then

‎tabs/standard_base.lua‎

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -45,74 +45,72 @@ local function setupAudio(self)
4545
Angleur_TempCVars["Sound_MasterVolume"].setTo = AngleurAudio.ultraFocusMaster
4646
end)
4747

48-
local sfxSlider = CreateFrame("Frame", "Angleur_UltraFocusAudio_SFXSlider", audioConfig.popup, "SliderAndEditControlTemplate")
49-
sfxSlider:SetPoint("TOPLEFT", audioConfig.popup, "TOPLEFT", 34, -97)
50-
sfxSlider:SetScale(0.9)
51-
sfxSlider.ValueBox:SetNumericFullRange()
52-
sfxSlider:SetupSlider(0, 100, AngleurAudio.ultraFocusSFX * 100, 1, colorYello:WrapTextInColorCode(T["Effects Volume"]))
53-
sfxSlider:SetCallback(function(value, isUserInput)
54-
AngleurAudio.ultraFocusSFX = value/100
55-
Angleur_TempCVars["Sound_SFXVolume"].setTo = AngleurAudio.ultraFocusSFX
56-
end)
57-
5848
local musicSlider = CreateFrame("Frame", "Angleur_UltraFocusAudio_MusicSlider", audioConfig.popup, "SliderAndEditControlTemplate")
5949
musicSlider:SetScale(0.9)
60-
musicSlider:SetPoint("TOPLEFT", audioConfig.popup, "TOPLEFT", 34, -138)
50+
musicSlider:SetPoint("TOPLEFT", audioConfig.popup, "TOPLEFT", 34, -97)
6151
musicSlider.ValueBox:SetNumericFullRange()
6252
musicSlider:SetupSlider(0, 100, AngleurAudio.ultraFocusMusic * 100, 1, colorYello:WrapTextInColorCode(T["Music Volume"]))
6353
musicSlider:SetCallback(function(value, isUserInput)
6454
AngleurAudio.ultraFocusMusic = value/100
6555
Angleur_TempCVars["Sound_MusicVolume"].setTo = AngleurAudio.ultraFocusMusic
6656
end)
6757

68-
local dialogSlider = CreateFrame("Frame", "Angleur_UltraFocusAudio_DialogSlider", audioConfig.popup, "SliderAndEditControlTemplate")
69-
dialogSlider:SetScale(0.9)
70-
dialogSlider:SetPoint("TOPLEFT", audioConfig.popup, "TOPLEFT", 34, -179)
71-
dialogSlider.ValueBox:SetNumericFullRange()
72-
dialogSlider:SetupSlider(0, 100, AngleurAudio.ultraFocusDialog * 100, 1, colorYello:WrapTextInColorCode(T["Dialog Volume"]))
73-
dialogSlider:SetCallback(function(value, isUserInput)
74-
AngleurAudio.ultraFocusDialog = value/100
75-
Angleur_TempCVars["Sound_DialogVolume"].setTo = AngleurAudio.ultraFocusDialog
58+
local sfxSlider = CreateFrame("Frame", "Angleur_UltraFocusAudio_SFXSlider", audioConfig.popup, "SliderAndEditControlTemplate")
59+
sfxSlider:SetPoint("TOPLEFT", audioConfig.popup, "TOPLEFT", 34, -138)
60+
sfxSlider:SetScale(0.9)
61+
sfxSlider.ValueBox:SetNumericFullRange()
62+
sfxSlider:SetupSlider(0, 100, AngleurAudio.ultraFocusSFX * 100, 1, colorYello:WrapTextInColorCode(T["Effects Volume"]))
63+
sfxSlider:SetCallback(function(value, isUserInput)
64+
AngleurAudio.ultraFocusSFX = value/100
65+
Angleur_TempCVars["Sound_SFXVolume"].setTo = AngleurAudio.ultraFocusSFX
7666
end)
7767

7868
local ambienceSlider = CreateFrame("Frame", "Angleur_UltraFocusAudio_AmbienceSlider", audioConfig.popup, "SliderAndEditControlTemplate")
7969
ambienceSlider:SetScale(0.9)
80-
ambienceSlider:SetPoint("TOPLEFT", audioConfig.popup, "TOPLEFT", 34, -220)
70+
ambienceSlider:SetPoint("TOPLEFT", audioConfig.popup, "TOPLEFT", 34, -179)
8171
ambienceSlider.ValueBox:SetNumericFullRange()
8272
ambienceSlider:SetupSlider(0, 100, AngleurAudio.ultraFocusAmbience * 100, 1, colorYello:WrapTextInColorCode(T["Ambience Volume"]))
8373
ambienceSlider:SetCallback(function(value, isUserInput)
8474
AngleurAudio.ultraFocusAmbience = value/100
8575
Angleur_TempCVars["Sound_AmbienceVolume"].setTo = AngleurAudio.ultraFocusAmbience
8676
end)
8777

78+
local dialogSlider = CreateFrame("Frame", "Angleur_UltraFocusAudio_DialogSlider", audioConfig.popup, "SliderAndEditControlTemplate")
79+
dialogSlider:SetScale(0.9)
80+
dialogSlider:SetPoint("TOPLEFT", audioConfig.popup, "TOPLEFT", 34, -220)
81+
dialogSlider.ValueBox:SetNumericFullRange()
82+
dialogSlider:SetupSlider(0, 100, AngleurAudio.ultraFocusDialog * 100, 1, colorYello:WrapTextInColorCode(T["Dialog Volume"]))
83+
dialogSlider:SetCallback(function(value, isUserInput)
84+
AngleurAudio.ultraFocusDialog = value/100
85+
Angleur_TempCVars["Sound_DialogVolume"].setTo = AngleurAudio.ultraFocusDialog
86+
end)
87+
8888
local defaults = CreateFrame("Button", "Angleur_UltraFocusAudio_Defaults", audioConfig.popup, "GameMenuButtonTemplate")
8989
defaults:SetSize(120, 42)
9090
defaults:SetPoint("BOTTOMRIGHT", audioConfig.popup, "BOTTOMRIGHT", -12, 10)
91-
-- local defaultsText = defaults:CreateFontString(nil, "ARTWORK", "Game12Font_o1")
9291
defaults.Text:SetFontObject("Game12Font_o1")
93-
-- defaults.Text:SetScale(0.8)
9492
defaults.Text:SetText(colorYello:WrapTextInColorCode(T["Defaults\n(Recommended)"]))
9593
defaults:SetScript("OnClick", function()
9694
AngleurAudio.ultraFocusMaster = DEFAULT_MASTER
9795
masterSlider:SetValue(DEFAULT_MASTER * 100)
9896
Angleur_TempCVars["Sound_MasterVolume"].setTo = AngleurAudio.ultraFocusMaster
9997

100-
AngleurAudio.ultraFocusSFX = DEFAULT_SFX
101-
sfxSlider:SetValue(DEFAULT_SFX * 100)
102-
Angleur_TempCVars["Sound_SFXVolume"].setTo = AngleurAudio.ultraFocusSFX
103-
10498
AngleurAudio.ultraFocusMusic = DEFAULT_MUSIC
10599
musicSlider:SetValue(DEFAULT_MUSIC * 100)
106100
Angleur_TempCVars["Sound_MusicVolume"].setTo = AngleurAudio.ultraFocusMusic
107101

108-
AngleurAudio.ultraFocusDialog = DEFAULT_DIALOG
109-
dialogSlider:SetValue(DEFAULT_DIALOG * 100)
110-
Angleur_TempCVars["Sound_DialogVolume"].setTo = AngleurAudio.ultraFocusDialog
102+
AngleurAudio.ultraFocusSFX = DEFAULT_SFX
103+
sfxSlider:SetValue(DEFAULT_SFX * 100)
104+
Angleur_TempCVars["Sound_SFXVolume"].setTo = AngleurAudio.ultraFocusSFX
111105

112106
AngleurAudio.ultraFocusAmbience = DEFAULT_AMBIENCE
113107
ambienceSlider:SetValue(DEFAULT_AMBIENCE * 100)
114108
Angleur_TempCVars["Sound_AmbienceVolume"].setTo = AngleurAudio.ultraFocusAmbience
115109

110+
AngleurAudio.ultraFocusDialog = DEFAULT_DIALOG
111+
dialogSlider:SetValue(DEFAULT_DIALOG * 100)
112+
Angleur_TempCVars["Sound_DialogVolume"].setTo = AngleurAudio.ultraFocusDialog
113+
116114
print(T["Ultra Focus: Default audio settings restored"])
117115
end)
118116

0 commit comments

Comments
 (0)